From 0814124414ae0266211a6658acfa53d18ed3d76c Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 24 Jun 2024 17:39:45 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BA=8C=E6=AC=A1=E5=88=86?= =?UTF-8?q?=E9=85=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java | 4 +++- .../java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java | 4 ++-- .../src/main/java/org/nl/wms/sch/AcsTaskDto.java | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-) 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 459318cc8..a70e335b2 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 @@ -45,6 +45,8 @@ public class TwoSendOutTask extends AbstractAcsTask { JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); // 获取系统参数 String expandWidthLength = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("expandWidthLength").getValue(); + JSONObject param = new JSONObject(); + param.put("expandWidthLength",expandWidthLength); ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); i++) { @@ -65,7 +67,7 @@ public class TwoSendOutTask extends AbstractAcsTask { .dtl_type(String.valueOf(dtl_type)) .route_plan_code(getRoutePlanCode(json.getString("point_code1"))) .remark(json.getString("remark")) - .expandWidthLength(expandWidthLength) + .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 0cfd0678a..f8527b61e 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 @@ -104,8 +104,8 @@ public enum IOSEnum { "6","CK2046", "7","7", "8","8", "9","9", "10","10")), // 出库发货等待点 - OUT_FH_POINT(MapOf.of("1","B_FH_01_0", "2","B_FH_02_0", "3","B_FH_03_0", "4","B_FH_04_0" ,"5","B_FH_05_0", - "6","B_FH_06_0")), + OUT_FH_POINT(MapOf.of("1","B_FH01_0", "2","B_FH02_0", "3","B_FH03_0", "4","B_FH04_0" ,"5","B_FH05_0", + "6","B_FH06_0")), // 行架点位 OUT_HANGER(MapOf.of("行架位1", "CK2013","行架位2", "CK2017")), diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java index 0e44bb89c..e6ee2a257 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java @@ -140,10 +140,4 @@ public class AcsTaskDto { private String barcode; - /** - * 发货任务下发货叉宽度 - */ - private String expandWidthLength; - - }