From 2c53ddfdef7167fed7d777ee72e6e445c0ed91d3 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 9月 2024 07:30:08 +0800
Subject: [PATCH] 优化 op05上线
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - 新版.cs | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git "a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - \345\244\215\345\210\266\0502\051.cs" "b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - \346\226\260\347\211\210.cs"
similarity index 92%
rename from "DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - \345\244\215\345\210\266\0502\051.cs"
rename to "DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - \346\226\260\347\211\210.cs"
index 5d893a1..d870c5e 100644
--- "a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - \345\244\215\345\210\266\0502\051.cs"
+++ "b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP0501 - \346\226\260\347\211\210.cs"
@@ -296,21 +296,41 @@
// wplog.KnifeToolEarlyWarningLife = 3;
// wplog.KnifeToolSurplusLife = 10;
+// //蹇�熷鐞�
+// List<WorkPieceLog> wplogs = new List<WorkPieceLog>();
+
// foreach (var item in filteredRows)
// {
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
-// $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇诲彇宸ユ帶鏈轰腑浜岀淮鐮佷俊鎭�,璇诲彇宸ヤ欢浜岀淮鐮�:{item["鎵撴爣鍐呭"].ToString()}");
-
// if (item == null) break;
// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
// wplog.WorkPieceID = item["鎵撴爣鍐呭"].ToString();
// wplog.OfflineTime = Convert.ToDateTime(dataTime);
// wplog.Remarks = item["鏃堕棿"].ToString() + "|" + item["鎵撴爣鍐呭"].ToString() + "|" + item["鎵撴爣鍐呭"].ToString() + "|" + item["鎵爜绛夌骇"].ToString() + "|" + item["鎵爜缁撴灉"].ToString();
+// //杞崲
+// WorkPieceLog newLog = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLog>(wplog);
+// wplogs.Add(newLog);
+// }
+// //鏌ヨ鏁版嵁锛岃繃婊�
+// var queryList = wplogs.Select(x => x.WorkPieceID).ToList();
+// List<WorkPieceProcess> new_exist_WorkPieceProcess = new List<WorkPieceProcess>();
+// using (DbModel db = new DbModel())
+// {
+// //鎵惧埌鏁版嵁搴撲腑宸叉湁杩欎釜宸ュ簭鐨勬暟鎹�
+// new_exist_WorkPieceProcess = db.WorkPieceProcess.Where(o => queryList.Contains(o.WorkPieceID)
+// && o.WorkingProcedureCurrent == _dataCaptureConfig.WorkingProcedure).ToList();
+// }
+// var querynew__exist_WorkPieceProcessList = new_exist_WorkPieceProcess.Select(x => x.WorkPieceID).ToList();
+// //鎵惧埌闇�瑕佹柊澧炵殑鏁版嵁
+// wplogs = wplogs.Where(x => !querynew__exist_WorkPieceProcessList.Contains(x.WorkPieceID)).ToList();
+// foreach (var item in wplogs)
+// {
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
+// $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇诲彇宸ユ帶鏈轰腑浜岀淮鐮佷俊鎭�,璇诲彇宸ヤ欢浜岀淮鐮�:{item.WorkPieceID.ToString()}");
+
// WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), null, _dataCaptureConfig.IsFeedback);
// threadStatusMonitor.Threadstatue = 1;
// }
-
// //璁板綍涓嬫渶鍚庝竴涓爜
// lastHandlerWorkPileIDForOP0501 = Convert.ToString(dt.Rows[dt.Rows.Count - 1]["鎵撴爣鍐呭"]);
--
Gitblit v1.9.3