From 2a55eedc9ba903c6a0b9cab8fa5ddc8fee9682aa Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 09:22:26 +0800
Subject: [PATCH] 显示 [StringLength(50)] public string DataCapturePointCname { get; set; }
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 20 ++++++++++++++++----
1 files changed, 16 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 2b74570..4d4fd44 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -175,8 +175,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 +321,7 @@
}
else
{
- logMiddle.Remarks = (logMiddle.Remarks ?? "") + $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
+ logMiddle.Remarks = $"OP80涓嬬嚎瀹屾垚璇诲彇鏂囦欢{file.FullName}寮傚父锛岃鏁颁笉鏄�2琛�";
}
@@ -358,11 +359,22 @@
//淇敼QualityDataInfo琛� //閲嶅鏀跺埌璐ㄩ噺淇℃伅锛屼細瑕嗙洊涔嬪墠鐨�
EntityPropHelper<WorkPieceLogMiddle, QualityDataInfo>.CopyProp(logMiddle, qualityData, WorkPieceInfoManager.GetQualityDataInfoUpdate(logMiddle, logMiddle.WorkingProcedure, logMiddle.MonitoringPoint));//鎸囧畾淇敼瀛楁
+ //鍗曠嫭澶勭悊 璐ㄩ噺鏁版嵁鐨勭姸鎬�
+ if (isNeedUpdateQualityState)
+ {
+ qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ }
+ else
+ {//蹇呯劧鏄笉鍚堟牸
+ qualityData.QualityState = (int)(QualityState.NG);
+ }
+ qualityData.OP80QualityState = qualityData.QualityState.ToString();
+
qualityData.EquipmentID = _EquipmentId;
qualityData.QualityStateUpdateUser = info.UpdatedUserName;
qualityData.QualityReceiveTime = info.UpdatedTime.Value.LocalDateTime;
qualityData.QualityStateUpdateMode = info.QualityStateUpdateMode;
- qualityData.OP80QualityState = logMiddle.QualityState.HasValue ? logMiddle.QualityState.Value.ToString() : "3";
+
qualityData.OP80QualityReceiveTime = DateTimeHelper.GetDateTime();
qualityData.OP80QualityFilePath = logMiddle.OP80QualityFilePath;
long op80id = qualityData.Id;
@@ -370,7 +382,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}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍�";
--
Gitblit v1.9.3