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/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 f9557ad..2211191 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
@@ -1,4 +1,5 @@
锘縰sing iWare_SCADA_BusinessLogical.BLL;
+using iWare_SCADA_BusinessLogical.BLL.Important;
using iWare_SCADA_BusinessLogical.Utils;
using iWare_SCADA_Model;
using log4net;
@@ -93,9 +94,17 @@
using (DbModel db = new DbModel())
{
var dateTime = DateTime.Now;
- noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x => x.CreatedTime >= findTime
- && x.WorkingProcedureCurrent == WorkingProcedure
- && x.EndTime == ooDateTime).ToList();
+ noFinishWorkPieceProcessList = db.WorkPieceProcess.Where(x =>
+ x.WorkingProcedureCurrent == WorkingProcedure
+ && (
+
+ (x.CreatedTime >= findTime
+ && x.EndTime == ooDateTime)
+ || x.Update70Flag == 1
+
+ )
+
+ ).ToList();
}
if (noFinishWorkPieceProcessList?.Count <= 0)
{
@@ -110,8 +119,9 @@
wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
wplog.Remarks = WorkingProcedure;
wplog.MonitoringPoint = DataCapturePointCode;
+ //wplog.CreatedUserName = DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.OnlineTime = DateTimeHelper.GetDateTime();
@@ -158,7 +168,7 @@
foreach (var item in noFinishWorkPieceProcessList)
{
wplog.WorkPieceID = item.WorkPieceID;
- WorkPieceInfoManager.QualityInfoCompleteForOP70(wplog, LogType.OP7009);
+ QualityInfoCompleteManager.QualityInfoCompleteForOP70(wplog, LogType.OP7009);
// threadStatusMonitor.Threadstatue = 1;
}
}
--
Gitblit v1.9.3