From 953bc88c74023afffc12505635a22e84d9964c9c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 9月 2024 11:06:28 +0800
Subject: [PATCH] NOOK时，也要 新建 工序
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
index f0a827f..f1d93d1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -28,6 +28,7 @@
public static readonly string path = ConfigHelper.GetConfigString("OP80QualityData");//OP80鐨勫湴鍧�
public static readonly string query_WorkingProcedureCurrent = "OP80";
public static readonly string _DataCapturePointCode = "OP8002";
+ public static readonly string _DataCapturePointName = "OP80璐ㄩ噺鏁版嵁閲囬泦";
public static readonly string _EquipmentId = "EOP80";
public static readonly LogType logType = LogType.PLCOP80_QC;
@@ -175,8 +176,9 @@
logMiddle.EquipmentID = _dataCaptureConfig.EquipmentID; ;
logMiddle.Remarks = logMiddle.WorkingProcedure;
logMiddle.MonitoringPoint = _DataCapturePointCode;
+ //logMiddle.CreatedUserName = _DataCapturePointCode;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref logMiddle, DataCapturePointCode, DataCapturePointCname);
logMiddle.CreatedTime = DateTimeHelper.GetDateTime();
- logMiddle.CreatedUserName = _DataCapturePointCode;
logMiddle.UpdatedTime = DateTimeHelper.GetDateTime();
logMiddle.UpdatedUserName = Environment.MachineName + "鑷姩" + Thread.CurrentThread.ManagedThreadId.ToString();
logMiddle.IsDeleted = false;
@@ -320,7 +322,7 @@
}
else
{
- logMiddle.Remarks = (logMiddle.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
+ logMiddle.Remarks = $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
}
@@ -381,7 +383,7 @@
{
pieceProcess.QualityDataInfoID = op80id;
}
- loginfo2.Remarks = (loginfo2.Remarks ?? "") + $"璐ㄩ噺锛歿logMiddle.QualityStateStr ?? "绌�"}";
+ loginfo2.Remarks = $"璐ㄩ噺锛歿logMiddle.QualityStateStr ?? "绌�"}";
if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
{
info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍�";
@@ -510,7 +512,8 @@
WorkingProcedureCurrent = query_WorkingProcedureCurrent,
EquipmentID = _EquipmentId,
CreatedTime = DateTime.Now,
- CreatedUserName = _DataCapturePointCode
+ CreatedUserName = _DataCapturePointCode,
+ DataCapturePointCname= _DataCapturePointName
};
}
@@ -541,8 +544,10 @@
process.StartTime = DateTimeHelper.GetDateTime();
process.EndTime = file.LastWriteTime;
process.CreatedUserName = _DataCapturePointCode;
+ process.DataCapturePointCname = DataCapturePointCname;
process.CreatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.UpdatedUserName = _DataCapturePointCode;
+ process.UpdateDataCapturePointCname = DataCapturePointCname;
process.UpdatedTime = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
process.OperationType = OperationType.鐢熶骇.ToString();
process.Remarks = "";
--
Gitblit v1.9.3