From 35265bf34dda38fd5683ecf24fd4b54ad7bb66d6 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 30 Jul 2024 10:51:31 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=BB=99acs=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=AB=8B=E5=BA=93=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java | 1 + .../main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java | 1 + .../main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java | 1 + .../main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java | 1 + .../src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java | 1 + .../java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java | 2 +- 17 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java index b386ba105..36ef1c82f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoBoxExcepTask.java @@ -52,6 +52,7 @@ public class TwoBoxExcepTask extends AbstractAcsTask { .vehicle_code(json.getString("vehicle_code")) .priority(json.getString("priority")) .class_type(json.getString("task_type")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .dtl_type(String.valueOf(dtl_type)) .remark(json.getString("remark")) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java index 2c59faf8c..d6f8e7d69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExcepionalMoveTask.java @@ -50,6 +50,7 @@ public class TwoExcepionalMoveTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java index 11af13a89..03e53b16e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java @@ -55,6 +55,7 @@ public class TwoExceptionInTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .remark(json.getString("remark")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java index dfcf89558..129e9c284 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java @@ -55,6 +55,7 @@ public class TwoInBoxTask extends AbstractAcsTask { .class_type(json.getString("task_type")) .interaction_json(json.getJSONObject("request_param")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 26b5d205b..1edcc950e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -56,6 +56,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .dtl_type(String.valueOf(dtl_type)) .interaction_json(json.getJSONObject("request_param")) .remark(json.getString("remark")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .build(); dto.setClass_type(json.getString("point_code1").equals(IOSEnum.POINT_CODE.code("退货入库位")) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java index 97468dde1..ed7eef04f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpExcepTask.java @@ -55,6 +55,7 @@ public class TwoInEmpExcepTask extends AbstractAcsTask { .class_type(json.getString("task_type")) .dtl_type("7") .remark(json.getString("remark")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .build(); resultList.add(dto); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java index 9f6c8e5d6..fe18dc7bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java @@ -58,6 +58,7 @@ public class TwoInEmpTask extends AbstractAcsTask { .vehicle_code(json.getString("vehicle_code")) .priority(json.getString("priority")) .class_type(json.getString("task_type")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .dtl_type("7") .remark(json.getString("remark")) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java index 904e6ca9a..245a5b6f0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInTask.java @@ -71,6 +71,7 @@ public class TwoInTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java index 74826c19b..dc2c058c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java @@ -142,6 +142,7 @@ public class TwoLashTask extends AbstractAcsTask { .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) .remark(json.getString("remark")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .interaction_json(interaction_json) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java index 02f3e2e58..1f51de608 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java @@ -53,6 +53,7 @@ public class TwoMoveBoxTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java index 390fe6562..c41984a06 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java @@ -93,6 +93,7 @@ public class TwoOutBoxTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java index bbe974087..1c5f2ec2e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java @@ -54,6 +54,7 @@ public class TwoOutEmpTask extends AbstractAcsTask { .class_type(json.getString("task_type")) .interaction_json(json.getJSONObject("request_param")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java index 6cd7cd933..997c7d0b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java @@ -55,6 +55,7 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { .class_type(json.getString("task_type")) .route_plan_code(getRoutePlanCode(json.getString("point_code1"))) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java index 23959c10e..db2f5eef5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutHeapTask.java @@ -59,6 +59,7 @@ public class TwoOutHeapTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(IOSEnum.ACS_TYPE.code("RGV输送任务")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java index 25c481177..2a095a093 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java @@ -107,6 +107,7 @@ public class TwoOutTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_type")) .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java index 3832da6d9..17fe94d8f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java @@ -104,6 +104,7 @@ public class TwoSendOutTask extends AbstractAcsTask { .dtl_type(String.valueOf(dtl_type)) .route_plan_code(getRoutePlanCode(json.getString("point_code1"))) .remark(json.getString("remark")) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) .interaction_json(param) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java index 44f224119..6a5491794 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java @@ -124,7 +124,7 @@ public enum IOSEnum { // 下发acs任务类型（明细） ACS_TYPE(MapOf.of("木箱入库行架任务", "12","装箱入库行架任务", "13", - "子卷下线行架任务", "9","退货入库行架任务", "14","RGV输送任务", "15" + "子卷下线行架任务", "16","退货入库行架任务", "14","RGV输送任务", "15" )), ;