From c66c25cb7b1eec1d3b3de4496525dffe9a3c4040 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 18 8月 2024 10:27:37 +0800
Subject: [PATCH] 1

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
index e818816..cbfd2ca 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
@@ -135,6 +135,12 @@
 
                             Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***3****");
 
+                            if (string.IsNullOrEmpty(wplog.QualityOP70To1) && string.IsNullOrEmpty(wplog.QualityOP70To2) && string.IsNullOrEmpty(wplog.QualityOP70To3))
+                            {
+                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊奸兘鏄┖鐨勶細");
+                                continue;
+                            }
+
                             //鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃
                             var ooDateTime = Convert.ToDateTime("0001-01-01");
                             List<WorkPieceProcess> noFinishWorkPieceProcessList = null;
@@ -142,6 +148,7 @@
                             {
                                 var dateTime = DateTime.Now;
                                 noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x => x.CreatedTime >= DateTime.Now.AddHours(-12)
+                                  && x.WorkingProcedureCurrent == WorkingProcedure
                                   && x.EndTime == ooDateTime).ToList();
                             }
                             if (noFinishWorkPieceProcessList?.Count > 0)
@@ -153,6 +160,10 @@
                                     threadStatusMonitor.Threadstatue = 1;
                                 }
                             }
+                            else
+                            {
+                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊兼湁鍊硷紝浣嗘槸鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃涓虹┖锛�");
+                            }
                         }
 
 

--
Gitblit v1.9.3