From 02364658a5591316ac6dfb1c7a9e53544ae8bbda Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 14 Jul 2023 16:33:24 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E7=94=9F=E4=BA=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=9B=9E=E4=BC=A0=E4=BF=AE=E6=94=B9=E3=80=81agv?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=85=85=E7=94=B5=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java | 5 ++++- .../st/returns/service/impl/InAndOutRetrunServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 4233749a2..202e8534a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -337,12 +337,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String car_no = whereJson.getString("car_no"); JSONObject jsonParam = new JSONObject(); - if ("2,3".contains(car_no)) { + if ("2,3,4,5".contains(car_no)) { jsonParam.put("agv_system", "2"); jsonParam.put("car_no", car_no); } else if ("1".contains(car_no)) { jsonParam.put("agv_system", "1"); jsonParam.put("car_no", car_no); + } else if ("6,7,8,9".contains(car_no)) { + jsonParam.put("agv_system", "3"); + jsonParam.put("car_no", car_no); } try { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 9ed35917b..4b42795f9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -757,6 +757,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } @Override + @Transactional public void upload(JSONObject whereJson) { //出库分配表 WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");