From ca79e1317cc8def9ade69fe0d540c313e79d98df Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 11 Mar 2024 15:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E8=AE=A1=E5=88=92=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=81PDA=E8=A3=85=E8=BD=A6=E3=80=81=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E8=AE=A1=E5=88=92=E6=95=B0=E9=87=8F=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionReservationMapper.xml | 3 +-- .../mapper/DistributionStockArticleMapper.xml | 2 +- .../service/impl/DistributionAsyncServiceImpl.java | 12 +++++++++--- .../impl/DistributionDeliveryInfoServiceImpl.java | 2 +- .../impl/DistributionReservationServiceImpl.java | 1 + .../service/impl/DistributionSignforServiceImpl.java | 3 ++- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 5aa19732d..b5a1269a5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1709,10 +1709,9 @@ ldsa.service_number AS serviceNumber, ldpl.quantity AS quantity, ldpl.id AS id, - ldpl.order_package_reservation_status AS orderPackageReservationStatusName, ldrzp.quantity AS reservationNum, IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS loadingNum, - ldrzp.quantity = IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS signingNum , + IF(ldl.loaded_nub is null,0,ldl.loaded_nub) AS signingNum , CASE IF(ldl.loaded_nub is null,0,ldl.loaded_nub) WHEN 0 THEN '待装车' ELSE IF(ldl.loaded_nub = ldrzp.quantity,'已装车','部分装车') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 92e6ec4c3..1a584c05e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -587,7 +587,7 @@ ldsa.create_time, ldsa.update_user, ldsa.update_time, - (ldsa.incoming_num - ldsa.delivery_quantity ) AS handQuantity, + ldsa.hand_quantity AS handQuantity, ldsa.status, ldsa.is_deleted, ldsa.create_dept, ldsa.reserve1, ldsa.reserve2, ldsa.reserve3, ldsa.reserve4, ldsa.reserve5, ldsa.service_number, ldsa.order_code, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index db4f47d88..8e3e259df 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -2236,6 +2236,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } @Override + @Transactional public void changeOrderReservationStatus(DistributionStockArticleDTO stockArticleDTO) { Long id = stockArticleDTO.getId(); DistributionStockArticleEntity stockArticleEntity = Func.copy(stockArticleDTO, DistributionStockArticleEntity.class); @@ -2258,9 +2259,14 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { List parcelNumberEntities = distributionParcelNumberService.list(Wrappers.query().lambda() .eq(DistributionParcelNumberEntity::getStockArticleId, stockArticleDTO.getId())); AtomicInteger unavailableNum = new AtomicInteger(); - parcelNumberEntities.forEach(p -> { - unavailableNum.getAndAdd(p.getOutboundQuantity() + p.getDeliveryQuantity()); - }); +// parcelNumberEntities.forEach(p -> { +// unavailableNum.getAndAdd(p.getOutboundQuantity() + p.getDeliveryQuantity()); +// }); + if (Func.isNotEmpty(parcelNumberEntities)){ + int sum = parcelNumberEntities.stream().mapToInt(p -> p.getOutboundQuantity() + p.getDeliveryQuantity()).sum(); + unavailableNum.getAndAdd(sum); + log.info("################零担包件当前不可用数量:{}",sum); + } if (unavailableNum.get() == stockArticleDTO.getHandQuantity()) { stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); } else if (unavailableNum.get() < stockArticleDTO.getHandQuantity()) { 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 8f4ec9cb2..7d003ae84 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 @@ -540,7 +540,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl reservationInventoryPackageVOIPage = distributionReservationMapper.selectZeroPackageByReservationInfo(reservationPackageDTO,page); - return reservationInventoryPackageVOIPage; + return reservationInventoryPackageVOIPage; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index c2eacab9d..6c34c7517 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -2266,6 +2266,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl parcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distributionAppDeliveryListVO.getId()); distributionAppDeliveryListVO.setInventoryNub(0); - distributionAppDeliveryListVO.setDeliveryNumber(0); +// distributionAppDeliveryListVO.setDeliveryNumber(0); AtomicInteger deliveryNub = new AtomicInteger(); if (Func.isNotEmpty(inventory)) { int inventoryNub = inventory.stream().mapToInt(DisStockListDetailEntity::getNum).sum(); @@ -3097,6 +3097,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl