From 885d01eb65fe0010c6c83e7f066b73ada06538cd Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Apr 2024 11:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E9=85=8D?= =?UTF-8?q?=E9=80=81=E5=B7=B2=E8=A3=85=E8=BD=A6=E4=B8=8D=E8=83=BD=E5=8F=96?= =?UTF-8?q?=E6=B6=88BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryInfoServiceImpl.java | 2 ++ .../DistributionDeliveryListServiceImpl.java | 26 +++++++++++++++---- .../impl/DistributionStockupServiceImpl.java | 5 ++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 2a9c71024..110915a3c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -188,6 +188,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPage(page, distributionStockArticle); List loadList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, distributionStockArticle.get("deliveryId")) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); Map> orderLoadMap; if (!Objects.isNull(loadList)) { @@ -249,6 +250,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl distributionDeliveryInfoVOS = baseMapper.selectDistributionDeliveryOrderPageByDeliveryId(Long.parseLong(deliveryId)); List loadList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, distributionStockArticle.get("deliveryId")) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); Map> orderLoadMap; if (!Objects.isNull(loadList)) { 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 431f564ed..25980214b 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 @@ -7130,12 +7130,28 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId); - if (Func.isNotEmpty(loadscanEntityList)) { - log.info(method + "存在异常装车数据:{}", deliveryId); - return R.fail(reservationCodes + "存在异常装车、签收包条!!!"); + List ids = reservationEntities.stream().map(DistributionReservationEntity::getId).collect(Collectors.toList()); + + List packageList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, ids) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + List inventoryList = distributionLoadscaninvnService.list(Wrappers.query().lambda() + .eq(DistributionLoadscaninvnEntity::getReservationId, ids) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + if (!packageList.isEmpty() || !inventoryList.isEmpty()){ + log.info(method + "取消配送存在装车数据:{}", deliveryId); + return R.fail(reservationCodes + "存在装车、签收数据!!!"); } + + +// //该配送是否存在异常装车或者异常签收数据 +// List loadscanEntityList = distributionDeliveryListService.selectAbnormalLoadingBydeliveryId(deliveryId); +// if (Func.isNotEmpty(loadscanEntityList)) { +// log.info(method + "存在异常装车数据:{}", deliveryId); +// return R.fail(reservationCodes + "存在异常装车、签收包条!!!"); +// } boolean flag = false; for (DistributionReservationEntity reservationEntity : reservationEntities) { DistributionReservationDTO reservationDTO = Func.copy(reservationEntity, DistributionReservationDTO.class); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 26ea1673b..3c2d19bde 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2732,8 +2732,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl trayGoodsEntities = warehouseTrayGoodsClient.findZeroByOrderCode(stockArticleEntity.getOrderCode(),stockArticleEntity.getWarehouseId()); List> trayMapList = new ArrayList<>(); if (!trayGoodsEntities.isEmpty()) { - int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum(); - handQuantity = handQuantity - sum; +// int sum = trayGoodsEntities.stream().mapToInt(WarehouseTrayGoodsEntity::getNum).sum(); Iterator iterator = trayGoodsEntities.iterator(); while (iterator.hasNext()){ //查询是否进行上架 @@ -2741,6 +2740,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl map = new HashMap<>();