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/OP80QualityDataHandler.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 4d4fd44..b846ff4 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;
@@ -184,6 +185,8 @@
WorkPieceLog loginfo2 = new WorkPieceLog();
loginfo2 = EntityPropHelper.Mapper<WorkPieceLog, WorkPieceLogMiddle>(logMiddle);
+ loginfo2.DataCapturePointCname = "OP80璐ㄩ噺閲囬泦";
+ loginfo2.CreatedUserName = loginfo2.MonitoringPoint;
var datatable = CSVHelper.ReadCSVList(file.FullName);
List<string> rowFirst = new List<string>();
@@ -331,13 +334,13 @@
//濡傛灉OP80涓嬬嚎锛屽凡缁忔洿鏀逛簡璐ㄦ鐘舵�侊紝骞朵笖璐ㄦ鐘舵�佺瓑浜庝笉鍚堟牸锛屽垯杩欓噷灏变笉瑕佺户缁洿鏀硅川妫�鐘舵�佷簡 銆怑ditby shaocx,2024-08-28銆�
bool isNeedUpdateQualityState = true;
var ooDateTime = Convert.ToDateTime("0001-01-01");
- if (pieceProcess.EndTime != ooDateTime && pieceProcess.QualityState == (int)QualityState.NG)
+ if (pieceProcess.EndTime != ooDateTime && pieceProcess.QualityState == (int)QualityStateEnum.NG)
{
isNeedUpdateQualityState = false;
}
if (isNeedUpdateQualityState)
{
- info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ info.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
logMiddle.QualityState = info.QualityState;
//鏍规嵁璐ㄩ噺鏁版嵁鍒ゆ柇鏄惁鍚堟牸/涓嶅悎鏍� 銆怑ditby shaocx,2024-06-25銆�
WorkPieceInfoManager.SetLogMiddleForQuality(ref logMiddle);
@@ -362,11 +365,11 @@
//鍗曠嫭澶勭悊 璐ㄩ噺鏁版嵁鐨勭姸鎬�
if (isNeedUpdateQualityState)
{
- qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityState.OK : QualityState.NG);
+ qualityData.QualityState = (int)((logMiddle.QualityStateStr.Equals("OK") || logMiddle.QualityStateStr.Equals("0K")) ? QualityStateEnum.OK : QualityStateEnum.NG);
}
else
{//蹇呯劧鏄笉鍚堟牸
- qualityData.QualityState = (int)(QualityState.NG);
+ qualityData.QualityState = (int)(QualityStateEnum.NG);
}
qualityData.OP80QualityState = qualityData.QualityState.ToString();
@@ -383,7 +386,7 @@
pieceProcess.QualityDataInfoID = op80id;
}
loginfo2.Remarks = $"璐ㄩ噺锛歿logMiddle.QualityStateStr ?? "绌�"}";
- if (!info.QualityState.Equals(((int)QualityState.OK).ToString()))
+ if (!info.QualityState.Equals(((int)QualityStateEnum.OK).ToString()))
{
info.QualityErrorInfo = $"{logMiddle.WorkingProcedure}宸ュ簭璐ㄩ噺閲囬泦鏁版嵁涓嶅悎鏍�";
}
@@ -511,7 +514,8 @@
WorkingProcedureCurrent = query_WorkingProcedureCurrent,
EquipmentID = _EquipmentId,
CreatedTime = DateTime.Now,
- CreatedUserName = _DataCapturePointCode
+ CreatedUserName = _DataCapturePointCode,
+ DataCapturePointCname = _DataCapturePointName
};
}
@@ -542,8 +546,11 @@
process.StartTime = DateTimeHelper.GetDateTime();
process.EndTime = file.LastWriteTime;
process.CreatedUserName = _DataCapturePointCode;
+ process.JiaJuGongWei = "";
+ 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