From 57fe41f460cb72684d6a76869ced6ae93577b75a Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期日, 15 六月 2025 17:22:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms --- src/main/java/com/zy/asrs/controller/WaitPakinController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java index f6a89be..7f13959 100644 --- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java +++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java @@ -109,7 +109,10 @@ // if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) { // return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触"); // } - OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand(),entity.getStandby1(),entity.getStandby2(),entity.getStandby3(), entity.getAnfme()); + OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand() + ,entity.getStandby1(),entity.getStandby2(),entity.getStandby3() + ,entity.getBoxType1(),entity.getBoxType2(),entity.getBoxType3() + , entity.getAnfme()); } } return R.ok(); -- Gitblit v1.9.1