From c290d80e68d9d84c40a0dc18d7f4a9e94299b782 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 29 Jul 2024 17:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E9=9B=B6=E6=8B=85=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListController.java | 2 +- .../mapper/DistributionStockArticleMapper.xml | 4 +- .../IDistributionDeliveryListService.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 47 ++++++++++++++++--- .../DistributionReservationServiceImpl.java | 5 +- .../impl/DistributionSignforServiceImpl.java | 1 + .../jobhandle/DistributionDatarepair.java | 2 +- 7 files changed, 50 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index e9fefd3cd..e557e20cf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -400,7 +400,7 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "customArgs") public R getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) { - R parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); + List parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); return R.data(parcelNumberVOS); } 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 71e22f46f..68a99c407 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 @@ -773,11 +773,11 @@ ldpl.brand_name AS brandName, ldpn.quantity AS quantity, ldpn.hand_quantity AS handQuantity, + ldpn.hand_quantity AS number, ldpn.delivery_quantity AS deliveryQuantity, ldpn.outbound_quantity AS outboundQuantity, ldpn.signin_quantity AS signinQuantity, - (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum, - ldpn.quantity AS `number` + (ldpn.hand_quantity - ldpn.delivery_quantity) AS reservationNum FROM logpm_distribution_stock_article AS ldsa LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_distribution_parcel_number AS ldpn ON ldpn.parcel_list_id = ldpl.id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 7249b8d41..6a87f21ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -285,7 +285,7 @@ public interface IDistributionDeliveryListService extends BaseService getDeliveryZeroOrderDetail(Long deliveryId, Long orderId); /** * 零担装车 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 c59cdecbb..e8d307b88 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 @@ -3211,7 +3211,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelNumberVOS = s.getParcelNumberVOS(); @@ -3263,6 +3262,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue()) + ); + } parcelNumberEntity.setDeliveryQuantity(num.intValue()); distributionReservationZeroPackageEntity.setQuantity(pn.getReservationNum()); distributionParcelNumberService.updateById(parcelNumberEntity); @@ -3414,6 +3420,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.yiyueyue.getValue()) + ); parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() + pn.getReservationNum()); distributionParcelNumberService.updateById(parcelNumberEntity); packageNum.getAndAdd(reservationZeroPackageEntity.getQuantity()); @@ -3442,12 +3452,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "orderCode:" + s.getOrderCode()); @@ -3490,17 +3501,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.query().lambda().eq(DistributionReservationZeroPackageEntity::getReservationId, reservationEntity.getId()).eq(DistributionReservationZeroPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId()).ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())); - reservationZeroPackageEntityList.forEach(rzp -> { + for (DistributionReservationZeroPackageEntity rzp : reservationZeroPackageEntityList) { rzp.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue()); distributionReservationZeroPackageService.updateById(rzp); DistributionParcelNumberEntity parcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.query().lambda().eq(DistributionParcelNumberEntity::getParcelListId, rzp.getParcelListId())); if (Func.isNotEmpty(parcelNumberEntity)) { // parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() + rzp.getQuantity()); parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - rzp.getQuantity()); + int totalOutbound = parcelNumberEntity.getDeliveryQuantity() + parcelNumberEntity.getOutboundQuantity(); + if (!Objects.equals(totalOutbound,parcelNumberEntity.getQuantity())){ + //进行零担包件状态维护 + distributionParcelListService.update(Wrappers.update().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue()) + ); + } distributionParcelNumberService.updateById(parcelNumberEntity); distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); } - }); + } } else { log.error("###########################reservation_stockaticle的isZeroz字段维护错误,reservation_stockarticleID:{}", reservationStockarticleEntity.getId()); throw new RuntimeException("服务器正忙..."); @@ -3564,6 +3583,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionParcelListEntity::getId,parcelNumberEntity.getParcelListId()) + .set(DistributionParcelListEntity::getOrderPackageReservationStatus,OrderPackageReservationStatusConstant.daiyuyue.getValue()) + ); + } distributionParcelNumberService.updateById(parcelNumberEntity); distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity); } @@ -3649,6 +3676,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getDeliveryZeroOrderDetail(Long deliveryId, Long orderId) { List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getDeliveryId, deliveryId) .eq(DistributionLoadscanEntity::getOrderId, orderId) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); if (!Func.isEmpty(loadscanEntityList)){ - return R.fail("此订单已进行装车操作,请滞留后编辑"); + return null; } List zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(orderId); List parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId); Map reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2)); zeroOrderDetail.forEach(z -> { + Integer integer = 0; if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) { + integer = reservationNum.get(z.getParcelListId()).getReservationNum(); z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum()); } + int quantity = z.getHandQuantity() - z.getDeliveryQuantity() + integer; + z.setNumber(quantity); }); - return R.data(zeroOrderDetail); + return zeroOrderDetail; } @Override 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 1f78c1e0d..87f534eff 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 @@ -36,7 +36,6 @@ import com.logpm.distribution.vo.*; import com.logpm.distribution.wrapper.*; import com.logpm.oldproject.feign.IWayBillClient; import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; -import com.logpm.trunkline.feign.ITrunklineWaybillTrackClient; import com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseGoodsAllocationClient; @@ -349,6 +348,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionStockArticleVOS = new ArrayList<>(); if (Func.isNotEmpty(reservationStockarticleEntityList)) { reservationStockarticleEntityList.forEach(rs -> { + AtomicInteger num = new AtomicInteger(); DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(rs.getStockArticleId()); DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(stockArticleEntity); if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { @@ -359,6 +359,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); reservationPackageEntityList.forEach(rp -> { + num.addAndGet(1); DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(rp.getParceListId()); DistributionParcelListVO parcelListVOS = DistributionParcelListWrapper.build().entityVO(parcelListEntity); parcelListVOS.setQuantity(parcelListEntity.getQuantity()); @@ -380,6 +381,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl 0) { + //查询库存品扫描签收 List loadingPushOldInventory = distributionSignforMapper.selectLoadingPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); List signingPushOldInventory = distributionSignforMapper.selectSigningPushOldInventory(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index 91e2b4d40..c72578099 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -239,7 +239,7 @@ public class DistributionDatarepair { Long id = entries.getLong("billId"); Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id); if(b!=null&&b){ - warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1); + warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1); log.info(">>> pushBillNotification 成功 id={}",id); }else{ log.error(">>> pushBillNotification 失败 id="+id);