From 3ae4d4e84face9c3f81a8cd74e6458b5914a43e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 20 6月 2024 14:29:53 +0800
Subject: [PATCH] 2
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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 9775d69..9cbd026 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1097,7 +1097,13 @@
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.StartTime = DateTimeHelper.GetDateTime();
process.EndTime = DateTimeHelper.GetDateTime();
- process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
+ if (loginfo.WorkingProcedure.Equals("OP80"))
+ {//OP80鐨勮川閲忔暟鎹槸鍚庢潵鑾峰彇鏂囦欢鎼炵殑
+ }
+ else
+ {
+ process.QualityState = loginfo.QualityState.HasValue ? loginfo.QualityState.Value : (int)QualityState.OK;
+ }
process.CreatedUserName = loginfo.MonitoringPoint;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = loginfo.MonitoringPoint;
@@ -2013,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;
--
Gitblit v1.9.3