优化配置文件和部分日志打印信息

kazelee

2025-06-27 d20ce230b49932d39ee4ce25e39fd78368c3b28a

 core/WCSCore.cs

@@ -76,7 +76,7 @@
                    WCSHelper.UpdateStatus(TN_Task, "取货完成"); // 任务状态改成取货完成
                    TaskProcess.OperateStatus(TN_Task, 4); // 起点容器货位解绑,解锁起点

                    if (TN_Task.S_TYPE == TaskName.C成品胶出库) {
                    if (TN_Task.S_TYPE == ETask.C成品胶出库.Name()) {
                        var nextOutboundTask = Task.Run(() => {
                            UpdateOutboundTaskState(3);
                        });
@@ -128,8 +128,8 @@
                var cgDetail = new TN_CG_Detail(); // 如果没有信息，默认就是空值，可以直接填入，不需要判断
                
                //var emptyTask = false; // 空托/空箱任务
                if (task.S_TYPE != TaskName.H好运箱_空箱上线 && task.S_TYPE != TaskName.H好运箱_空箱入库 &&
                    task.S_TYPE != TaskName.T托盘_空托上线 && task.S_TYPE != TaskName.T托盘_空托入库) {
                if (task.S_TYPE != ETask.K空托上线出库.Name() && task.S_TYPE != ETask.K空托入库.Name() &&
                    task.S_TYPE != ETask.K空箱上线出库.Name() && task.S_TYPE != ETask.K空箱入库.Name()) {
                    // 非空托/空箱任务（空托/空箱任务无法在CGDetail查到物料信息）
                    //emptyTask= true;
                    cgDetail = db.Queryable<TN_CG_Detail>()
@@ -147,8 +147,8 @@

                var isInbound = false; // 入库类型的任务（包括移库类任务）
                var inboundTasks = new List<string> {
                    TaskName.H好运箱_满箱下线入库, TaskName.H好运箱_空箱入库, TaskName.T托盘_满托下线入库, TaskName.T托盘_空托入库,
                    TaskName.C抽检_合格回库, TaskName.C抽检_不合格移库, TaskName.Y移库
                    ETask.M满托下线入库.Name(), ETask.K空箱入库.Name(), ETask.M满托下线入库.Name(), ETask.K空托入库.Name(),
                    ETask.C抽检合格回库.Name(), ETask.C抽检不合格移库.Name(), ETask.Y移库.Name()
                };
                if (inboundTasks.Contains(task.S_TYPE)) {
                    isInbound= true;
@@ -209,11 +209,17 @@
            try {
                ModbusHelper.Relink();

                //var loc = db.Queryable<TN_Location>()
                //    .Where(l => l.S_AGV_SITE == model.station_name && Settings.AreaMap[AreaName.包装区].Contains(l.S_AREA_CODE))
                //    .First();
                var BZQ = Settings.GetTaskInfo(ETask.M满托下线入库).StartAreas;
                var loc = db.Queryable<TN_Location>()
                    .Where(l => BZQ.Contains(l.S_AREA_CODE) && l.S_AGV_SITE == model.station_name).First();

                if (!Settings.AgvSite_ProdLineCodeMap.TryGetValue(model.station_name, out int prodIndex)) {
                if (loc == null) {
                    info = $"AGV 站点{model.station_name}不是合法的产线接驳位站点";
                    LogHelper.Info(info);
                    return NewReturnResult(1, info);
                }

                if (!Settings.LocProdIdMap.TryGetValue(loc.S_CODE, out var prodIndex)) {
                    info = $"AGV 站点{model.station_name}不是合法的产线接驳位站点";
                    LogHelper.Info(info);
                    return NewReturnResult(1, info);
@@ -296,7 +302,7 @@
        }

        public static void UpdateOutboundTaskState(int spotStateCode) {
            var taskName = TaskName.C成品胶出库;
            var taskName = ETask.C成品胶出库.Name();
            var db = new SqlHelper<object>().GetInstance();

            var detail = db.Queryable<TN_Outbound_Detail>()
@@ -524,21 +530,22 @@
            var db = new SqlHelper<object>().GetInstance();
            var info = "";

            const string taskName = TaskName.T托盘_满托下线入库;
            const string startAreaName = AreaName.B包装区;
            const string endAreaName = AreaName.M满托货架区;
            var taskInfo = Settings.GetTaskInfo(ETask.M满托下线入库);
            var taskName = taskInfo.TaskName;
            var startAreas = taskInfo.StartAreas;
            var endAreas = taskInfo.EndAreas;
            const string cntrType = "托盘";

            try {
                var startLoc = db.Queryable<TN_Location>()
                .Where(l => l.S_CODE == startLocCode)
                .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
                .Where(l => startAreas.Contains(l.S_AREA_CODE))
                .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "无" && l.C_ENABLE == "Y")
                //.Where(l => l.N_CURRENT_NUM == 0) // 绑定前
                .First();

                if (startLoc == null) {
                    info = $"在'{startAreaName}'中没有找到起点货位'{startLocCode}'，或不满足要求：未上锁、当前容器数量=0";
                    info = $"没有找到起点货位'{startLocCode}'，或不满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return new Result<bool>(false, info);
                }
@@ -556,14 +563,14 @@
                startLoc.N_CURRENT_NUM = 1; // 绑定后

                var endLoc = db.Queryable<TN_Location>()
                    .Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE))
                    .Where(a => endAreas.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) // 筛选：空货位
                    .OrderBy(l => l.N_LAYER)
                    .First();

                if (endLoc == null) {
                    info = $"在终点货区'{endAreaName}'中，没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
                    info = $"没有找到合适的【终点货位】，需要满足要求：未上锁、当前容器数量=0";
                    LogHelper.Info(info);
                    return new Result<bool>(false, info);
                }