金坛bug修改

海波 张

2025-05-14 04eed9fb0fdb0a4c09c482f78d4449f941cfaadb

 process/TaskProcess.cs

@@ -124,10 +124,10 @@
                    return;
                }

                var wcsTask = TaskHelper.GetTask(mst.S_OP_CODE + "_2");
                var wcsTask = TaskHelper.GetTaskByWorkNo(mst.S_OP_CODE,"wcs");
                if (wcsTask == null)
                {
                    LogHelper.Info($"判断巷道可用失败，没找到对应{mst.S_OP_CODE + "_2"}任务", "改道安全交互");
                    LogHelper.Info($"判断巷道可用失败，没找到对应{mst.S_OP_CODE}的wcs任务", "改道安全交互");
                    return;
                }
                //判断空托缓存、接驳位和巷道是否可用 不可用需要改道
@@ -138,7 +138,7 @@
                //开关关门申请
                DeviceProcess.Door(mst, forkliftNo, state);
            }
            else if (state == 1013) {
            else if (state == 1002) {
                LogHelper.Info($"等待交互，任务号={mst.S_CODE}，卸货交管成功，修改参数", "安全交互");

                //等待rfid校验
@@ -791,8 +791,8 @@

            try
            {
                var task = TaskHelper.GetTask(model.task_no + "_1");
                var wcsTask = TaskHelper.GetTask(model.task_no + "_2");
                var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
                var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no,"wcs");
                if (task != null && wcsTask != null)
                {
                    if (task.S_B_STATE.Trim() == "未执行")
@@ -856,7 +856,7 @@
                else
                {
                    result.errCode = 1;
                    result.errMsg = "任务不存在";
                    result.errMsg = $"{model.task_no}任务不存在";
                    result.success = false;
                }
            }
@@ -1280,6 +1280,9 @@
                    //接驳位
                    var connection = "";

                    //接驳位库区名称
                    var connectionArea = "";

                    //如果需要下发wcs立库，则需要寻找可用接驳位
                    if (workFlow.SENDWCS == "Y") {

@@ -1311,6 +1314,7 @@
                                if (con.N_CURRENT_NUM < 2 && con.C_ENABLE == "Y")
                                {
                                    connection = con.S_CODE;
                                    connectionArea = con.S_AREA_Name;
                                    LogHelper.Info($"ZCSendTask入库任务下发寻找到可用接驳位{connection}", "Mes任务下发");
                                }
                            }
@@ -1482,8 +1486,13 @@
                        //优先级
                        N_PRIORITY = model.Priority,
                        //工装类型
                        TOOLSTYPE = TOOLSTYPE

                        TOOLSTYPE = TOOLSTYPE,
                        //起点库区名称
                        S_START_AREA_NAME = start.S_AREA_Name,
                        //起点库区名称
                        S_END_AREA_NAME = end.S_AREA_Name,
                        //起点库区名称
                        CONNECTION_AREA = connectionArea,
                    };

                    //创建作业
@@ -1508,6 +1517,10 @@

                    //接驳位
                    var connection = "";

                    //接驳位库区
                    var connectionArea = "";
                    

                    //查找给定终点
                    var end = LocationHelper.GetLoc(model.Location_To);
@@ -1619,9 +1632,10 @@
                            foreach (var item in usableConnectionList.available)
                            {
                                var con = LocationHelper.GetLoc(item);
                                if (con.S_LOCK_STATE == "无" && con.N_CURRENT_NUM < 2)
                                if (con.C_ENABLE == "Y" && con.N_CURRENT_NUM < 2)
                                {
                                    connection = con.S_CODE;
                                    connectionArea = con.S_AREA_Name;
                                    LogHelper.Info($"ZCSendTask出库任务下发寻找到可用接驳位{connection}", "Mes任务下发");
                                }
                            }
@@ -1669,7 +1683,13 @@
                        //优先级
                        N_PRIORITY = model.Priority,
                        //工装类型
                        TOOLSTYPE = TOOLSTYPE
                        TOOLSTYPE = TOOLSTYPE,
                        //起点库区名称
                        S_START_AREA_NAME = start.S_AREA_Name,
                        //起点库区名称
                        S_END_AREA_NAME = end.S_AREA_Name,
                        //起点库区名称
                        CONNECTION_AREA = connectionArea
                    };

                    //创建作业