封装部分业务代码，继续优化日志打印流程

kazelee

昨天 f8d23dcf8d6501482db1a5180325194232afe96c

 core/Monitor.cs

@@ -33,10 +33,10 @@
                    //TcpClientHelper.Link("127.0.0.1", 8550); // 用于测试
                    TcpClientHelper.Link(prod.PlcIp, prod.PlcPort);

                    // TCPClient传递信息的时候，不要用断点阻塞程序
                    // TCPClient传递信息的时候,不要用断点阻塞程序
                    // {"item_code":"CG1001","batch_no":"BN1001","cntr_code":"CN2505111"}
                    if (!TcpClientHelper.TryReadProductionLine(out byte[] read)) {
                        info = $"测试{prod.Id}号产线{prod.PlcIp}:{prod.PlcPort}：读取产线信息失败";
                        info = $"测试{prod.Id}号产线{prod.PlcIp}:{prod.PlcPort}:读取产线信息失败";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -72,20 +72,14 @@

        public static void CheckOutboundOrder() {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            var taskInfo = Settings.GetTaskInfo(ETask.C成品胶出库);
            var taskName = taskInfo.TaskName;
            var taskName = "出库";
            const string preLog = "轮询:出库:";

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

                var orderList = db.Queryable<TN_Outbound_Order>().Where(c => c.N_B_STATE == 1).OrderBy(c => c.T_CREATE).ToList();
                if (orderList.Count == 0) {
                    info = $"轮询：{taskName}：暂无待执行的{taskName}单";
                    LogHelper.Info(info);
                    LogHelper.Debug(preLog + $"暂无待执行的{taskName}单");
                    return;
                }

@@ -93,16 +87,13 @@

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

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

@@ -111,8 +102,7 @@
                        .First();

                    if (lastDetail != null) {
                        info = $"轮询：{taskName}：{taskName}单'{order.S_NO}'上一个任务仍在进行中：" + JsonConvert.SerializeObject(lastDetail);
                        LogHelper.Info(info);
                        LogHelper.Info(preLog + $"{taskName}单'{order.S_NO}'上一个任务仍在进行中:" + JsonConvert.SerializeObject(lastDetail));
                        continue;
                    }

@@ -121,8 +111,7 @@
                        .First();

                    if (outboundDetail == null) {
                        info = $"轮询：{taskName}：仍有任务未执行完成，但当前没有已下发的任务";
                        LogHelper.Info(info);
                        LogHelper.Info(preLog + $"仍有任务未执行完成,但当前没有已下发的任务!");
                        continue;
                    }

@@ -135,16 +124,10 @@
                }

                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) // 根据容器号搜索起点货位
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_CURRENT_NUM == 1)
                        .First();
                    var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE).Where((l, c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == detail.S_CNTR_CODE).First();

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

@@ -154,8 +137,7 @@
                        .Where(a => a.N_CURRENT_NUM == 0).First();

                    if (endLoc == null) {
                        info = $"轮询：{taskName}：没有找到合适的终点货位！单号'{detail.S_OO_NO}'要求终点库区为'{detail.S_END_AREA}'";
                        LogHelper.Info(info);
                        LogHelper.Info(preLog + $"没有找到合适的终点货位!单号'{detail.S_OO_NO}'要求终点库区为'{detail.S_END_AREA}'");
                        continue;
                    }
                    
@@ -174,52 +156,32 @@
                    WCSHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

                        if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                        // 更新[起点/终点]锁状态,创建任务
                        if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                            LogHelper.Info(preLog + $"更新[起点货位锁状态]失败!起点='{startLoc.S_CODE}',锁状态=>'出库锁'");
                        }
                        if (db.Updateable(endLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info(preLog + $"更新[终点货位锁状态]失败!终点='{endLoc.S_CODE}',锁状态=>'入库锁'");
                        }
                        if (db.Insertable(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info(preLog + $"生成任务'{task.S_TYPE}'失败!任务号={task.S_CODE},容器号={task.S_CNTR_CODE},起点={task.S_START_LOC},终点={task.S_END_LOC}");
                        }

                        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}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }

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

                        // 提交数据库更改
                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        //continue;
                        LogHelper.Info(preLog + $"生成任务'{task.S_TYPE}'成功!任务号={task.S_CODE},容器号={task.S_CNTR_CODE},起点={task.S_START_LOC},终点={task.S_END_LOC}");
                    }

                    // 如果当前出库单明细是ERP下发的，任务创建完成反馈货位信息
                    // 如果当前出库单明细是ERP下发的,任务创建完成反馈货位信息
                    if (detail.S_BS_TYPE == "ERP") {
                        //var createTaskReturnErpTask = Task.Run(() => {
                        //    CreateTaskReturnErp(task);
@@ -231,8 +193,7 @@

            }
            catch (Exception ex) {
                info = $"轮询：{taskName}：发生了异常：{ex.Message}";
                LogHelper.InfoEx(ex);
                LogHelper.InfoEx(ex, preLog);
            }
        }

@@ -242,29 +203,24 @@

            var taskInfo = Settings.GetTaskInfo(ETask.C抽检出库);
            var taskName = taskInfo.TaskName;
            const string preLog = "轮询:抽检:";

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

                var orderList = db.Queryable<TN_Spot_Check>().Where(c => c.N_B_STATE == 1).OrderBy(c => c.T_CREATE).ToList();
                if (orderList.Count == 0) {
                    LogHelper.Info($"轮询：{taskName}：暂无待执行的{taskName}单");
                    LogHelper.Debug($"轮询:{taskName}:暂无待执行的{taskName}单");
                    return;
                }

                var detailList = new List<TN_SpotCheck_Detail>();
                foreach (var order in orderList) {
                    var doingCount = db.Queryable<TN_SpotCheck_Detail>()
                        .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}");
                    var doingCount = db.Queryable<TN_SpotCheck_Detail>().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(preLog + $"统计{taskName}单'{order.S_NO}'任务已下发:{doingCount}/{allCount}");

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

@@ -273,7 +229,7 @@
                        .ToList();

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

@@ -283,23 +239,21 @@
                }

                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();
                    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}：没有找到合适的起点货位！");
                        LogHelper.Info($"轮询:{taskName}:没有找到合适的起点货位!");
                        continue;
                    }

                    var endLoc = db.Queryable<TN_Location>()
                        .Where(l => l.S_AREA_CODE == detail.S_END_AREA)
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                        .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}：没有找到合适的终点货位！");
                        LogHelper.Info($"轮询:{taskName}:没有找到合适的终点货位!");
                        continue;
                    }

@@ -309,57 +263,44 @@
                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                    task.S_OP_CODE = detail.S_OO_NO;

                    WCSHelper.LockStartLoc(ref startLoc); // 起点出库锁
                    WCSHelper.LockEndLoc(ref endLoc); // 终点入库锁
                    WCSHelper.LockStartLoc(ref startLoc);
                    WCSHelper.LockEndLoc(ref endLoc);

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

                        if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                        }).ExecuteCommand() <= 0) {
                        if (db.Updateable(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM, }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            LogHelper.Info(preLog + $"更新[起点货位锁状态]失败!起点='{startLoc.S_CODE}',锁状态=>'出库锁'");
                            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) {
                        if (db.Updateable(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}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            LogHelper.Info(preLog + $"更新[终点货位锁状态]失败!终点='{endLoc.S_CODE}',锁状态=>'入库锁'");
                            continue;
                        }

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        if (db.Insertable(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={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}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
                LogHelper.InfoEx(ex, preLog);
            }
        }

@@ -369,6 +310,7 @@

            var taskInfo = Settings.GetTaskInfo(ETask.Y移库);
            var taskName = taskInfo.TaskName;
            const string preLog = "轮询:移库:";

            try {
                var orderList = db.Queryable<TN_Relocation_List>()
@@ -377,7 +319,7 @@
                    .ToList();

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

@@ -387,11 +329,11 @@
                        .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; // 所有任务都已执行
                        db.Updateable<TN_Relocation_List>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                        db.Updateable(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
                        continue;
                    }

@@ -400,7 +342,7 @@
                        .ToList();

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

@@ -413,23 +355,23 @@
                    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)
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选：未上锁
                        .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y") // 筛选:未上锁
                        .Where(l => l.N_CURRENT_NUM == 1)
                        .First();

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

                    var endLoc = db.Queryable<TN_Location>()
                        .Where(l => l.S_AREA_CODE == detail.S_END_AREA)
                        .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "无" && a.C_ENABLE == "Y") // 筛选：未上锁
                        .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) {
                        info = $"轮询：{taskName}：没有找到终点货位={detail.S_END_AREA}的终点货位！需要满足：未上锁、当前容器数量=0";
                        info = $"轮询:{taskName}:没有找到终点货位={detail.S_END_AREA}的终点货位!需要满足:未上锁,当前容器数量=0";
                        LogHelper.Info(info);
                        continue;
                    }
@@ -444,53 +386,53 @@
                    WCSHelper.LockEndLoc(ref endLoc); // 终点入库锁

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

                        if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
                        if (db.Updateable(startLoc).UpdateColumns(it => new {
                            it.N_LOCK_STATE,
                            it.S_LOCK_STATE,
                            it.S_LOCK_OP,
                            it.T_MODIFY,
                            it.N_CURRENT_NUM, // 起点货位绑定后，将货位状态更新
                            it.N_CURRENT_NUM, // 起点货位绑定后,将货位状态更新
                        }).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败：更新起点货位{startLoc.S_CODE}锁状态失败";
                            info = $"生成任务'{taskName}'失败:更新起点货位{startLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }

                        if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
                        if (db.Updateable(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}'失败：更新终点货位{endLoc.S_CODE}锁状态失败";
                            info = $"生成任务'{taskName}'失败:更新终点货位{endLoc.S_CODE}锁状态失败";
                            LogHelper.Info(info);
                            continue;
                        }

                        if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
                        if (db.Insertable(task).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            info = $"生成任务'{taskName}'失败，任务号={task.S_CODE}，容器号={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}'成功，任务号={task.S_CODE}，容器号={cntId}，起点={startLoc.S_CODE}，终点={endLoc.S_CODE}";
                        info = $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);
                LogHelper.InfoEx(ex, preLog);
            }
        }

@@ -505,7 +447,7 @@
                    .First();

                if (plan == null) {
                    info = $"计划单号{task.S_BS_NO}不存在！";
                    info = $"计划单号{task.S_BS_NO}不存在!";
                    LogHelper.Info(info);
                }

@@ -514,13 +456,13 @@
                    .First();

                if (cgDetail == null) {
                    info = $"物料编码不存在！";
                    info = $"物料编码不存在!";
                    LogHelper.Info(info);
                }

                var model = new OtherModel.CreateTaskReturnErpInfo {
                    jhdh = plan.JHDH , // 计划单号（唯一标识）
                    ckzt = plan.CKZT , // 出库状态（需要返回）
                    jhdh = plan.JHDH , // 计划单号 (唯一标识) 
                    ckzt = plan.CKZT , // 出库状态 (需要返回) 
                    jhlb = plan.JHLB , // 计划类别
                    ckdh = plan.CKDH , // 参考单号
                    cph = plan.CPH , // 车牌号
@@ -531,9 +473,9 @@
                    cplb = plan.CPLB , // 产品类别
                    cplbmx = plan.CPLBMX , // 产品类别明细
                    pp = plan.PP , // 品牌
                    dj = plan.DJ , // 等级（需要返回）
                    dj = plan.DJ , // 等级 (需要返回) 
                    gh = plan.GH , // 罐号
                    ph = plan.PH , // 批号（需要返回）
                    ph = plan.PH , // 批号 (需要返回) 
                    bzlx = plan.BZLX , // 包装类型
                    pzdh = plan.PZDH , // 派装单号
                    pzd_dw = plan.PZD_DW , // 派装单单位
@@ -546,15 +488,15 @@
                    pz_zfrq = plan.PZ_ZFRQ , // 派装作废日期
                    pz_bz = plan.PZ_BZ , // 派装备注
                    ckdbh = plan.CKDBH , // 出库单编号
                    //sfjs = plan.SFJS , // 实发件数（需要返回）
                    //sfsl = plan.SFSL , // 实发数量（需要返回）
                    //sfcs = plan.SFCS , // 实发车数（需要返回）
                    //zcsj = plan.ZCSJ , // 装车时间（需要返回）
                    //jldw = plan.JLDW , // 计量单位（需要返回）
                    //fhrq = plan.FHRQ , // 发货日期（需要返回）
                    //ckdm = plan.CKDM , // 仓库代码（需要返回）
                    //fhr = plan.FHR , // 发货人（需要返回）
                    //czydm = plan.CZYDM , // 操作员（需要返回）
                    //sfjs = plan.SFJS , // 实发件数 (需要返回) 
                    //sfsl = plan.SFSL , // 实发数量 (需要返回) 
                    //sfcs = plan.SFCS , // 实发车数 (需要返回) 
                    //zcsj = plan.ZCSJ , // 装车时间 (需要返回) 
                    //jldw = plan.JLDW , // 计量单位 (需要返回) 
                    //fhrq = plan.FHRQ , // 发货日期 (需要返回) 
                    //ckdm = plan.CKDM , // 仓库代码 (需要返回) 
                    //fhr = plan.FHR , // 发货人 (需要返回) 
                    //czydm = plan.CZYDM , // 操作员 (需要返回) 
                    shr_username = plan.SHR_USERNAME , // 审核人
                    shrq = plan.SHRQ , // 审核日期
                    zfbj = plan.ZFBJ , // 作废标记
@@ -563,14 +505,14 @@
                    shdw = plan.SHDW , // 收货单位
                    ysdw = plan.YSDW , // 运输单位
                    lxr = plan.LXR , // 联系人
                    //ry_zxg = plan.RY_ZXG , // 装卸工（需要返回）
                    //ry_ccsj = plan.RY_CCSJ , // 叉车司机（需要返回）
                    //ry_zxg = plan.RY_ZXG , // 装卸工 (需要返回) 
                    //ry_ccsj = plan.RY_CCSJ , // 叉车司机 (需要返回) 
                    erphx_jhdh = plan.ERPHX_JHDH , // erp交货单号
                    erphx_wlbm = plan.ERPHX_WLBM , // erp物料编码
                    erphx_wlmc = plan.ERPHX_WLMC , // erp物料名称
                    erphx_cjrq = plan.ERPHX_CJRQ , // erp创建日期
                    hw = plan.HW , // 货位（需要返回）
                    hwzt  = plan.HWZT // 货位状态（需要返回）
                    hw = plan.HW , // 货位 (需要返回) 
                    hwzt  = plan.HWZT // 货位状态 (需要返回) 
                };
                model.hw = task.S_START_LOC;
                model.hwzt = "待出库";
@@ -579,12 +521,12 @@
                var jsonInfo = JsonConvert.SerializeObject(model);
                var result = httpH.WebPost(Settings.ErpApiUrl + Settings.ErpRoute.CreateTaskReturn, jsonInfo);

                LogHelper.InfoApi($"创建任务完成反馈ERP接口，结果={result}，调用参数：", model);
                LogHelper.InfoApi($"创建任务完成反馈ERP接口,结果={result},调用参数:", model);

                plan.HW = model.hw;
                plan.HWZT = model.hwzt;
                plan.PH = model.ph;
                var success = db.Updateable<TN_Outbound_Plan>(plan).UpdateColumns(p => new { p.HW, p.HWZT, p.PH }).ExecuteCommand() > 0;
                var success = db.Updateable(plan).UpdateColumns(p => new { p.HW, p.HWZT, p.PH }).ExecuteCommand() > 0;
                info = "更新出库计划单记录表" + (success ? "成功" : "失败");
                LogHelper.Info(info);
            }