From 4422008672f79f74841e11f20430c5e76686e293 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 19 12月 2024 10:33:46 +0800
Subject: [PATCH] 修复 hmid更改合格状态，没清理 不合格原因的问题
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs
index b4df471..16631df 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_OP6002.cs
@@ -14,9 +14,9 @@
namespace iWare_SCADA_BusinessLogical
{
/// <summary>
- /// OP60娴嬮噺瀹屾垚鏍囪楠岃瘉
+ /// OP60娴嬮噺瀹屾垚鏍囪楠岃瘉锛堢函灞炰簬 鐩戞帶鐢級
/// </summary>
- public class DataCaptureHandler_OP6002: DataCaptureHandler
+ public class DataCaptureHandler_OP6002 : DataCaptureHandler
{
public static readonly DataCaptureHandler_OP6002 Instance = new DataCaptureHandler_OP6002();
@@ -98,9 +98,10 @@
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.UpdatedUserName = Environment.MachineName+"鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
+ wplog.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
wplog.UpdatedTime = DateTimeHelper.GetDateTime();
wplog.IsDeleted = false;
wplog.QualityType = QualityType.Online.ToString();
@@ -116,33 +117,38 @@
if (valuecola.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002AA";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.52.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else if (valuecolb.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002BB";
- code = plcService.ReadValuePointV2("DB2050.76.0", typeof(string),22)?.ToString();
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
+ code = plcService.ReadValuePointV2("DB2050.76.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else if (valuecolc.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002CC";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.100.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else if (valuecold.ToString().ToUpper().Equals("TRUE"))
{
wplog.CreatedUserName = "OP6002DD";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
code = plcService.ReadValuePointV2("DB2050.124.0", typeof(string), 22)?.ToString();
quality = plcService.ReadValuePointV2("DB2050.6.0", typeof(string), 2)?.ToString();
}
else
{
wplog.CreatedUserName = "OP6002EE";
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.CreatedUserName, DataCapturePointCname);
}
- wplog.WorkPieceID= code;
+ wplog.WorkPieceID = code;
wplog.Remarks = $"{valuecola.ToString().ToUpper()}|{valuecolb.ToString().ToUpper()}|{valuecolc.ToString().ToUpper()}|{valuecold.ToString().ToUpper()} 璐ㄩ噺缁撴灉锛歿quality}";
//鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
--
Gitblit v1.9.3