From d4443cb0dfa7c7b6719fae621d7cc6d32a502dff Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 18 8月 2024 06:13:49 +0800
Subject: [PATCH] 模拟模式是否启动
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 5c7ff34..5dfed4b 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
@@ -55,7 +55,7 @@
public override void DataCaptureStart()
{
- if (SystemValue.isStartedModel)
+ if (SystemValue.isStartedImitateModel)
{
var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
@@ -306,11 +306,11 @@
logMiddle.QualityOP30To1 = FileHelper.ReadPdfFileForSpire(files[0].FullName, "Y-Maximum");//娑ㄦ柇鍔涚煩
break;
case "OP3002CH4":
- logMiddle = GetCH4Info(files[0].FullName, logMiddle);
+ logMiddle = GetCH4InfoForOP30(files[0].FullName, logMiddle);
logMiddle.OP30QualityFilePathCH4 = files[0].FullName;
break;
case "OP3002CH5":
- logMiddle = GetCH5Info(files[0].FullName, logMiddle);
+ logMiddle = GetCH5InfoForOP30(files[0].FullName, logMiddle);
logMiddle.OP30QualityFilePathCH5 = files[0].FullName;
break;
case "OP3002CH6":
@@ -330,10 +330,12 @@
if (logMiddle.OP35OK)
{
logMiddle.QualityStateStr = "OK";
+ logMiddle.QualityState = (int)QualityState.OK;
}
else
{
logMiddle.QualityStateStr = "NG";
+ logMiddle.QualityState = (int)QualityState.NG;
}
}
else if (WorkingProcedure.Equals("OP60"))
@@ -710,7 +712,7 @@
}
}
- public WorkPieceLogMiddle GetCH4Info(string FullName, WorkPieceLogMiddle wplog)
+ public WorkPieceLogMiddle GetCH4InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
{
try
{
@@ -774,7 +776,7 @@
}
- public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
+ public WorkPieceLogMiddle GetCH5InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
{
try
{
--
Gitblit v1.9.3