From b249dbdaefbe42bc054533c9ebfbfd58fab33885 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 28 8月 2024 10:34:38 +0800
Subject: [PATCH] 重置不合格原因，当新建工序时
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 1 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 4 ++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs | 11 +++++++++++
3 files changed, 16 insertions(+), 0 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 cb9e60a..5c7014d 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -237,6 +237,7 @@
//姣忔鎵弿涓婄嚎閮芥彃鍏ヨ拷婧〃
WorkPieceProcess new_process = new WorkPieceProcess();
new_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref new_process);
new_process.StartTime = DateTimeHelper.GetDateTime();
//涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
@@ -738,6 +739,7 @@
WorkPieceProcess process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(pieceInfo);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.StartTime = DateTimeHelper.GetDateTime();
//涓嶅啀榛樿璧嬪�间负鍚堟牸 銆怑ditby shaocx,2024-08-16銆�
@@ -1098,6 +1100,7 @@
//姣忔SPC 閮芥彃鍏ヨ拷婧〃
WorkPieceProcess process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(cur_db_info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.StartTime = DateTimeHelper.GetDateTime();
process.OperationType = OperationType.SPC.ToString();
process.QualityState = (int)QualityState.Suspected;
@@ -1331,6 +1334,7 @@
{
WorkPieceProcess process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.StartTime = DateTimeHelper.GetDateTime();
process.EndTime = DateTimeHelper.GetDateTime();
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 aa3780d..2b74570 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -524,6 +524,7 @@
isAdd_WorkPieceProcess = true;
process = new WorkPieceProcess();
process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
+ QualityStateHelper.ResetQualityNoOkForNewProcess(ref process);
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.WorkingProcedureCurrent = query_WorkingProcedureCurrent;
process.StartTime = DateTimeHelper.GetDateTime();
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
index 1f591e8..d4ed380 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/QualityStateHelper.cs
@@ -14,6 +14,17 @@
/// </summary>
public class QualityStateHelper
{
+
+ /// <summary>
+ /// 閲嶇疆涓嶅悎鏍煎師鍥狅紝褰撴柊寤哄伐搴忔椂
+ /// </summary>
+ /// <param name="new_process"></param>
+ public static void ResetQualityNoOkForNewProcess(ref WorkPieceProcess new_process)
+ {
+ new_process.QualityNoOk = null;
+ new_process.QualityNoOkReason = "";
+ }
+
/// <summary>
/// OP80涓撻棬鑾峰彇鏌愪簺鐐逛綅锛岄厤缃川閲忕姸鎬�
/// </summary>
--
Gitblit v1.9.3