From 2b05362eba2f989b7857349cc9a3a1c12f8181b6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 9月 2025 11:35:50 +0800
Subject: [PATCH] 222
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceProcessHelper.cs | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceProcessHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceProcessHelper.cs
index 858c84c..9c9068c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceProcessHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/WorkPieceProcessHelper.cs
@@ -49,11 +49,12 @@
process.WorkingProcedureCurrent = _procedureCurrent_05;
- process.QualityState = (int)QualityState.OK;
+ process.QualityState = (int)QualityStateEnum.OK;
process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
process.CreatedUserName = _user;
+ process.JiaJuGongWei = "";
process.DataCapturePointCname = "鎵撶爜瀹屾垚鏍囪";
process.CreatedTime = _time;
process.UpdatedUserName = _user;
@@ -63,6 +64,65 @@
process.Remarks = "";
+ process.MyRemarks = "CreateWorkPieceProcessForOP05鏍规嵁OP1002鏃舵坊鍔�";
+
+ return process;
+ }
+ return null;
+ }
+
+
+ /// <summary>
+ /// 鍒涘缓OP70宸ュ簭鏁版嵁
+ /// </summary>
+ /// <param name="db"></param>
+ /// <param name="pieceInfo"></param>
+ /// <returns></returns>
+ public static WorkPieceProcess CreateWorkPieceProcessForOP70(WorkPieceLog logMiddle, DbModel db, WorkPieceInfo pieceInfo)
+ {
+ if (!logMiddle.WorkingProcedure.Equals("OP80"))
+ {
+ return null;
+ }
+
+ var _procedureCurrent_70 = "OP70";
+
+ var pro_70 = db.WorkPieceProcess.Where(o => o.WorkPieceID == pieceInfo.WorkPieceID && o.WorkingProcedureCurrent == _procedureCurrent_70
+ ).OrderByDescending(o => o.StartTime).FirstOrDefault();
+
+ if (pro_70 == null)
+ {
+ WorkPieceProcess process = new WorkPieceProcess();
+ process.WorkPieceID = pieceInfo.WorkPieceID;
+ process.Update70Flag = 1;
+
+ var _end_time = DateTimeHelper.GetDateTime().AddSeconds(-10);
+ var _startTime = _end_time.AddSeconds(-SystemBussinessHelper.MoNiTimeForWorkingProcedure(_procedureCurrent_70));
+ var _user = "OP7001";
+ process.StartTime = _startTime;
+ process.EndTime = _end_time;
+
+ process.EquipmentID = "EOP70";
+ process.WorkingProcedureCurrent = _procedureCurrent_70;
+
+
+ process.QualityState = (int)QualityStateEnum.OK;
+
+
+ process.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ process.CreatedUserName = _user;
+ process.JiaJuGongWei = "";
+ process.DataCapturePointCname = "宸ュ簭瀹屾垚鏍囪";
+ process.CreatedTime = _end_time;
+ process.UpdatedUserName = _user;
+ process.UpdateDataCapturePointCname = "宸ュ簭瀹屾垚鏍囪";
+ process.UpdatedTime = _end_time;
+ process.OperationType = OperationType.鐢熶骇.ToString();
+
+ process.Remarks = "";
+
+ process.MyRemarks = "CreateWorkPieceProcessForOP70娣诲姞";
+
return process;
}
return null;
--
Gitblit v1.9.3