增加 JiaJuGongWei

schangxiang@126.com

2024-09-11 dfbe7cb2992df2d4195b12026d1f9e0a7423460e

 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs

@@ -54,11 +54,15 @@
                        else
                        {
                            //存在 表 WorkPieceInfo有，但是 WorkPieceProcess这个工序不存在的情况 【Editby shaocx,2024-09-06】
                            //if (info.WorkingProcedureCurrent.Equals("OP05"))
                            //{
                            //    loginfo.Remarks = $"读取二维码{loginfo.WorkPieceID ?? "空"} OP05工序重复读取了";
                            //    return;
                            //}
                            if (info.WorkingProcedureCurrent.Equals("OP05"))
                            {
                                //判断05数据是否存在
                                var pro_05 = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == "OP05").FirstOrDefault();
                                if (pro_05 != null)
                                {
                                    return;//不预处理
                                }
                            }
                        }
                        if ((loginfo.WorkingProcedure.Equals("OP05") && isAddWorkPieceInfo == false))
                        {//存在 表 WorkPieceInfo有，但是 WorkPieceProcess这个工序不存在的情况
@@ -118,6 +122,12 @@
                        }
                        if (isNeedAddNewProcess)
                        {
                            WorkPieceProcess process_70 = WorkPieceProcessHelper.CreateWorkPieceProcessForOP70(loginfo, db, info);
                            if (process_70 != null)
                            {//创建OP70工序，当没有70工序时,才创建 【Editby shaocx,2024-08-29】
                                db.WorkPieceProcess.Add(process_70);
                            }

                            //每次扫描上线都插入追溯表
                            WorkPieceProcess new_process = new WorkPieceProcess();
                            new_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
@@ -135,6 +145,7 @@

                            new_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                            new_process.CreatedUserName = loginfo.MonitoringPoint;
                            new_process.JiaJuGongWei = loginfo.JiaJuGongWei;
                            new_process.DataCapturePointCname = loginfo.DataCapturePointCname;
                            new_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
                            new_process.UpdatedUserName = loginfo.MonitoringPoint;
@@ -240,7 +251,11 @@
                finally
                {
                    loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                    db.WorkPieceLog.Add(loginfo);

                    if (!loginfo.WorkingProcedure.Equals("OP05"))
                    {//OP05 不记录日志了
                        db.WorkPieceLog.Add(loginfo);
                    }

                    //保存数据库的异常捕捉 [Editby shaocx,2024-08-29]
                    try