From cbfec25a9fe1ef56f0a19ebc173718e8346986bc Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 21 Jun 2024 10:23:38 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=8F=91=E8=B4=A7=E5=8C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/SendOutManageServiceImpl.java | 18 +++++++++--------- .../util/service/SendOutManageService.java | 3 ++- .../acs/service/impl/AcsToWmsServiceImpl.java | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index 72e17f939..374c11db4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -379,7 +379,7 @@ public class SendOutManageServiceImpl implements SendOutManageService { } @Override - public void createSendOutTaskTwo(JSONObject whereJson) { + public String createSendOutTaskTwo(JSONObject whereJson) { WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); @@ -449,13 +449,13 @@ public class SendOutManageServiceImpl implements SendOutManageService { } } - //创建任务 - JSONObject task_jo = new JSONObject(); - task_jo.put("point_code1", taskJson.getString("point_code2")); - task_jo.put("point_code2", point_code4); - task_jo.put("vehicle_code", taskJson.getString("vehicle_code")); - task_jo.put("task_type", "010721"); - TwoSendOutTask taskBean = new TwoSendOutTask(); - taskBean.createTask(task_jo); + // 更新当前点位终点 + taskJson.put("point_code2", point_code4); + taskJson.put("point_code4", ""); + taskTab.update(taskJson); + + // 返回点位 + return point_code4; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/SendOutManageService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/SendOutManageService.java index 1859463dc..e9dbe2856 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/SendOutManageService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/service/SendOutManageService.java @@ -36,7 +36,8 @@ public interface SendOutManageService { * @param whereJson { * task_code：任务号（第一次申请时下发的任务号） * } + * @return 新点位 */ - void createSendOutTaskTwo(JSONObject whereJson); + String createSendOutTaskTwo(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index c92b3b827..3cd8b75d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1961,7 +1961,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { sendOutManageService.createSendOutTaskOne(whereJson); } else { // 第二次申请 - sendOutManageService.createSendOutTaskTwo(whereJson); + String point_code = sendOutManageService.createSendOutTaskTwo(whereJson); + result.put("data", point_code); } result.put("status", HttpStatus.OK.value()); result.put("message", "下发成功!");