From 65950aebce26bc1b2263f32863715a6c289e527e Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 13:21:12 +0800
Subject: [PATCH] 增加每句 PieceLogType
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Enums/PieceLogTypeEnum.cs | 22 ++++++++++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs | 5 ++++-
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs | 13 +++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 1 +
4 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Enums/PieceLogTypeEnum.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Enums/PieceLogTypeEnum.cs
new file mode 100644
index 0000000..d76f289
--- /dev/null
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Enums/PieceLogTypeEnum.cs
@@ -0,0 +1,22 @@
+锘縰sing System.ComponentModel;
+
+namespace iWare.Wms.Core
+{
+ /// <summary>
+ /// 鏃ュ織绫诲瀷
+ /// </summary>
+ public enum PieceLogTypeEnum
+ {
+ /// <summary>
+ /// 姝ｅ父
+ /// </summary>
+ [Description("姝ｅ父")]
+ 姝ｅ父 = 0,
+
+ /// <summary>
+ /// 璇荤爜鍊煎紓甯�
+ /// </summary>
+ [Description("璇荤爜鍊煎紓甯�")]
+ 璇荤爜鍊煎紓甯� = 1,
+ }
+}
\ No newline at end of file
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
index 8c7be60..cbd170b 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
@@ -1,4 +1,5 @@
锘�
+using iWare.Wms.Core;
using iWare_SCADA_Model;
using log4net;
using Newtonsoft.Json;
@@ -82,7 +83,9 @@
CreatedTime = DateTime.Now,
CreatedUserName = _dataCaptureConfig.DataCapturePointCode,
MyRemarks = "璇荤爜鍊煎紓甯�",
- Remarks = "璇荤爜鍊煎紓甯�"
+ Remarks = "璇荤爜鍊煎紓甯�",
+ PieceLogType = (int)PieceLogTypeEnum.璇荤爜鍊煎紓甯�,
+ PieceLogTypeName = PieceLogTypeEnum.璇荤爜鍊煎紓甯�.ToString()
};
using (DbModel db = new DbModel())
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
index c36463f..c0b7d90 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -150,6 +150,7 @@
<Compile Include="DataCaptureHandler\PLCDataCapture\Siemens_HslCommunicationService.cs" />
<Compile Include="DataCaptureHandler\PLCDataCapture\PLCFactory.cs" />
<Compile Include="DataCaptureHandler\PLCDataCapture\PLCManger.cs" />
+ <Compile Include="Enums\PieceLogTypeEnum.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
index 8756aca..2f700e8 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/TableModel/WorkPieceLog.cs
@@ -153,5 +153,18 @@
public string UpdatedUserName { get; set; }
public bool IsDeleted { get; set; }
+
+
+ /// <summary>
+ /// 日志类型
+ /// </summary>
+ public int? PieceLogType { get; set; }
+
+ /// <summary>
+ /// 日志类型
+ /// </summary>
+ [MaxLength(255)]
+ public string PieceLogTypeName { get; set; }
+
}
}
--
Gitblit v1.9.3