2

schangxiang@126.com

2024-08-31 eb316436b13fa0bcee7ba8e0729c5ae767cded94

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs

@@ -23,32 +23,32 @@
{
    public class WorkPieceInfoManager
    {
        public static WorkPieceInfo GetWorkPieceInfo(string WorkPieceID)
        {
            using (DbModel db = new DbModel())
            {
                //查询所有
                var query = db.WorkPieceInfo.Where(o => o.WorkPieceID == WorkPieceID).FirstOrDefault();
                return query;
            }
        }
        //public static WorkPieceInfo GetWorkPieceInfo(string WorkPieceID)
        //{
        //    using (DbModel db = new DbModel())
        //    {
        //        //查询所有
        //        var query = db.WorkPieceInfo.Where(o => o.WorkPieceID == WorkPieceID).FirstOrDefault();
        //        return query;
        //    }
        //}


        public static long InsertWorkPieceInfo(WorkPieceInfo workPiece)
        {
            using (DbModel db = new DbModel())
            {
                db.WorkPieceInfo.Add(workPiece);
                db.SaveChanges();
                return workPiece.Id;
            }
        }
        //public static long InsertWorkPieceInfo(WorkPieceInfo workPiece)
        //{
        //    using (DbModel db = new DbModel())
        //    {
        //        db.WorkPieceInfo.Add(workPiece);
        //        db.SaveChanges();
        //        return workPiece.Id;
        //    }
        //}

        public static WorkPieceLogMiddle GetAddWorkPieceLog(WorkPieceLogMiddle loginfo)
        {
            loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
            return loginfo;
        }
        //public static WorkPieceLogMiddle GetAddWorkPieceLog(WorkPieceLogMiddle loginfo)
        //{
        //    loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
        //    return loginfo;
        //}

        /// <summary>
        /// 给WorkPieceLog主键等公共的的属性赋值
@@ -992,6 +992,7 @@
                            cur_db_info.UpdatedUserName = loginfo.MonitoringPoint;
                            cur_db_info.UpdatedTime = DateTime.Now;
                            cur_db_info.Remarks = "工件NOOK推出";
                            loginfo2.Remarks = cur_db_info.Remarks;
                            if (!(cur_db_info.WorkingProcedureStartTime.HasValue && cur_db_info.WorkingProcedureStartTime > DateTime.Parse("1900/01/01")))
                            {
                                cur_db_info.WorkingProcedureStartTime = DateTimeHelper.GetDateTime();
@@ -1004,7 +1005,7 @@
                        qualityData = db.QualityDataInfo.Where(o => o.WorkPieceID == loginfo.WorkPieceID).FirstOrDefault();
                        if (loginfo.WorkingProcedure.Equals("OP35"))
                        {//为了解决OP35的采集到的质量信息是OK还NOOK的情况，OP35 NOOK时更新质量信息
                            loginfo2.Remarks =$"OP35NOOK原质量信息{(cur_db_info.QualityState.HasValue ? cur_db_info.QualityState.Value.ToString() : "空")}";
                            loginfo2.Remarks = $"OP35NOOK原质量信息{(cur_db_info.QualityState.HasValue ? cur_db_info.QualityState.Value.ToString() : "空")}";
                            cur_db_info.QualityState = (int)QualityState.NG;
                            if (!cur_db_info.QualityState.Equals(((int)QualityState.OK).ToString()))
                            {
@@ -1120,6 +1121,7 @@
                            cur_db_info.WorkPieceCurrentPositionOrder = cur_db_info.WorkingProcedurePlan.IndexOf(loginfo.WorkingProcedure) / 2;
                        }
                        cur_db_info.Remarks = "工件SPC抽检推出";
                        loginfo2.Remarks = cur_db_info.Remarks;

                        //更新上一工序的结束时间
                        var pro = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == loginfo.WorkingProcedure