From e1480f10ec18e28e7815f2fe85b50a3ae619367e Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 28 Nov 2023 22:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E7=95=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockupAppController.java | 16 +++++----- .../impl/DistributionAsyncServiceImpl.java | 30 +++++++++++-------- .../WarehouseRetentionRecordServiceImpl.java | 2 -- 3 files changed, 27 insertions(+), 21 deletions(-) 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 d7fa05bc0..dca95f0fd 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 @@ -804,13 +804,15 @@ public class DistributionStockupAppController extends BladeController { ); //对指定库存品包件进行库存品ID修改 DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0); - disStockListDetailEntity.setStockListId(stockListEntity.getId()); - disStockListDetailService.updateById(disStockListDetailEntity); - distributionReservationStocklistService.updateById(reservationStocklist); - //维护对应库存品的冻结数量 - DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId()); - oldStockListEntity.setQuantityStock(oldStockListEntity.getQuantityStock() + reservationStocklistEntity.getReservationNum()); - distributionStockListService.updateById(oldStockListEntity); + if (Func.isNotEmpty(disStockListDetailEntity)){ + disStockListDetailEntity.setStockListId(stockListEntity.getId()); + disStockListDetailService.updateById(disStockListDetailEntity); + distributionReservationStocklistService.updateById(reservationStocklist); + //维护对应库存品的冻结数量 + DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId()); + oldStockListEntity.setQuantityStock(oldStockListEntity.getQuantityStock() + reservationStocklistEntity.getReservationNum()); + distributionStockListService.updateById(oldStockListEntity); + } } // 默认 计划数量和实际数量为0 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 741eb3ba6..ee7da4b7b 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 @@ -892,7 +892,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(packageId); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId()); - if (stockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (stockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) { List parcelListEntities = distributionParcelListService.list(Wrappers.query().lambda() .eq(DistributionParcelListEntity::getStockArticleId, stockArticleEntity.getId())); boolean reservationStatusFlag = parcelListEntities.stream().allMatch(p -> p.getOrderPackageReservationStatus().equals(OrderPackageReservationStatusConstant.yiyueyue.getValue())); @@ -919,16 +919,16 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } } distributionStockArticleService.updateById(stockArticleEntity); - }else { + } else { List parcelNumberEntityList = distributionParcelNumberService.list(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getStockArticleId, stockArticleEntity.getId())); - if (Func.isNotEmpty(parcelNumberEntityList)){ - parcelNumberEntityList.forEach(p->{ + if (Func.isNotEmpty(parcelNumberEntityList)) { + parcelNumberEntityList.forEach(p -> { DistributionParcelListEntity zeroParcelListEntity = distributionParcelListService.getById(p.getParcelListId()); - if (p.getOutboundQuantity() == p.getQuantity() && p.getOutboundQuantity() > 0){ + if (p.getOutboundQuantity() == p.getQuantity() && p.getOutboundQuantity() > 0) { //出库数量和总数量一致，此时包件处于装车状态 zeroParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); } - if (p.getOutboundQuantity() == 0 ){ + if (p.getOutboundQuantity() == 0) { zeroParcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()); } distributionParcelListService.updateById(zeroParcelListEntity); @@ -962,9 +962,6 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } - - - } /** @@ -1284,15 +1281,24 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { .eq(DistributionReservationZeroPackageEntity::getStockArticleId, orderId) .ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()) ); - if (Func.isNotEmpty(reservationZeroPackageEntities)){ + reservationZeroPackageEntities.forEach(rzp -> { + if (rzp.getQuantity() == 0) { + rzp.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue()); + reservationZeroPackageService.updateById(rzp); + } + } + + ); + + if (Func.isNotEmpty(reservationZeroPackageEntities)) { int sum = reservationZeroPackageEntities.stream().mapToInt(DistributionReservationZeroPackageEntity::getQuantity).sum(); distributionReservationStockarticle.setReservationNum(sum); - }else { + } else { distributionReservationStockarticle.setReservationNum(0); distributionReservationStockarticle.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue()); } - distributionReservationStockarticleMapper.updateById(distributionReservationStockarticle); } + distributionReservationStockarticleMapper.updateById(distributionReservationStockarticle); //维护预约的预约数量 maintenanceReservationPackageNum(reservationId); maintenanceDeliveryPackageNum(deliveryId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java index 0eb10c6cf..2fc7c5180 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java @@ -209,7 +209,6 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl { - if (r.getConditions().equals(1)){ //查询是否进行多次滞留 WarehouseRetentionScanEntity retentionScanServiceOne = warehouseRetentionScanService.getOne(Wrappers.query().lambda() .eq(WarehouseRetentionScanEntity::getConditions, r.getConditions()) @@ -247,7 +246,6 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl