From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期二, 31 十二月 2024 11:58:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs --- src/main/java/com/zy/asrs/controller/PlaController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java index c66a577..441dba3 100644 --- a/src/main/java/com/zy/asrs/controller/PlaController.java +++ b/src/main/java/com/zy/asrs/controller/PlaController.java @@ -145,7 +145,7 @@ } @RequestMapping(value = "/pla/sellout/auth") - @ManagerAuth + @ManagerAuth(memo = "sellout") @Transactional @Synchronized public R sellout(@RequestBody List<Pla> plas) { @@ -171,6 +171,9 @@ if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) { throw new CoolException("鎵瑰彿:" + pla.getBatch() + "锛屽寘鍙�:" + pla.getPackageNo() + " 鍓╀綑鍙嚭搴撻噸閲忎笉瓒筹紝璇疯皟鏁村嚭搴撻噸閲�"); } + if (Cools.isEmpty(pla.getMassState())){ + throw new CoolException("璐ㄩ噺鎸囨爣涓轰笂浼�"); + } pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight()); pla.setHandlerBy(getUser().getUsername()); pla.setStatus(GlobleParameter.PLA_STATUS_2); -- Gitblit v1.9.1