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

杨张扬

2025-06-10 c3d2666ddfe09fd79ccff9782e4cbba6cab35547

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

 core/Monitor.cs

@@ -534,6 +534,7 @@
                    db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
                }

              
                targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
                   Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "待检" && i.N_ITEM_STATE == 1).First();

@@ -565,6 +566,13 @@
                    db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
                }

                var targetInM_De = db.Queryable<TN_InventoryM>().LeftJoin<TN_Task>((o, i) => o.RFID == i.S_CNTR_CODE).
                  Where((o, i) => i.N_B_STATE == 4 || i.S_B_STATE == "错误").ToList();//错误的任务删除对应的库存信息
                if (targetInM_De.Count>0)
                {
                    db.Deleteable<TN_InventoryM>(targetInM_De).ExecuteCommand();
                }

                //  同步 TN_DayProDetail
                var curDay = System.DateTime.Now.Date;
                var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curDay && a.DOWNLINETIME <= curDay.AddDays(1)).ToList();

 core/WCSCore.cs

@@ -175,7 +175,7 @@
                                            }
                                        }
                                    });
                                   

                                    break;
                                case 8:
                                    

 models/TN_InventoryM.cs

@@ -55,7 +55,7 @@
        public DateTime EXPIRATION { get; set; }

        /// <summary>
        /// 距离过期还有几天
        /// 距离过期还有几小时
        /// </summary>
        public string EXPIRATION_DAY { get; set; } = "0";
    }

 wms/SpecHelper.cs

@@ -407,6 +407,12 @@
            }
        }

        /// <summary>
        /// 计算时间差
        /// </summary>
        /// <param name="start"></param>
        /// <param name="end"></param>
        /// <returns></returns>
        public static int CalculateDaysDifference(DateTime start, DateTime end)
        {
            try
@@ -420,11 +426,12 @@
                    return 0;
                }

                // 获取总天数（包括小数部分）
                double totalDays = difference.TotalDays;

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

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