From 7f7f0c9226d5211a5d85fefcf210fd2f915c3ac1 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sat, 18 May 2024 01:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=A4=87=E8=B4=A7BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 1 - .../impl/DistrilbutionBillLadingServiceImpl.java | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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();