From 4422008672f79f74841e11f20430c5e76686e293 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 19 12月 2024 10:33:46 +0800
Subject: [PATCH] 修复 hmid更改合格状态,没清理 不合格原因的问题

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/HMI_WorkpieceWrite.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/HMI_WorkpieceWrite.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/HMI_WorkpieceWrite.cs
index ab5b439..1beceda 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/HMI_WorkpieceWrite.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/HMI_WorkpieceWrite.cs
@@ -301,8 +301,14 @@
                                         continue;
                                     }
 
+                                    QualityStateEnum qualityStateEnum = (QualityStateEnum)Enum.Parse(typeof(QualityStateEnum), QualityState.ToString());
 
                                     info.QualityState = Convert.ToInt32(QualityState);
+                                    if (qualityStateEnum == QualityStateEnum.OK)
+                                    {
+                                        info.QualityNoOk = 0;//娓呯悊涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-12-19銆�
+                                        info.QualityNoOkReason = "";
+                                    }
                                     info.QualityStateUpdateUser = "HMI";
                                     info.QualityStateUpdateTime = DateTime.Now;
                                     info.QualityStateUpdateMode = Environment.MachineName + "鑷姩";
@@ -333,12 +339,18 @@
                                     wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
 
                                     //1锛氬悎鏍� 2锛氫笉鍚堟牸 3锛氱枒浼�"
-                                    QualityStateEnum qualityStateEnum = (QualityStateEnum)Enum.Parse(typeof(QualityStateEnum), QualityState.ToString());
+
                                     wplog.Remarks = $"HMI鏇存柊宸ヤ欢璐ㄩ噺淇℃伅,淇敼涓篬{qualityStateEnum.ToString()}]";
                                     wplog.PieceLogType = (int)PieceLogTypeEnum.HMI淇敼璐ㄩ噺鐘舵��;
                                     wplog.PieceLogTypeName = PieceLogTypeEnum.HMI淇敼璐ㄩ噺鐘舵��.ToString();
                                     wplog.OnlineTime = info.WorkPieceinitOnlineTime;
 
+                                    if (qualityStateEnum == QualityStateEnum.OK)
+                                    {
+                                        wplog.QualityNoOk = 0;//娓呯悊涓嶅悎鏍煎師鍥� 銆怑ditby shaocx,2024-12-19銆�
+                                        wplog.QualityNoOkReason = "";
+                                    }
+
                                     db.WorkPieceLog.Add(wplog);
                                     db.WorkPieceInfoLog.Add(WorkPieceInfoManager.GetAddWorkPieceInfoLog(info));
                                     db.SaveChanges();

--
Gitblit v1.9.3