From f69dfb1af19f6c7c801fdc4fa12a6839da9acae5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 10 Jul 2024 15:50:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E7=95=99=E6=89=AB=E6=8F=8FBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 000e784e0..98b1250b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -6065,29 +6065,29 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId()); - boolean flag = false; - if (Func.isNotEmpty(distributionParcelListEntities)) { - List isHave = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList()); - if (Func.isNotEmpty(isHave)) { - flag = isHave.size() == 1; - //判断是否存在有待处理的异常 - } - } else { - List disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); - if (Func.isNotEmpty(disStockListDetailEntities)) { - List isHaveinven = disStockListDetailEntities.stream().filter(inven -> Func.isNotEmpty(inven.getStockPackageCode()) && inven.getStockPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList()); - if (Func.isNotEmpty(isHaveinven)) { - flag = isHaveinven.size() == 1; - } - } - } - - if (!flag) { - //存在该订制品或者库存品包件信息但是未进行装车操作 - return Resp.scanFail("包件未装车", "包件未装车"); - } +// //如果均不存在则就该判断该货物是否属于当前的配送任务，如果属于则是未装车，如果不属于则此码无效 +// List distributionParcelListEntities = baseMapper.selectPackageListByDeliveryListId(deliveryListEntity.getId()); +// boolean flag = false; +// if (Func.isNotEmpty(distributionParcelListEntities)) { +// List isHave = distributionParcelListEntities.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList()); +// if (Func.isNotEmpty(isHave)) { +// flag = isHave.size() == 1; +// //判断是否存在有待处理的异常 +// } +// } else { +// List disStockListDetailEntities = baseMapper.selectInventoryListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); +// if (Func.isNotEmpty(disStockListDetailEntities)) { +// List isHaveinven = disStockListDetailEntities.stream().filter(inven -> Func.isNotEmpty(inven.getStockPackageCode()) && inven.getStockPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList()); +// if (Func.isNotEmpty(isHaveinven)) { +// flag = isHaveinven.size() == 1; +// } +// } +// } +// +// if (!flag) { +// //存在该订制品或者库存品包件信息但是未进行装车操作 +// return Resp.scanFail("包件未装车", "包件未装车"); +// } } return R.data(retentionScanVos); }