From dbb2a464d215efcda6c0761b0574e9d9d6e9f24d Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 17 10月 2024 15:35:19 +0800
Subject: [PATCH] 整改
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 20da427..b0e3aa5 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -21,6 +21,7 @@
using Spire.Additions.Xps.Schema;
using log4net;
using static Org.BouncyCastle.Math.EC.ECCurve;
+using iWare_SCADA_BusinessLogical.BLL.Important;
namespace iWare_SCADA_BusinessLogical
{
@@ -347,12 +348,12 @@
if (logMiddle.OP35OK)
{
logMiddle.QualityStateStr = "OK";
- logMiddle.QualityState = (int)QualityState.OK;
+ logMiddle.QualityState = (int)QualityStateEnum.OK;
}
else
{
logMiddle.QualityStateStr = "NG";
- logMiddle.QualityState = (int)QualityState.NG;
+ logMiddle.QualityState = (int)QualityStateEnum.NG;
}
}
else if (WorkingProcedure.Equals("OP60"))
@@ -503,6 +504,7 @@
SystemValue.OP20_Side_Value = sideValue;
}
logMiddle.MonitoringPoint += SystemValue.OP20_Side_Value;
+ logMiddle.JiaJuGongWei = SystemBussinessHelper.GetJiaJuGongWei(logMiddle.MonitoringPoint, logMiddle.WorkingProcedure);
//logMiddle.CreatedUserName = logMiddle.MonitoringPoint;
SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, logMiddle.MonitoringPoint, DataCapturePointCname);
@@ -630,7 +632,7 @@
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ QualityInfoCompleteManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
--
Gitblit v1.9.3