diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index c7c9ba01..8294454e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -35,8 +35,8 @@ public enum AcsTaskEnum { REQUEST_CALLTYPE_EMP("2","缺料请求"), // - ACSSYSTEM_NB("1","诺宝机器人任务"), - ACSSYSTEM_XC("1","叉车任务"), + AGV_SYSTEM_NB("1","诺宝机器人任务"), + AGV_SYSTEM_XC("1","叉车任务"), ; private String code; private String desc; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls b/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls index d78d1472..168c440c 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/utils/sys.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index c2cb78c0..14398655 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java index 55f671be..d6baea29 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java @@ -75,7 +75,7 @@ public class SpeMachineryTask extends AbstractAcsTask { task.put("point_code1", start_point_code); task.put("point_code2", next_point_code); task.put("point_code3", return_point_code); - task.put("asc_system_type", AcsTaskEnum.ACSSYSTEM_NB.getCode()); + task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_NB.getCode()); task.put("vehicle_code", vehicle_code); task.put("handle_class", this.getClass().getName()); task.put("finished_type", "01");