From d5c33d641cc7df16e7a6270df7095025a55e275d Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期六, 29 三月 2025 12:49:50 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java index dfbcfe7..adedc2c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java @@ -83,8 +83,12 @@ WaitPakinItem pakinItem = new WaitPakinItem(); pakinItem.setAnfme(item.getAnfme()) .setPakinId(pakin.getId()) - .setAnsId(item.getAsnId()) + .setAsnId(item.getAsnId()) .setAsnCode(item.getAsnCode()) + .setAsnItemId(item.getId()) + .setMatnrCode(item.getMatnrCode()) + .setBatch(item.getSplrBatch()) + .setUnit(item.getStockUnit()) .setBatch(item.getSplrBatch()) .setFieldsIndex(item.getFieldsIndex()) .setUnit(item.getStockUnit()) @@ -98,7 +102,7 @@ .setAnfme(waitPakinItem.getQty()) .setTrackCode(waitPakinItem.getTrackCode()); /**鏇存柊鍗曟嵁鎵ц涓簱瀛�*/ - if (v.compareTo(item.getQty()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");} + if (v.compareTo(item.getAnfme()) > 0) {throw new CoolException("鎵ц涓暟閲忓ぇ浜庢敹璐ф暟閲忥紒锛�");} if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>() .eq(AsnOrderItem::getTrackCode, waitPakinItem.getTrackCode()).set(AsnOrderItem::getWorkQty, v))) { throw new CoolException("鎵ц涓簱瀛樻洿鏂板け璐ワ紒锛�"); -- Gitblit v1.9.1