From c7acb51c3ace14e509704f453adc58b9eb6613a8 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 16 10月 2024 16:23:28 +0800
Subject: [PATCH] 细节
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs
index 684fc26..a34fd66 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/Important/1_ReadQRcodeManager.cs
@@ -54,11 +54,15 @@
else
{
//瀛樺湪 琛� WorkPieceInfo鏈夛紝浣嗘槸 WorkPieceProcess杩欎釜宸ュ簭涓嶅瓨鍦ㄧ殑鎯呭喌 銆怑ditby shaocx,2024-09-06銆�
- //if (info.WorkingProcedureCurrent.Equals("OP05"))
- //{
- // loginfo.Remarks = $"璇诲彇浜岀淮鐮亄loginfo.WorkPieceID ?? "绌�"} OP05宸ュ簭閲嶅璇诲彇浜�";
- // return;
- //}
+ if (info.WorkingProcedureCurrent.Equals("OP05"))
+ {
+ //鍒ゆ柇05鏁版嵁鏄惁瀛樺湪
+ var pro_05 = db.WorkPieceProcess.Where(o => o.WorkPieceID == loginfo.WorkPieceID && o.WorkingProcedureCurrent == "OP05").FirstOrDefault();
+ if (pro_05 != null)
+ {
+ return;//涓嶉澶勭悊
+ }
+ }
}
if ((loginfo.WorkingProcedure.Equals("OP05") && isAddWorkPieceInfo == false))
{//瀛樺湪 琛� WorkPieceInfo鏈夛紝浣嗘槸 WorkPieceProcess杩欎釜宸ュ簭涓嶅瓨鍦ㄧ殑鎯呭喌
@@ -118,6 +122,12 @@
}
if (isNeedAddNewProcess)
{
+ WorkPieceProcess process_70 = WorkPieceProcessHelper.CreateWorkPieceProcessForOP70(loginfo, db, info);
+ if (process_70 != null)
+ {//鍒涘缓OP70宸ュ簭锛屽綋娌℃湁70宸ュ簭鏃�,鎵嶅垱寤� 銆怑ditby shaocx,2024-08-29銆�
+ db.WorkPieceProcess.Add(process_70);
+ }
+
//姣忔鎵弿涓婄嚎閮芥彃鍏ヨ拷婧〃
WorkPieceProcess new_process = new WorkPieceProcess();
new_process = EntityPropHelper.Mapper<WorkPieceProcess, WorkPieceInfo>(info);
@@ -135,6 +145,7 @@
new_process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
new_process.CreatedUserName = loginfo.MonitoringPoint;
+ new_process.JiaJuGongWei = loginfo.JiaJuGongWei;
new_process.DataCapturePointCname = loginfo.DataCapturePointCname;
new_process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
new_process.UpdatedUserName = loginfo.MonitoringPoint;
@@ -240,7 +251,11 @@
finally
{
loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- db.WorkPieceLog.Add(loginfo);
+
+ if (!loginfo.WorkingProcedure.Equals("OP05"))
+ {//OP05 涓嶈褰曟棩蹇椾簡
+ db.WorkPieceLog.Add(loginfo);
+ }
//淇濆瓨鏁版嵁搴撶殑寮傚父鎹曟崏 [Editby shaocx,2024-08-29]
try
--
Gitblit v1.9.3