diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index bbecf4ba3..e0b7d29e6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1179,7 +1179,6 @@ public class DistributionStockupAppController extends BladeController { } } - // 2打印处理的扫码 // 查询当前库位上最早入库的指定物料库存品 byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(), stockupDTO.getMallName()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 11e77a2bd..b79936aec 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -2556,6 +2556,16 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl entityList = distrilbutionBillStockService.list(Wrappers.query().lambda() + .eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId) + .ne(DistrilbutionBillStockEntity::getOrderStatus, "2") + ); + if (entityList.isEmpty()) { + mainVO.setList(null); + return mainVO; + } + + List num = baseMapper.getCompleteNum(billLadingId); if (Func.isNotEmpty(num)) { int size = num.stream().filter(f -> f.equals(true)).collect(Collectors.toList()).size();