From 101ab9254711fa03100dffe9ab476489a05a029a Mon Sep 17 00:00:00 2001 From: loujf Date: Tue, 16 Aug 2022 19:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=98=89=E8=80=90=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/ext/wms/service/AcsToWmsService.java | 2 +- .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index c471ba0..1280d63 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -19,7 +19,7 @@ public interface AcsToWmsService { HttpResponse lnshApplyTaskToWms(JSONObject json); /** - * + * 申请入窑 * @param json * @return */ diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index bb5a940..255ab45 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -76,6 +76,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String next_point_code = task.getString("next_device_code"); String start_device_code = ""; String next_device_code = ""; + String start_parent_code = ""; + String next_parent_code = ""; if (StrUtil.isEmpty(task_code)) { throw new WDKException("任务号不能为空"); } @@ -89,10 +91,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_point_code + "'").uniqueResult(0); if (!ObjectUtil.isEmpty(start_device_json)) { start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("storage_code"); + start_parent_code = start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("parent_storage_code"); } JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_point_code + "'").uniqueResult(0); if (!ObjectUtil.isEmpty(next_device_json)) { next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code"); + next_parent_code = next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("parent_storage_code"); } String priority = task.getString("priority"); String vehicle_code = task.getString("vehicle_code"); @@ -139,8 +143,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("ext_task_uuid", ext_task_uuid); jo.put("start_point_code", start_point_code); jo.put("next_point_code", next_point_code); - jo.put("start_parent_code", start_point_code); - jo.put("next_parent_code", next_point_code); + jo.put("start_parent_code", start_parent_code); + jo.put("next_parent_code", next_parent_code); jo.put("start_device_code", start_device_code); jo.put("next_device_code", next_device_code); jo.put("priority", priority);