From fb726bc28268c7efb73629f6ae12b25232a18538 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 22 二月 2025 15:34:20 +0800
Subject: [PATCH] Add OPERATION_END property and update database handling
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 4 +++-
Tiger.Business.MES/Transaction/CollectNode.cs | 1 +
Tiger.Business.WMS/Transaction/WmsCount.cs | 2 +-
Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 18 ++++++++++++++++++
Tiger.Business.MES/Transaction/PackingNode.cs | 4 +++-
Tiger.Dependencies/Tiger.Dependencies.csproj | 1 +
Tiger.Business.MES/Common/WorkBatch.cs | 1 +
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 15 +++++++++++++++
Tiger.Business.WMS/Transaction/ShelfRemote.cs | 2 +-
Tiger.Business.MES/Transaction/TestNode.cs | 1 +
10 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index 0d1811e..1de3073 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -656,6 +656,7 @@
wipSN.NODE_ID = "";
wipSN.NODE_NAME = "涓嬬嚎閫�搴�";
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]涓嬬嚎");
wipHiss.Add(his);
}
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 880b248..afeb179 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -360,6 +360,7 @@
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.UNBIND_FLAG = "N";
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
var curShiftPeriod = GetShiftPeriodForNow();
if (!curShiftPeriod.IsNullOrEmpty())
{
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 4621164..d155090 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -407,6 +407,7 @@
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.UNBIND_FLAG = "N";
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
var curShiftPeriod = GetShiftPeriodForNow();
if (!curShiftPeriod.IsNullOrEmpty())
{
@@ -668,6 +669,7 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
}
var wipHiss = new List<MES_WIP_HIS>();
@@ -690,7 +692,7 @@
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
db.Updateable(_woSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
- db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME }).ExecuteCommand();
+ db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME, q.OPERATION_END }).ExecuteCommand();
db.Storageable(_wipHiss, UserCode).ExecuteCommand();
if (_pkgList.Any())
{
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index d745dd0..5422b50 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -356,6 +356,7 @@
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.UNBIND_FLAG = "N";
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
var curShiftPeriod = GetShiftPeriodForNow();
if (!curShiftPeriod.IsNullOrEmpty())
{
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index ff1d57f..72b1ea5 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -480,6 +480,7 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
wipSN.SHIPPING_ORDER = ShippingOrder;
wipSN.UNBIND_FLAG = "N";
var curShiftPeriod = GetShiftPeriodForNow();
@@ -746,6 +747,7 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
+ wipSN.OPERATION_END = DateTime.Now;
}
var wipHiss = new List<MES_WIP_HIS>();
@@ -769,7 +771,7 @@
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
db.Updateable(_woSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
- db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME }).ExecuteCommand();
+ db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME, q.OPERATION_END }).ExecuteCommand();
db.Storageable(_wipHiss, UserCode).ExecuteCommand();
if (_pkgList.Any())
{
diff --git a/Tiger.Business.WMS/Transaction/ShelfRemote.cs b/Tiger.Business.WMS/Transaction/ShelfRemote.cs
index 64f00ed..ccdfabd 100644
--- a/Tiger.Business.WMS/Transaction/ShelfRemote.cs
+++ b/Tiger.Business.WMS/Transaction/ShelfRemote.cs
@@ -17,7 +17,7 @@
namespace Tiger.Business.WMS.Transaction
{
/// <summary>
- /// 璐ф灦閬ユ帶鍣�
+ /// 璐ф灦閬ユ帶浜嬪姟
/// </summary>
public class ShelfRemote : WMSTransactionBase, IShelfRemote
{
diff --git a/Tiger.Business.WMS/Transaction/WmsCount.cs b/Tiger.Business.WMS/Transaction/WmsCount.cs
index c99865e..e4f788b 100644
--- a/Tiger.Business.WMS/Transaction/WmsCount.cs
+++ b/Tiger.Business.WMS/Transaction/WmsCount.cs
@@ -16,7 +16,7 @@
namespace Tiger.Business.WMS.Transaction
{
/// <summary>
- /// 鐩樼偣璋冨害浜嬪姟
+ /// 浠撳簱鐩樼偣浜嬪姟
/// </summary>
public class WmsCount : WMSTransactionBase, IWmsCount
{
diff --git a/Tiger.Dependencies/Tiger.Dependencies.csproj b/Tiger.Dependencies/Tiger.Dependencies.csproj
index 869b90a..4ae0e9d 100644
--- a/Tiger.Dependencies/Tiger.Dependencies.csproj
+++ b/Tiger.Dependencies/Tiger.Dependencies.csproj
@@ -14,6 +14,7 @@
<PackageReference Include="Autofac.Configuration" Version="7.0.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="FluentScheduler" Version="5.5.1" />
+ <PackageReference Include="IronPython" Version="3.4.2" />
<PackageReference Include="MailKit" Version="4.8.0" />
<PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NLog.Database" Version="5.3.4" />
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index ff829f4..3fa1f45 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -189,6 +189,21 @@
[DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
/// <summary>
+ /// 鎿嶄綔瀹屾垚鏃堕棿
+ /// </summary>
+ [DisplayName("鎿嶄綔瀹屾垚鏃堕棿")]
+ public DateTime OPERATION_END { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 涓嶈壇鏁伴噺
+ /// </summary>
+ [DisplayName("涓嶈壇鏁伴噺")]
+ public int DFT_QTY { get; set; } = 0;
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ /// </summary>
+ [DisplayName("鎶ュ簾鏁伴噺")]
+ public int SCRAP_QTY { get; set; } = 0;
+ /// <summary>
/// 鐝埗缂栫爜
/// </summary>
[DisplayName("鐝埗缂栫爜")]
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
index 7bf3d19..bd6eeaf 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
@@ -68,6 +68,9 @@
INLINE_DATE = data.INLINE_DATE;
OUTLINE_DATE = data.OUTLINE_DATE;
OPERATION_TIME = data.OPERATION_TIME;
+ OPERATION_END = data.OPERATION_END;
+ DFT_QTY = data.DFT_QTY;
+ SCRAP_QTY = data.SCRAP_QTY;
SFTS_CODE = data.SFTS_CODE;
SFT_CODE = data.SFT_CODE;
PRD_CODE = data.PRD_CODE;
@@ -253,6 +256,21 @@
[DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
/// <summary>
+ /// 鎿嶄綔瀹屾垚鏃堕棿
+ /// </summary>
+ [DisplayName("鎿嶄綔瀹屾垚鏃堕棿")]
+ public DateTime OPERATION_END { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 涓嶈壇鏁伴噺
+ /// </summary>
+ [DisplayName("涓嶈壇鏁伴噺")]
+ public int DFT_QTY { get; set; } = 0;
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ /// </summary>
+ [DisplayName("鎶ュ簾鏁伴噺")]
+ public int SCRAP_QTY { get; set; } = 0;
+ /// <summary>
/// 鐝埗缂栫爜
/// </summary>
[DisplayName("鐝埗缂栫爜")]
--
Gitblit v1.9.3