修复细节错误，优化报错信息

kazelee

2025-06-12 48654bac6d758d6426a0e659a7d7bd08634acfc8

 core/Monitor.cs

@@ -20,10 +20,13 @@
            public string cntr_code { get; set; }
        }

        public static void CheckInbound() {
            var taskName = TaskName.T托盘_满托下线入库;
        public static void CheckInbound() {                
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.T托盘_满托下线入库;
            const string cntrType = "托盘";

            try {
                // 查产线是否有物料信息
                foreach (var prod in Settings.ProductionLines) {
@@ -68,6 +71,8 @@

                    var needInsertContainer = false;
                    var needUpdateContainer = false;

                    // TEMP 自动触发的托盘下线暂时不考虑判断，默认没有时写入
                    // 查容器信息表是否已经有这个容器
                    var cntr = db.Queryable<TN_Container>()
                        .Where(c => c.S_CODE == cntrCode).First();
@@ -78,9 +83,8 @@

                        cntr = new TN_Container {
                            S_CODE = cntrCode,
                            S_TYPE = "托盘",
                            S_TYPE = cntrType,
                            S_SPEC = itemCode,
                            S_SOURCE = taskName,
                        };
                    }
                    else {
@@ -91,7 +95,6 @@
                                $"与所需要的物料信息{itemCode}不符，直接覆盖结果");

                            cntr.S_SPEC = itemCode;
                            cntr.S_SOURCE = taskName;
                        }
                    }

@@ -105,14 +108,13 @@
                        info = $"起点位置 '{startLocCode}' 不存在或不具备取货要求";
                        LogHelper.Info(info);
                        continue;
                        //return;
                    }

                    // 绑定货位和容器号
                    var locCntrRel = new TN_Loc_Container {
                        S_LOC_CODE = startLocCode,
                        S_CNTR_CODE = cgDetail.S_CNTR_CODE,
                        S_CNTR_TYPE = "托盘",
                        S_CNTR_TYPE = cntrType,
                    };

                    var endLoc = db.Queryable<TN_Location>()
@@ -134,6 +136,9 @@
                    LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                    LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁

                    cntr.S_SOURCE = task.S_CODE;
                    cntr.T_MODIFY = DateTime.Now;

                    using (var tran = db.Ado.UseTran()) {
                        if (needInsertContainer) {
                            if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
@@ -144,7 +149,8 @@
                            }
                        }
                        else if (needUpdateContainer) {
                            if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
                            if (db.Updateable<TN_Container>(cntr)
                                .UpdateColumns(c => new { c.S_SPEC, c.S_SOURCE, c.T_MODIFY }).ExecuteCommand() <= 0) {
                                info = $"更新容器表失败：" + JsonConvert.SerializeObject(cntr);
                                tran.RollbackTran();
                                LogHelper.Info(info);
@@ -170,7 +176,8 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
@@ -182,7 +189,7 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
@@ -192,13 +199,13 @@

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

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -215,7 +222,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C成品胶出库;
            const string taskName = TaskName.C成品胶出库;

            try {
                var orderList = db.Queryable<TN_Outbound_Order>()
@@ -300,7 +307,9 @@
                    detail.N_B_STATE = 2;

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

                    var erp_no = string.IsNullOrEmpty(detail.S_BS_NO) ? "" : detail.S_BS_NO;
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO, erp_no);

                    LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                    LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
@@ -317,10 +326,11 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"轮询：{taskName}：生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }
@@ -329,23 +339,23 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"轮询：{taskName}：生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }

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

                        tran.CommitTran();
                        info = $"轮询：{taskName}：生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -393,7 +403,7 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskName = TaskName.C抽检_出库;
            const string taskName = TaskName.C抽检_出库;

            try {
                var orderList = db.Queryable<TN_Spot_Check>()
@@ -412,7 +422,7 @@
                        .Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 执行中
                    var allCount = db.Queryable<TN_SpotCheck_Detail>()
                        .Count(d => d.S_OO_NO == order.S_NO);
                    LogHelper.Info($"轮询--{taskName}--统计{taskName}单'{order.S_NO}'任务已下发：{doingCount}/{allCount}");
                    LogHelper.Info($"轮询：{taskName}：统计{taskName}单'{order.S_NO}'任务已下发：{doingCount}/{allCount}");

                    if (doingCount == allCount) {
                        order.N_B_STATE = 2; // 所有任务都已执行
@@ -425,7 +435,7 @@
                        .ToList();

                    if (checkDetailList.Count == 0) {
                        LogHelper.Info($"轮询--{taskName}--仍有任务未执行完成，但当前没有已下发的任务");
                        LogHelper.Info($"轮询：{taskName}：仍有任务未执行完成，但当前没有已下发的任务");
                        continue;
                    }

@@ -441,7 +451,7 @@
                        .First();

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

@@ -451,14 +461,14 @@
                        .Where(a => a.N_CURRENT_NUM == 0).First();

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

                    detail.N_B_STATE = 2;

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

                    LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                    LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
@@ -466,7 +476,7 @@
                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"轮询--{taskName}：修改{taskName}单明细表状态为完成--失败！");
                            LogHelper.Info($"轮询：{taskName}：修改{taskName}单明细表状态为完成--失败！");
                            continue;
                        }

@@ -474,7 +484,8 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
@@ -486,7 +497,7 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
@@ -496,13 +507,13 @@

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

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -513,10 +524,12 @@
            }
        }

        public static void CheckShiftOrder() {
            var taskName = TaskName.Y移库;
        public static void CheckShiftOrder() {                
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.Y移库;

            try {
                var orderList = db.Queryable<TN_Relocation_List>()
                    .Where(c => c.N_B_STATE == 1)
@@ -524,7 +537,7 @@
                    .ToList();

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

@@ -534,7 +547,7 @@
                        .Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 执行中
                    var allCount = db.Queryable<TN_RelocationList_Detail>()
                        .Count(d => d.S_OO_NO == order.S_NO);
                    LogHelper.Info($"轮询--{taskName}--统计{taskName}单'{order.S_NO}'任务已下发：{doingCount}/{allCount}");
                    LogHelper.Info($"轮询：{taskName}：统计{taskName}单={order.S_NO}任务已下发：{doingCount}/{allCount}");

                    if (doingCount == allCount) {
                        order.N_B_STATE = 2; // 所有任务都已执行
@@ -547,7 +560,7 @@
                        .ToList();

                    if (checkDetailList.Count == 0) {
                        LogHelper.Info($"轮询--{taskName}--仍有任务未执行完成，但当前没有已下发的任务");
                        LogHelper.Info($"轮询：{taskName}：仍有任务未执行完成，但当前没有已下发的任务");
                        continue;
                    }

@@ -565,7 +578,8 @@
                        .First();

                    if (startLoc == null) {
                        LogHelper.Info($"轮询--{taskName}：没有找到合适的起点货位！");
                        info = $"轮询：{taskName}：没有找到容器号={detail.S_CNTR_CODE}的起点货位！需要满足：未上锁、当前容器数量=1";
                        LogHelper.Info(info);
                        continue;
                    }

@@ -575,14 +589,15 @@
                        .Where(a => a.N_CURRENT_NUM == 0).First();

                    if (endLoc == null) {
                        LogHelper.Info($"轮询--{taskName}：没有找到合适的终点货位！");
                        info = $"轮询：{taskName}：没有找到终点货位={detail.S_END_AREA}的终点货位！需要满足：未上锁、当前容器数量=0";
                        LogHelper.Info(info);
                        continue;
                    }

                    detail.N_B_STATE = 2;

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

                    LocationHelper.LockStartLoc(ref startLoc); // 起点出库锁
                    LocationHelper.LockEndLoc(ref endLoc); // 终点入库锁
@@ -590,7 +605,7 @@
                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info($"轮询--{taskName}：修改{taskName}单明细表状态为完成--失败！");
                            LogHelper.Info($"轮询：{taskName}：修改{taskName}单明细表状态为完成--失败！");
                            continue;
                        }

@@ -598,7 +613,8 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
@@ -610,7 +626,7 @@
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY
                            it.T_MODIFY,
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
@@ -620,13 +636,13 @@

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

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，容器号{cntId}，起点{startLoc.S_CODE}，终点货架{endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }