From ceb0bac4970dce23920b9b0d96404dd7d8d16f9c Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 18 Jun 2024 17:17:57 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=82=B9=E4=BD=8D=E7=9A=84=E5=AD=90=E5=8D=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../src/main/java/org/nl/wms/sch/AcsUtil.java | 6 +++++- .../java/org/nl/wms/sch/manage/AbstractAcsTask.java | 11 ++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) 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 19d21baf7..af64a785e 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 @@ -1905,7 +1905,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 6-退货入库 whereJson.put("bill_type", IOSEnum.IN_TYPE.code("退货入库")); whereJson.put("box_no", whereJson.getString("material_barcode")); - JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1')").getResultJSONArray(0); + JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status in ('0','1','99')").getResultJSONArray(0); if (ObjectUtil.isEmpty(resultJSONArray)) { throw new BadRequestException("未查询到子卷包装信息!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java index 79a096006..60d2083a7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java @@ -50,6 +50,8 @@ public class AcsUtil { throw new BadRequestException("未查询到区域对应的acs地址！"); } String url =acs_url + api; + //String url ="10.1.3.96:8011/"+ api; + //String url ="10.21.1.196:8011/"+ api; try { JSONArray rows = new JSONArray(); rows.add(jo); @@ -117,7 +119,9 @@ public class AcsUtil { throw new BadRequestException("未查询到区域对应的acs地址！"); } - String url = acs_url + api; + //String url = acs_url + api; + //String url ="10.1.3.96:8011/"+ api; + String url ="10.21.1.196:8011/"+ api; try { String resultMsg = HttpRequest.post(url) .body(String.valueOf(list)) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index f157990bb..7b7b7f3a3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -108,12 +108,13 @@ public abstract class AbstractAcsTask { * */ public JSONObject immediateNotifyAcs(String task_id) { - List taskList = this.schedule(); - if (ObjectUtil.isNotEmpty(taskList)) { - JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - return AcsUtil.notifyAcs("api/wms/task", arr); - } + List taskList = this.schedule(); + if (ObjectUtil.isNotEmpty(taskList)) { + JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); + return AcsUtil.notifyAcs("api/wms/task", arr); + } return null; + } /**