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

kazelee

1 天以前 f8d23dcf8d6501482db1a5180325194232afe96c

 wms/WCSHelper.cs

@@ -29,7 +29,7 @@
            var db = new SqlHelper<TN_Task>().GetInstance();
            task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
            task.T_MODIFY = DateTime.Now;
            db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY }).ExecuteCommand();
            res = db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY }).ExecuteCommand() > 0;
            return res;
        }
        internal static bool UpdateEQNo(TN_Task task) {
@@ -46,117 +46,154 @@
            return task;
        }

        public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type) {
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = startLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = startLoc.S_CODE,
                S_END_LOC = endLoc.S_CODE,
                S_TYPE = type,
                N_PRIORITY = 3, // 初始优先级默认为：3
                N_SCHEDULE_TYPE = 1, // NDC
                N_B_STATE = 0,
                S_CNTR_CODE = cntId,
            };

            return TN_Task;
        }

        public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string op_no, string erp_no = "") {
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = startLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = startLoc.S_CODE,
                S_END_LOC = endLoc.S_CODE,
                S_TYPE = type,
                N_PRIORITY = 3, // 初始优先级默认为：3
                N_SCHEDULE_TYPE = 1, // NDC
                N_B_STATE = 0,
                S_CNTR_CODE = cntId,
                S_OP_CODE = op_no,
                S_BS_NO = erp_no,
                S_BS_TYPE = erp_no == "" ? "" : "ERP",
            };

            return TN_Task;
        public static string GetAgvSite(string locCode) {
            var db = new SqlHelper<object>().GetInstance();
            var loc = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCode).First();
            return loc == null ? "0" : loc.S_AGV_SITE;
        }

        /// <summary>
        /// 创建搬送任务
        /// ![[弃用|理由:不灵活,涉及业务过于具体]]检查容器类型是否正确
        /// </summary>
        /// <param name="no">编号</param>
        /// <param name="from">起点</param>
        /// <param name="to">终点</param>
        /// <param name="taskType">任务类型</param>
        /// <param name="pri">优先级</param>
        /// <param name="cntrInfo">容器编码</param>
        /// <param name="cntrCode"></param>
        /// <param name="cntrType"></param>
        /// <param name="errMsg"></param>
        /// <returns></returns>
        internal static bool CreateTask(string from, string to, string taskType, int pri, string cntrInfo) {
            var fromLoc = LocationHelper.GetLocation(from);
            var endLoc = LocationHelper.GetLocation(to);
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = fromLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = from,
                S_END_LOC = to,
                S_TYPE = taskType,
                N_PRIORITY = pri,
                N_SCHEDULE_TYPE = 1,
                N_B_STATE = 0,
                S_CNTR_CODE = cntrInfo,
            };
        private static bool CheckCntrType(string cntrCode, string cntrType, out string errMsg) {
            var db = new SqlHelper<object>().GetInstance();
            errMsg = string.Empty;

            var log = JsonConvert.SerializeObject(TN_Task);
            var db = new SqlHelper<TN_Task>().GetInstance();
            var res = db.Insertable(TN_Task).ExecuteCommand() > 0;
            if (res) {
                LogHelper.Info($"插入任务成功，{log}");
            var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == cntrType).First();
            if (cntr == null) {
                errMsg = $"容器'{cntrCode}'在[容器表]中不存在,请在前台页面中维护!";
                return false;
            }
            else {
                LogHelper.Info($"插入任务失败，{log}");
            if (cntr.S_TYPE != cntrType) {
                errMsg = $"容器'{cntrCode}'在[容器表]中的类型是'{cntr.S_TYPE},不是'{cntrType}'!";
                return false;
            }
            return res;

            return true;
        }

        public static bool CreateTask(List<CreateTasks> modes) {
            if (modes != null && modes.Count > 0) {
                List<TN_Task> tN_Tasks = new List<TN_Task>();
        /// <summary>
        /// 根据容器号,查询当前容器关联的[货位/容器/物料]信息(只查询1条)
        /// </summary>
        /// <param name="cntrCode">容器号</param>
        /// <param name="skipCgDetail">是否跳过[物料表]的查询(当容器号来自[物料表]时)</param>
        /// <returns></returns>
        public static LocCntrCg GetLocCntrCg(string cntrCode, bool skipCgDetail = false) {
            var db = new SqlHelper<object>().GetInstance();

                foreach (var item in modes) {

                    var fromLoc = LocationHelper.GetLocation(item.from);
                    var endLoc = LocationHelper.GetLocation(item.to);

                    tN_Tasks.Add(new TN_Task() {
                        S_CODE = GenerateTaskNo(),
                        S_START_AREA = fromLoc.S_AREA_CODE,
                        S_END_AREA = endLoc.S_AREA_CODE,
                        S_START_LOC = item.from,
                        S_END_LOC = item.to,
                        S_TYPE = item.taskType,
                        N_PRIORITY = item.pri,
                        N_SCHEDULE_TYPE = 1,
                        N_B_STATE = 0,
                        S_CNTR_CODE = item.cntrInfo,
                    });
                }
                var log = JsonConvert.SerializeObject(tN_Tasks);
                var db = new SqlHelper<object>().GetInstance();
                var res = db.Insertable<TN_Task>(tN_Tasks).ExecuteCommand() > 0;
                if (res) {
                    LogHelper.Info($"插入任务成功，{log}");
                }
                else {
                    LogHelper.Info($"插入任务失败，{log}");
                }
                return res;
            TN_CG_Detail cgDetail = null;
            if (!skipCgDetail) {
                cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_CNTR_CODE == cntrCode).First();
            }

            return false;
            var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == cntrCode).First();

            TN_Location location = null;
            if (locCntrRel != null) {
                location = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCntrRel.S_LOC_CODE).First();
                if (location == null) {
                    LogHelper.Warn($"");
                }
            }
            if (location != null) {
                location.N_CURRENT_NUM = 0;
                location.T_MODIFY = DateTime.Now;
            }

            return new LocCntrCg {
                CgDetail = cgDetail,
                LocCntrRel = locCntrRel,
                Location = location
            };
        }

        /// <summary>
        /// 绑定[货位-容器]信息
        /// </summary>
        /// <param name="startLoc"></param>
        /// <param name="cntrCode"></param>
        /// <returns></returns>
        public static TN_Loc_Container BindLocCntr(ref TN_Location startLoc, string cntrCode) {
            var locCntrRel = new TN_Loc_Container {
                S_LOC_CODE = startLoc.S_CODE,
                S_CNTR_CODE = cntrCode,
            };

            startLoc.N_CURRENT_NUM = 1;
            startLoc.T_MODIFY = DateTime.Now;

            return locCntrRel;
        }

        /// <summary>
        /// 起点出库锁
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="lockSource"></param>
        public static void LockStartLoc(ref TN_Location loc, string lockSource = "") {
            if (loc == null) {
                throw new ArgumentNullException(); // 接受货位loc为空时直接抛异常(通常不会发生)
            }

            if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "无") {
                LogHelper.Warn($"起点出库锁:程序正在尝试给当前[锁状态]不是'无'的货位上锁!货位='{loc.S_CODE}',锁状态=({loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
            }

            loc.N_LOCK_STATE = 2; // 起点出库锁
            loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 起点出库锁
            loc.S_LOCK_OP = lockSource;
            loc.T_MODIFY = System.DateTime.Now;
        }

        /// <summary>
        /// 终点入库锁
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="lockSource"></param>
        public static void LockEndLoc(ref TN_Location loc, string lockSource = "") {
            if (loc == null) {
                throw new ArgumentNullException(); // 接受货位loc为空时直接抛异常(通常不会发生)
            }

            if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "无") {
                LogHelper.Warn($"起点出库锁:程序正在尝试给当前[锁状态]不是'无'的货位上锁!货位='{loc.S_CODE}',锁状态=({loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
            }

            loc.N_LOCK_STATE = 1; // 终点出库锁
            loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 终点出库锁
            loc.S_LOCK_OP = lockSource;
            loc.T_MODIFY = System.DateTime.Now;
        }

        /// <summary>
        /// 创建任务
        /// </summary>
        /// <param name="startLoc">起点货位:至少提供:S_CODE,S_AREA_CODE</param>
        /// <param name="endLoc">终点货位:至少提供:S_CODE,S_AREA_CODE</param>
        /// <param name="cntId">容器号</param>
        /// <param name="type">任务类型(名称)</param>
        /// <param name="pri">优先级</param>
        /// <param name="agvType">AGV类型</param>
        /// <returns></returns>
        public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, int pri = 3, int agvType = 1) {
            TN_Task TN_Task = new TN_Task() {
                S_CODE = GenerateTaskNo(),
                S_START_AREA = startLoc.S_AREA_CODE,
                S_END_AREA = endLoc.S_AREA_CODE,
                S_START_LOC = startLoc.S_CODE,
                S_END_LOC = endLoc.S_CODE,
                S_TYPE = type,
                N_PRIORITY = pri,
                N_SCHEDULE_TYPE = agvType,
                N_B_STATE = 0, // 任务创建时,默认等待
                S_CNTR_CODE = cntId,
            };

            return TN_Task;
        }


@@ -175,7 +212,6 @@
                    task.S_EQ_NO = forklift_no;
                    db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_START_TIME, it.S_EQ_NO }).ExecuteCommand();
                }

            }
        }
        internal static void End(TN_Task task) {
@@ -190,7 +226,7 @@
        internal static void Fail(TN_Task task) {
            var db = new SqlHelper<TN_Task>().GetInstance();
            if (task != null) {
                //判断有没有取货完成，没有就变成失败。有取货完成默认完成了（跟据项目而定，有些项目人工拉走了也没有放到终点）。
                //判断有没有取货完成,没有就变成失败。有取货完成默认完成了 (跟据项目而定,有些项目人工拉走了也没有放到终点) 。
                task.N_B_STATE = 4;
                task.S_B_STATE = TN_Task.GetStateStr(task.N_B_STATE);
                db.Updateable(task).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE }).ExecuteCommand();
@@ -215,11 +251,12 @@
        }
    }

    public class CreateTasks {
        public string from { set; get; }
        public string to { set; get; }
        public string taskType { set; get; }
        public int pri { set; get; }
        public string cntrInfo { set; get; }
    /// <summary>
    /// [货位/容器/物料]信息
    /// </summary>
    public class LocCntrCg {
        public TN_CG_Detail CgDetail { get; set; } = null;
        public TN_Loc_Container LocCntrRel { get; set; } = null;
        public TN_Location Location { get; set; } = null;
    }
}