From c27670dd5adc8c53da0126ff62a8c45082fcad5c Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 12 六月 2025 14:30:38 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 3 +++ src/main/java/com/zy/asrs/entity/param/MatParam.java | 4 ++++ src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 ++++++++- src/main/java/com/zy/asrs/controller/MobileController.java | 3 +++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index ca18214..e7a2685 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -254,7 +254,9 @@ matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue()); matParam.setWeight(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue()); matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue()); + matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode()); return R.ok().add(matParam); + } @RequestMapping(value = "/mat/auth") @@ -276,6 +278,7 @@ matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode()); matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue()); matParam.setAnfme2(nccJcQilibcBarcodeflowWms.getNastnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getNastnum().doubleValue()); + matParam.setTiaoma(nccJcQilibcBarcodeflowWms.getVbarcode()); 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 af763b6..c414407 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -59,6 +59,9 @@ // 瑙勬牸 private String specs; + // + private String tiaoma; + } } 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 01feaaf..6a25886 100644 --- a/src/main/java/com/zy/asrs/entity/param/MatParam.java +++ b/src/main/java/com/zy/asrs/entity/param/MatParam.java @@ -242,5 +242,9 @@ * 鍗曟嵁鍗曞彿 */ private String orderNo; + /** + * tiaoma + */ + private String tiaoma; } 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 585613e..b579f76 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -27,6 +27,7 @@ import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * 绉诲姩绔湇鍔℃牳蹇冪被 @@ -555,9 +556,15 @@ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) { throw new CoolException(BaseRes.PARAM); } -// if (param.getCombMats().size() > 1) { + List<String> codes = param.getCombMats().stream().map(CombParam.CombMat::getTiaoma).collect(Collectors.toList()); + Set<String> sets = new HashSet<>(); + if (codes.stream().anyMatch(item -> !sets.add(item))) { + throw new CoolException("鏉$爜閲嶅鎵爜浜�"); + } + // if (param.getCombMats().size() > 1) { // throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒"); // } + // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁 if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) { -- Gitblit v1.9.1