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");