From d06e28f71655a34b598f6271f25ff7f2f2c9e89e Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Thu, 4 Jun 2026 12:02:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E8=8E=B7=E5=8F=96=E5=8F=AF=E6=97=A0=E7=A0=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E9=A1=B9=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/ComponentOutboundController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java index 546289cf..c4b5c26b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java @@ -420,7 +420,7 @@ public class ComponentOutboundController extends BaseController { List items = wmsComponentPackingItemService.lambdaQuery() .eq(WmsComponentPackingItem::getPackingId, order.getId()) .list(); - items.removeIf(item -> item.getOutQty().compareTo(BigDecimal.ZERO) <= 0 + items.removeIf(item -> getNoScanOutQty(item).compareTo(BigDecimal.ZERO) <= 0 || noScanningBaseControllerService.cannotOutNoScanning(item.getIdnrk(),order.getFactoryNo(),item.getLgort())); return ApiResult.success( items.stream() @@ -431,7 +431,7 @@ public class ComponentOutboundController extends BaseController { .setMaterialDesc(item.getOjtxb()) .setFactoryNo(order.getFactoryNo()) .setWarehouseNo(item.getLgort()) - .setNum(item.getOutQty()) + .setNum(getNoScanOutQty(item)) ) .toList() ); @@ -751,6 +751,12 @@ public class ComponentOutboundController extends BaseController { return outbound; } + private BigDecimal getNoScanOutQty(WmsComponentPackingItem item) { + BigDecimal menge = Objects.isNull(item.getMenge()) ? BigDecimal.ZERO : item.getMenge(); + BigDecimal outQty = Objects.isNull(item.getOutQty()) ? BigDecimal.ZERO : item.getOutQty(); + return menge.subtract(outQty); + } + private WmsComponentOutboundItem setWmsComponentOutboundItem(WmsComponentPacking packing, ComponentOutboundItemInputQO item, List packingItems,