add:增加二次分配代码逻辑

lms/nladmin-system/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java

@@ -18,18 +18,33 @@ import java.util.Map;
 @Getter
 public enum PackageInfoIvtEnum {
     //点位类型
-    POINT_STATUS(MapOf.of("满轴缓存位", "1", "空载具缓存位", "2", "待检区", "3", "管制区", "4", "装箱位", "5","装箱区", "6")),
+    POINT_STATUS(MapOf.of("满轴缓存位", "1", "空载具缓存位", "2", "待检区", "3", "管制区", "4", "装箱位", "5", "装箱区", "6","等待点", "7")),
-
-
 
 
     //任务类型
     TASK_TYPE(MapOf.of("输送线->满轴缓存位", "010901", "满轴缓存位->待检区", "010902", "满轴缓存位->管制区", "010903", "放空(空载具缓存位->输送线)",
-            "010904", "取空(待检区或管制区->空载具缓存位)", "010905", "待检区->管制区", "010906","管制区->待检区", "010907","待检区->装箱区", "010908", "装箱区->装箱对接位", "010909","放空(装箱区->待检区)", "010910","输送线四个点任务", "010911","送空(装箱区->待检区或管制区)", "010912")),
+            "010904", "补空(待检区或管制区->空载具缓存位)", "010905", "待检区->管制区", "010906", "管制区->待检区", "010907", "待检区->装箱区", "010908", "装箱区->装箱对接位", "010909", "放空(装箱区->待检区)", "010910", "输送线四个点任务", "010911", "送空(装箱区->待检区或管制区)", "010912")),
 
     //ACS任务类型
     ACS_TASK_TYPE(MapOf.of("agv任务", "1", "桁架任务", "6")),
 
+
+    //agv二次分配类型
+    AGV_ACTION_TYPE(MapOf.of("普通任务", "1", "取货二次分配", "2", "放货二次分配", "3", "取放货二次分配", "4")),
+
+
+    //二次分配请求类型
+    TASK_ACTION_TYPE(MapOf.of("取货分配", "1", "放货分配", "2", "取货完成", "3", "放货完成", "4")),
+
+
+    //起点终点类型
+    TASK_POINT_TYPE(MapOf.of("取货任务", "1", "放货任务", "2")),
+
+
+    //排序方式
+    SORT_TYPE(MapOf.of("升序", "1", "降序", "2")),
+
+
     //ACS系统类型
     AGV_SYSTEM_TYPE(MapOf.of("1楼诺宝任务", "1", "2楼1区域AGV系统", "2", "1楼叉车任务", "3")),
 
@@ -56,6 +71,14 @@ public enum PackageInfoIvtEnum {
         throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
     }
 
+    public Long longCode(String desc) {
+        String code = this.getCode().get(desc);
+        if (StringUtils.isNotEmpty(code)) {
+            return Long.valueOf(code);
+        }
+        throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
+    }
+
     public String check(String code) {
         for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
             if (entry.getValue().equals("code")) {

lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java

@@ -51,6 +51,13 @@ public class AcsTaskDto {
      * Agv系统类型
      */
     private String agv_system_type;
+
+    /**
+     *  agv二次分配类型（1、普通任务 2、取货二次分配 3、放货二次分配 4、取放货二次分配）
+     */
+    private String agv_action_type;
+
+
     /**
      * 备注
      */