From a13e072eac168174bed1bafe13c095f90c2b93c1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 16 6月 2024 12:54:10 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 3 ++-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
index 3e1b93c..9cbd026 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/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");
+
+ //鏂板 銆怑ditby 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;
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
index 59a2b4b..cf02fdb 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/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;
--
Gitblit v1.9.3