优化代码, 封装货位锁和创建任务流程, 数据库事务等

kazelee

昨天 2d3ee03961d6cfbde70342e8a97bc7b05d0b0dc3

 core/Monitor.cs

@@ -22,8 +22,6 @@

        public static void CheckInbound() {                
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            
            try {
                // 查产线是否有物料信息
                foreach (var prod in Settings.ProductionLines) {
@@ -36,8 +34,7 @@
                    // TCPClient传递信息的时候,不要用断点阻塞程序
                    // {"item_code":"CG1001","batch_no":"BN1001","cntr_code":"CN2505111"}
                    if (!TcpClientHelper.TryReadProductionLine(out byte[] read)) {
                        info = $"测试{prod.Id}号产线{prod.PlcIp}:{prod.PlcPort}:读取产线信息失败";
                        LogHelper.Info(info);
                        LogHelper.Info($"测试{prod.Id}号产线{prod.PlcIp}:{prod.PlcPort}:读取产线信息失败");
                        continue;
                    }

@@ -145,15 +142,12 @@

                    var cntId = detail.S_CNTR_CODE;

                    var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
                    var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, cntId, taskName);
                    task.S_OP_CODE = detail.S_OO_NO;
                    if (string.IsNullOrEmpty(detail.S_BS_NO)) {
                        task.S_BS_NO = detail.S_BS_NO;
                        task.S_BS_TYPE = "ERP";
                    }

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

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -199,8 +193,6 @@

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

            var taskInfo = Settings.GetTaskInfo(ETask.C抽检出库);
            var taskName = taskInfo.TaskName;
            const string preLog = "轮询:抽检:";
@@ -208,7 +200,7 @@
            try {
                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.Debug($"轮询:{taskName}:暂无待执行的{taskName}单");
                    LogHelper.Debug(preLog + $"暂无待执行的{taskName}单");
                    return;
                }

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

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

@@ -243,7 +235,7 @@
                        .Where((l, c) => c.S_CNTR_CODE == detail.S_CNTR_CODE).First();

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

@@ -253,18 +245,125 @@
                        .Where(a => a.N_CURRENT_NUM == 0).First();

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

                    detail.N_B_STATE = 2;

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

                    WCSHelper.LockStartLoc(ref startLoc);
                    WCSHelper.LockEndLoc(ref endLoc);
                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
                            tran.RollbackTran();
                            LogHelper.Info(preLog + $"修改{taskName}单明细表状态为完成--失败!");
                            continue;
                        }

                        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();
                            LogHelper.Info(preLog + $"更新[起点货位锁状态]失败!起点='{startLoc.S_CODE}',锁状态=>'出库锁'");
                            continue;
                        }

                        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}',锁状态=>'入库锁'");
                            continue;
                        }

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

                        tran.CommitTran();
                        LogHelper.Info(preLog + $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                        continue;
                    }
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex, preLog);
            }
        }

        public static void CheckShiftOrder() {                
            var db = new SqlHelper<object>().GetInstance();
            var taskInfo = Settings.GetTaskInfo(ETask.Y移库);
            var taskName = taskInfo.TaskName;
            const string preLog = "轮询:移库:";
            
            try {
                var orderList = db.Queryable<TN_Relocation_List>()
                    .Where(c => c.N_B_STATE == 1)
                    .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
                    .ToList();

                if (orderList.Count == 0) {
                    LogHelper.Debug(preLog + $"暂无待执行的{taskName}单");
                    return;
                }

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

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

                    var checkDetailList = db.Queryable<TN_RelocationList_Detail>()
                        .Where(a => a.S_OO_NO == order.S_NO && a.N_B_STATE == 1) // 已下发
                        .ToList();

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

                    foreach (var checkDetail in checkDetailList) {
                        detailList.Add(checkDetail);
                    }
                }

                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();

                    if (startLoc == null) {
                        LogHelper.Info(preLog + $"没有找到终点货位={detail.S_END_AREA}的终点货位!需要满足:未上锁,当前容器数量=0");
                        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_CURRENT_NUM == 0).First();

                    if (endLoc == null) {
                        LogHelper.Info(preLog + $"没有找到终点货位={detail.S_END_AREA}的终点货位!需要满足:未上锁,当前容器数量=0");
                        continue;
                    }

                    detail.N_B_STATE = 2;

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

                    using (var tran = db.Ado.UseTran()) {
                        if (db.Updateable(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
@@ -287,146 +386,12 @@

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

                        tran.CommitTran();
                        info = $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}";
                        LogHelper.Info(info);
                        continue;
                    }
                }
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex, preLog);
            }
        }

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

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

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

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

                var detailList = new List<TN_RelocationList_Detail>();
                foreach (var order in orderList) {
                    var doingCount = db.Queryable<TN_RelocationList_Detail>()
                        .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}");

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

                    var checkDetailList = db.Queryable<TN_RelocationList_Detail>()
                        .Where(a => a.S_OO_NO == order.S_NO && a.N_B_STATE == 1) // 已下发
                        .ToList();

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

                    foreach (var checkDetail in checkDetailList) {
                        detailList.Add(checkDetail);
                    }
                }

                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();

                    if (startLoc == null) {
                        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_CURRENT_NUM == 0).First();

                    if (endLoc == null) {
                        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);
                    task.S_OP_CODE = detail.S_OO_NO;

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

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

                        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;
                        }

                        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);
                            continue;
                        }

                        if (db.Insertable(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);
                        LogHelper.Info(preLog + $"生成任务'{taskName}'成功,任务号={task.S_CODE},容器号={cntId},起点={startLoc.S_CODE},终点={endLoc.S_CODE}");
                        continue;
                    }
                }
@@ -438,7 +403,6 @@

        public static void CreateTaskReturnErp(TN_Task task) {
            var db = new SqlHelper<object>().GetInstance();
            var info = "";
            var httpH = new HttpHelper();

            try {
@@ -447,8 +411,7 @@
                    .First();

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

                var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -456,8 +419,7 @@
                    .First();

                if (cgDetail == null) {
                    info = $"物料编码不存在!";
                    LogHelper.Info(info);
                    LogHelper.Info($"计划单号{task.S_BS_NO}不存在!");
                }

                var model = new OtherModel.CreateTaskReturnErpInfo {
@@ -527,8 +489,7 @@
                plan.HWZT = model.hwzt;
                plan.PH = model.ph;
                var success = db.Updateable(plan).UpdateColumns(p => new { p.HW, p.HWZT, p.PH }).ExecuteCommand() > 0;
                info = "更新出库计划单记录表" + (success ? "成功" : "失败");
                LogHelper.Info(info);
                LogHelper.Info("更新出库计划单记录表" + (success ? "成功" : "失败"));
            }
            catch (Exception ex) {
                LogHelper.InfoEx(ex);