From cca40ca8d275faa8b5cc9501ce4f09b81cfbd7fc Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 05 六月 2025 16:04:38 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 +- src/main/java/com/zy/asrs/entity/param/MatParam.java | 4 ++++ src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +- src/main/java/com/zy/asrs/controller/MobileController.java | 3 ++- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 ++++++---- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index daf2809..e655073 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -217,7 +217,7 @@ } combParam.setCombMats(combMats); } - combParam.setOrderNo(order.getOrderNo()); + //combParam.setOrderNo(order.getOrderNo()); combParams.add(combParam); } } @@ -243,6 +243,7 @@ matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh()); matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode()); matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue()); + matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue()); return R.ok().add(matParam); } diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java index ce18692..5415c0d 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -11,7 +11,7 @@ public class CombParam { // 鍗曟嵁缂栧彿 - private String orderNo; + //private String orderNo; // 鎵樼洏鏉$爜 private String barcode; diff --git a/src/main/java/com/zy/asrs/entity/param/MatParam.java b/src/main/java/com/zy/asrs/entity/param/MatParam.java index 5f09b7b..e1db2ba 100644 --- a/src/main/java/com/zy/asrs/entity/param/MatParam.java +++ b/src/main/java/com/zy/asrs/entity/param/MatParam.java @@ -17,6 +17,10 @@ /** * 鍟嗗搧缂栧彿 */ + private double anfme2; + /** + * 鍟嗗搧缂栧彿 + */ private String batch; /** * 鍟嗗搧缂栧彿 diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index c018793..4a14836 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -573,7 +573,7 @@ Date now = new Date(); // 鏃犲崟缁勬墭 - if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) { + if (Cools.isEmpty(param.getCombMats().get(0).getOrderNo())) { // 鐢熸垚鍏ュ簱閫氱煡妗� List<DetlDto> detlDtos = new ArrayList<>(); diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 8f53e9d..58fba3f 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -229,12 +229,14 @@ Order order = orderService.selectByNo(param.getOrderNo()); // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹� if (!Cools.isEmpty(order)) { - if (order.getSettle() > 1L) { - throw new CoolException(param.getOrderNo() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�"); + OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo()); + if (!Cools.isEmpty(orderPakout)) { + if (orderPakout.getSettle() > 1L) { + throw new CoolException(param.getOrderNo() + "姝e湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�"); + } + orderPakoutService.remove(orderPakout.getId()); } orderService.remove(order.getId()); - OrderPakout orderPakout = orderPakoutService.selectByNo(param.getOrderNo()); - orderPakoutService.remove(orderPakout.getId()); } DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE); Date now = new Date(); -- Gitblit v1.9.1