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,