Add OPERATION_END property and update database handling

Rodney Chen

2025-02-22 fb726bc28268c7efb73629f6ae12b25232a18538

Add OPERATION_END property and update database handling

Added OPERATION_END property to various classes and updated
database commands to handle it. Introduced DFT_QTY and SCRAP_QTY
properties to MES_WIP_DATA and MES_WIP_HIS classes. Updated
constructors in MES_WIP_HIS.cs to initialize new properties.
Improved comments in ShelfRemote.cs and WmsCount.cs. Added
IronPython 3.4.2 dependency in Tiger.Dependencies.csproj.

 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);
                }

 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())
                        {

 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())
                    {

 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())
                        {

 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())
                    {

 Tiger.Business.WMS/Transaction/ShelfRemote.cs

@@ -17,7 +17,7 @@
namespace Tiger.Business.WMS.Transaction
{
    /// <summary>
    /// 货架遥控器
    /// 货架遥控事务
    /// </summary>
    public class ShelfRemote : WMSTransactionBase, IShelfRemote
    {

 Tiger.Business.WMS/Transaction/WmsCount.cs

@@ -16,7 +16,7 @@
namespace Tiger.Business.WMS.Transaction
{
    /// <summary>
    /// 盘点调度事务
    /// 仓库盘点事务
    /// </summary>
    public class WmsCount : WMSTransactionBase, IWmsCount
    {

 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" />

 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("班制编码")]

 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("班制编码")]