From 39c09dede499f7ba23bcd26b17b2199a31bddccc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 28 8月 2024 11:10:53 +0800
Subject: [PATCH] 出库执行 哟花
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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..9b0a460 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,8 +55,10 @@
public override void DataCaptureStart()
{
- if (SystemValue.isStartedModel)
+ if (SystemValue.isStartedImitateModel)
{
+ //妯℃嫙浠ｇ爜娉ㄩ噴
+ /*
var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -90,6 +92,7 @@
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ //*/
return;
}
@@ -306,11 +309,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 +333,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"))
@@ -608,9 +613,7 @@
Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}娴嬮噺瀹屾垚璇诲彇鏂囦欢鏁版嵁鏃跺紓甯�,閬垮厤宸ュ簭瀹屾垚寮傚父锛�", ex);
}
- //鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
- WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
-
+
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
WorkPieceInfoManager.QualityInfoComplete(logMiddle, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
threadStatusMonitor.Threadstatue = 1;
@@ -710,7 +713,7 @@
}
}
- public WorkPieceLogMiddle GetCH4Info(string FullName, WorkPieceLogMiddle wplog)
+ public WorkPieceLogMiddle GetCH4InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
{
try
{
@@ -774,7 +777,7 @@
}
- public WorkPieceLogMiddle GetCH5Info(string FullName, WorkPieceLogMiddle wplog)
+ public WorkPieceLogMiddle GetCH5InfoForOP30(string FullName, WorkPieceLogMiddle wplog)
{
try
{
--
Gitblit v1.9.3