优化产品入库逻辑，修复货位绑定和货品明细重复的问题

kazelee

2025-06-23 79e04c3c2125ab860670f05b0f73ca9cc4168c0f

 core/Monitor.cs

@@ -15,131 +15,7 @@
    /// </summary>
    public class Monitor
    {
        public static void CheckCountOrder() {
            var taskName = TaskName.盘点理货出库;
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            try {
                var orderList = db.Queryable<TN_Count_Order>()
                    .Where(c => c.N_B_STATE == 1)
                    .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
                    .ToList();

                if (orderList.Count == 0) {
                    LogHelper.Info($"轮询--{taskName}--暂无待执行的{taskName}单");
                    return;
                }

                var detailList = new List<TN_Count_CG_Detail>();
                foreach (var order in orderList) {
                    var doingCount = db.Queryable<TN_Count_CG_Detail>()
                        .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 执行中
                    var allCount = db.Queryable<TN_Count_CG_Detail>()
                        .Count(d => d.S_COUNT_NO == order.S_COUNT_NO);
                    LogHelper.Info($"轮询--{taskName}--统计{taskName}单'{order.S_COUNT_NO}'任务已下发：{doingCount}/{allCount}");

                    if (doingCount == allCount) {
                        order.N_B_STATE = 2; // 所有任务都已执行
                        db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                        continue;
                    }

                    var countCgDetailList = db.Queryable<TN_Count_CG_Detail>()
                        .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 已下发
                        .ToList();

                    if (countCgDetailList.Count == 0) {
                        LogHelper.Info($"轮询--{taskName}--{taskName}单明细状态异常");
                        continue;
                    }

                    detailList.AddRange(countCgDetailList);
                }

                if (detailList.Count == 0) {
                    return;
                }

                foreach (var detail in detailList) {
                    var startLoc = db.Queryable<TN_Location>()
                        .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
                        .Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE)
                        .First();

                    if (startLoc == null) {
                        LogHelper.Info($"轮询--{taskName}：没有找到合适的起点货位！");
                        continue;
                    }

                    var endLoc = db.Queryable<TN_Location>()
                        .Where(a => Settings.Areas[0].Contains(a.S_AREA_CODE))
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y")
                        .Where(a => a.N_CURRENT_NUM == 0).First();

                    if (endLoc == null) {
                        LogHelper.Info($"轮询--{taskName}：没有找到合适的终点货位！单号为 '{detail.S_COUNT_NO}'");
                        continue;
                    }

                    detail.N_B_STATE = 2;

                    var cntId = detail.S_CNTR_CODE;
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);

                    LocationHelper.LockLoc(ref startLoc, 2); // 起点出库锁
                    LocationHelper.LockLoc(ref endLoc, 1); // 终点入库锁

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"轮询--{taskName}--修改明细表状态为完成失败！");
                        }

                        if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败，容器号{cntId}，起点{startLoc.S_CODE}，终点货位{endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                        }).ExecuteCommand() <= 0) {

                            tran.RollbackTran();
                            info = $"生成'{taskName}'失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成 {taskName} 失败，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
                            LogHelper.Info(info);
                            continue;
                        }

                        tran.CommitTran();
                        info = $"生成 {taskName} 成功，容器号 {cntId} ，起点 {startLoc.S_CODE} ，终点货位 {endLoc.S_CODE}";
                        LogHelper.Info(info);
                        //continue;
                    }
                }
            }
            catch (Exception ex) {
                info = $"发生了异常：{ex.Message}";
                LogHelper.Info(info);
            }
        }
        
    }

}