库存管理的过期天数要改为过期小时、取消的任务不计入库存管理

杨张扬

2025-06-10 c3d2666ddfe09fd79ccff9782e4cbba6cab35547

 wms/SpecHelper.cs

@@ -77,7 +77,7 @@
                var log = JsonConvert.SerializeObject(model);
                if (model != null)
                {
                    model.Expiration = System.DateTime.Now.AddMinutes(GetExportTime(model.Spec));
                    model.EXPIRATION = System.DateTime.Now.AddHours(GetExportTime(model.SPEC));

                    if (db.Insertable<TN_EquipProDetail>(model).ExecuteCommand() > 0)
                    {
@@ -87,27 +87,6 @@
                    {
                        LogHelper.Info($"插入设备生产明细失败，{log}");
                    }
                }
            }
            catch (Exception ex)
            {
                LogHelper.Error("插入设备生产明细失败", ex);
            }
        }

        /// <summary>
        /// 更新设备生产明细的过期时间
        /// </summary>
        public static void UpdateEquipProDetail(string cg_SID)
        {
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var target = db.Queryable<TN_EquipProDetail>().First(a => a.S_ID == cg_SID);
                if (target != null)
                {
                    target.Expiration = System.DateTime.Now.AddMinutes(GetExportTime(target.Spec));
                    db.Updateable<TN_EquipProDetail>().UpdateColumns(it => new { it.Expiration }).ExecuteCommand();
                }
            }
            catch (Exception ex)
@@ -129,8 +108,8 @@
                var log = JsonConvert.SerializeObject(model);
                if (model != null)
                {
                    model.OutAreaTime = System.DateTime.Now;
                    model.Type = "满托出库上线";
                    model.OUTAREATIME = System.DateTime.Now;
                    model.TYPE = "满托出库上线";

                    if (db.Insertable<TN_Component_Detail>(model).ExecuteCommand() > 0)
                    {
@@ -156,11 +135,11 @@
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var target  = db.Queryable<TN_Component_Detail>().First(o => o.TaskNo == taskNo);
                var target  = db.Queryable<TN_Component_Detail>().First(o => o.TASKNO == taskNo);

                if (target != null)
                {
                    target.EndTime = System.DateTime.Now;
                    target.ENDTIME = System.DateTime.Now;

                    if (db.Updateable<TN_Component_Detail>(target).ExecuteCommand() > 0)
                    {
@@ -191,7 +170,7 @@
                var log = JsonConvert.SerializeObject(model);
                if (model != null)
                {
                    model.RemeltTime = System.DateTime.Now;
                    model.REMELTTIME = System.DateTime.Now;

                    if (db.Insertable<TN_RemeltDetail>(model).ExecuteCommand() > 0)
                    {
@@ -217,11 +196,11 @@
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var target = db.Queryable<TN_RemeltDetail>().First(o => o.TaskNo == taskNo);
                var target = db.Queryable<TN_RemeltDetail>().First(o => o.TASKNO == taskNo);

                if (target != null)
                {
                    target.EndTime = System.DateTime.Now;
                    target.ENDTIME = System.DateTime.Now;

                    if (db.Updateable<TN_RemeltDetail>(target).ExecuteCommand() > 0)
                    {
@@ -252,7 +231,7 @@
                var log = JsonConvert.SerializeObject(model);
                if (model != null)
                {
                    model.RemeltTime = System.DateTime.Now;
                    model.REMELTTIME = System.DateTime.Now;

                    if (db.Insertable<TN_SurplusDetail>(model).ExecuteCommand() > 0)
                    {
@@ -278,11 +257,11 @@
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var target = db.Queryable<TN_SurplusDetail>().First(o => o.TaskNo == taskNo);
                var target = db.Queryable<TN_SurplusDetail>().First(o => o.TASKNO == taskNo);

                if (target != null)
                {
                    target.EndTime = System.DateTime.Now;
                    target.ENDTIME = System.DateTime.Now;

                    if (db.Updateable<TN_SurplusDetail>(target).ExecuteCommand() > 0)
                    {
@@ -308,11 +287,11 @@
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var target = db.Queryable<TN_SurplusDetail>().First(o => o.TaskNo == taskNo);
                var target = db.Queryable<TN_SurplusDetail>().First(o => o.TASKNO == taskNo);

                if (target != null)
                {
                    target.Weight = weight;
                    target.WEIGHT = weight;
                    if (db.Updateable<TN_SurplusDetail>(target).ExecuteCommand() > 0)
                    {
                        LogHelper.Info($"更新余料回库明细成功，{taskNo}");
@@ -347,7 +326,7 @@
                    {
                        db.Deleteable<TN_InventoryM>(target).ExecuteCommand();
                    }
                    model.Expiration = System.DateTime.Now.AddMinutes(GetExportTime(model.Spec));
                    model.EXPIRATION = System.DateTime.Now.AddHours(GetExportTime(model.SPEC));
                    if (db.Insertable<TN_InventoryM>(model).ExecuteCommand() > 0)
                    {
                        LogHelper.Info($"插入WMS库存明细成功，{log}");
@@ -364,25 +343,99 @@
            }
        }


        /// <summary>
        /// 更新WMS库存明细的过期时间
        /// 更新WMS库存明细的入库时间
        /// </summary>
        public static void UpdateInventoryM(string cg_SID)
        public static void UpdateInventoryM_RuKu(string cntId)
        {
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                var target = db.Queryable<TN_InventoryM>().First(a => a.S_ID == cg_SID);
                var target = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == cntId);
                if (target != null)
                {
                    target.Expiration = System.DateTime.Now.AddMinutes(GetExportTime(target.Spec));
                    db.Updateable<TN_InventoryM>().UpdateColumns(it => new { it.Expiration }).ExecuteCommand();
                    var targetM = db.Queryable<TN_InventoryM>().First(a => a.S_ID == target.S_ID);

                    if (targetM != null)
                    {
                        targetM.INAREATIME = System.DateTime.Now;
                        if(db.Updateable<TN_InventoryM>(targetM).UpdateColumns(it => new { it.INAREATIME }).ExecuteCommand() > 0)
                        {
                            LogHelper.Info($"更新WMS库存明细的入库时间，成功，容器号：{cntId}");
                        }
                        else
                        {
                            LogHelper.Info($"更新WMS库存明细的入库时间，失败，容器号：{cntId}");
                        }
                    }
                    else
                    {
                        LogHelper.Info($"更新WMS库存明细的入库时间，失败，容器号：{cntId}，TN_InventoryM为空");
                    }
                }
                else
                {
                    LogHelper.Info($"更新WMS库存明细的入库时间，失败，容器号：{cntId}，TN_CG_Detail为空");
                }
            }
            catch (Exception ex)
            {
                LogHelper.Error("插入设备生产明细失败", ex);
                LogHelper.Error("更新WMS库存明细的入库时间失败", ex);
            }
        }

        /// <summary>
        /// 删除WMS库存明细
        /// </summary>
        public static void DeleteInventoryM(string cg_SID)
        {
            try
            {
                var db = new SqlHelper<object>().GetInstance();
                if(db.Deleteable<TN_InventoryM>().Where(it => it.S_ID == cg_SID).ExecuteCommand() > 0)
                {
                    LogHelper.Info($"删除WMS库存明细，成功，物料主键：{cg_SID}");
                }
                else
                {
                    LogHelper.Info($"删除WMS库存明细，失败，物料主键：{cg_SID}");
                }
            }
            catch (Exception ex)
            {
                LogHelper.Error("更新WMS库存明细的过期时间失败", ex);
            }
        }

        /// <summary>
        /// 计算时间差
        /// </summary>
        /// <param name="start"></param>
        /// <param name="end"></param>
        /// <returns></returns>
        public static int CalculateDaysDifference(DateTime start, DateTime end)
        {
            try
            {
                // 计算总时间差
                TimeSpan difference = end - start;

                // 如果差值为负（end早于start），返回0
                if (difference.TotalDays < 0)
                {
                    return 0;
                }


                // 获取总小时数（包括小数部分）
                double totalHours = difference.TotalHours;

                // 向上取整
                return (int)Math.Ceiling(totalHours);
            }
            catch (Exception ex)
            {
                return 0;
            }
        }
    }