From 03de13b2a5357916a7b6ec2f3e8a9ff6ca2e3970 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 18:17:22 +0800
Subject: [PATCH] 日志优化
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs | 4 +++-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs | 24 ++++++++++++++----------
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
index e01949f..6f034ad 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/WorkPieceInfoManager.cs
@@ -1,4 +1,5 @@
锘縰sing HslCommunication.BasicFramework;
+using iWare.Wms.Core;
using iWare_SCADA_BusinessLogical.Utils;
using iWare_SCADA_Model;
using iWare_SCADA_Model.MiddleModel;
@@ -58,13 +59,16 @@
public static WorkPieceLog GetAddWorkPieceLog(WorkPieceLog loginfo)
{
loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ PieceLogTypeEnum pieceLogTypeEnum = PieceLogTypeEnum.姝ｅ父;
+ loginfo.PieceLogType = (int)pieceLogTypeEnum;
+ loginfo.PieceLogTypeName = pieceLogTypeEnum.ToString();
return loginfo;
}
- public static WorkPieceLog GetAddWorkPieceLog1(WorkPieceLogMiddle loginfo)
- {
- loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- return loginfo;
- }
+ //public static WorkPieceLog GetAddWorkPieceLog1(WorkPieceLogMiddle loginfo)
+ //{
+ // loginfo.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+ // return loginfo;
+ //}
/// <summary>
/// 閫氳繃WorkPieceInfo 缁橶orkPieceInfoLog 灞炴�ц祴鍊�
/// </summary>
@@ -156,7 +160,7 @@
}
}
-
+
public static WorkPieceLogMiddle QualityDataHand(WorkPieceLogMiddle loginfo, List<EquipmentQualityConfig> qcofig)
{
try
@@ -250,7 +254,7 @@
return loginfo;
}
-
+
/// <summary>
/// 璧嬪�� 淇敼浜� 銆怑ditby shaocx,2024-07-05銆�
@@ -266,8 +270,8 @@
return logMiddle.MonitoringPoint;
}
-
-
+
+
public static void SetWorkingProcedureCurrentForOP10(WorkPieceInfo cur_db_info, ref string set_WorkingProcedureCurrent)
@@ -299,7 +303,7 @@
}
}
-
+
public static void AlertMonitor(WorkPieceLog loginfo, LogType type)
{
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 a80616a..6c71323 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/OP80QualityDataHandler.cs
@@ -185,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>();
@@ -513,7 +515,7 @@
EquipmentID = _EquipmentId,
CreatedTime = DateTime.Now,
CreatedUserName = _DataCapturePointCode,
- DataCapturePointCname= _DataCapturePointName
+ DataCapturePointCname = _DataCapturePointName
};
}
--
Gitblit v1.9.3