2
schangxiang@126.com
2024-06-16 a13e072eac168174bed1bafe13c095f90c2b93c1
2
已修改2个文件
22 ■■■■■ 文件已修改
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -2019,6 +2019,25 @@
                    dict.Add("QualityOP80To8", "QualityOP80To8");
                    dict.Add("QualityOP80To9", "QualityOP80To9");
                    dict.Add("QualityOP80To10", "QualityOP80To10");
                    //新增 【Editby shaocx,2024-06-16】
                    dict.Add("QualityOP80_Houdu", "QualityOP80_Houdu");
                    dict.Add("QualityOP80_ZXJ", "QualityOP80_ZXJ");
                    dict.Add("QualityOP80_DTKYZD", "QualityOP80_DTKYZD");
                    dict.Add("QualityOP80_XTSMYD", "QualityOP80_XTSMYD");
                    dict.Add("QualityOP80_XTXMYD", "QualityOP80_XTXMYD");
                    dict.Add("QualityOP80_D_TKZJ", "QualityOP80_D_TKZJ");
                    dict.Add("QualityOP80_D_S_X", "QualityOP80_D_S_X");
                    dict.Add("QualityOP80_D_S_Y", "QualityOP80_D_S_Y");
                    dict.Add("QualityOP80_D_X_X", "QualityOP80_D_X_X");
                    dict.Add("QualityOP80_D_X_Y", "QualityOP80_D_X_Y");
                    dict.Add("QualityOP80_X_TKZJ", "QualityOP80_X_TKZJ");
                    dict.Add("QualityOP80_X_S_X", "QualityOP80_X_S_X");
                    dict.Add("QualityOP80_X_S_Y", "QualityOP80_X_S_Y");
                    dict.Add("QualityOP80_X_X_X", "QualityOP80_X_X_X");
                    dict.Add("QualityOP80_X_X_Y", "QualityOP80_X_X_Y");
                    break;
                default:
                    break;
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -150,7 +150,7 @@
                        WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
                        wplog.WorkPieceID = pieceProcess.WorkPieceID;
                        wplog.WorkingProcedure = _DataCapturePointCode;
                        wplog.WorkingProcedure = query_WorkingProcedureCurrent;
                        wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
                        wplog.EquipmentID = _dataCaptureConfig.EquipmentID; ;
                        wplog.Remarks = wplog.WorkingProcedure;
@@ -322,6 +322,7 @@
                        //修改QualityDataInfo表 //重复收到质量信息,会覆盖之前的
                        EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(wplog, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(wplog.WorkingProcedure, wplog.MonitoringPoint));//指定修改字段
                        qualityData.EquipmentID = "EOP80";
                        qualityData.QualityStateUpdateUser = info.UpdatedUserName;
                        qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
                        qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;