From ced488a7203be12447f0628572b248a7d744ceb5 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 26 Sep 2024 18:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=BC=82=E5=B8=B8BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionReservationController.java | 6 +++--- .../DistributionDeliveryListMapper.java | 7 +++++++ .../mapper/DistributionDeliveryListMapper.xml | 18 ++++++++++++++++ .../IDistributionReservationService.java | 2 +- .../DistributionDeliveryListServiceImpl.java | 14 ++++++------- .../DistributionReservationServiceImpl.java | 21 +++++++++++-------- .../impl/DistributionSignforServiceImpl.java | 1 + 7 files changed, 49 insertions(+), 20 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 1bba42e24..8fb48bcd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -398,9 +398,9 @@ public class DistributionReservationController extends BladeController { @GetMapping("/getReservationZeroOrderDetail") @ApiOperationSupport(order = 1) @ApiOperation(value = "客户列表零担详情", notes = "传入distrbutionReservation") - public R> getReservationZeroOrderDetail(@ApiIgnore @RequestParam Long id,@ApiIgnore @RequestParam Long reservationId) { - List parcelNumberVOS = reservationService.getReservationZeroOrderDetail(id,reservationId); - return R.data(parcelNumberVOS); + public R getReservationZeroOrderDetail(@ApiIgnore @RequestParam Long id,@ApiIgnore @RequestParam Long reservationId) { + R r = reservationService.getReservationZeroOrderDetail(id,reservationId); + return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 48493d45d..fb1ebe6b0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -597,4 +597,11 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectDeliveyId(@Param("param") DistributionAppDeliveryListDTO distributionDeliveryList); + /** + * 查询商配零担计划数量 + * @param orderId + * @param deliveryId + * @return + */ + Integer selectDeliveryZeroPackagePlanNum(@Param("orderId")Long orderId,@Param("deliveryId") Long deliveryId,@Param("packageId") Long packageId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index dcb5f8dd6..1575df7a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2692,5 +2692,23 @@ AND DATE_FORMAT( lddl.task_time, '%y%m%d' ) BETWEEN DATE_FORMAT( #{param.taskTime_start}, '%y%m%d' ) AND DATE_FORMAT( #{param.taskTime_end}, '%y%m%d' ) AND lddl.warehouse_id = #{param.warehouseId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index 82eb29ac0..8ee49767a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -231,7 +231,7 @@ public interface IDistributionReservationService extends BaseService getReservationZeroOrderDetail(Long id,Long reservationId); + R getReservationZeroOrderDetail(Long id,Long reservationId); /** * 查询预约订单的包件信息 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 b4b491e10..1de92b35c 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 @@ -6030,13 +6030,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl 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()); + Integer planNum = baseMapper.selectDeliveryZeroPackagePlanNum(orderId, deliveryId,z.getParcelListId()); + if (!Objects.isNull(planNum)){ + z.setReservationNum(planNum); + z.setMaxPlanNum((z.getMaxPlanNum()+planNum)); + }else { + z.setReservationNum(0); } - int quantity = z.getHandQuantity() - z.getDeliveryQuantity() + integer; - z.setNumber(quantity); }); return R.data(zeroOrderDetail); } @@ -8780,7 +8780,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>>>packageCode:{},reservationId:{}", distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getReservationId()); //已发车无法进行异常装车 - if (DeliveryStartStatusConstant.yifache.equals(deliveryListEntity.getIsStart())) { + if (DeliveryStartStatusConstant.yifache.getValue().equals(deliveryListEntity.getIsStart())) { return Resp.scanFail("已发车无法进行异常装车", "已发车无法进行异常装车"); } if (Objects.isNull(distrilbutionloadingscanDTO.getReservationId())) { 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 00e0d3290..93094aba1 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 @@ -272,6 +272,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl getReservationZeroOrderDetail(Long id, Long reservationId) { + public R getReservationZeroOrderDetail(Long id, Long reservationId) { + List loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, reservationId) + .eq(DistributionLoadscanEntity::getOrderId, id) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) + ); + if (!Func.isEmpty(loadscanEntityList)) { + return R.fail("当前零担已装车"); + } List zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(id); for (DistributionParcelNumberVO distributionParcelNumberVO : zeroOrderDetail) { Integer planNum = distributionReservationMapper.getZeroPackagePlanNum(id,reservationId,distributionParcelNumberVO.getParcelListId()); @@ -3679,14 +3688,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl parcelNumberVOS = baseMapper.selectReservationZeroOrderDetail(id, reservationId); -// Map reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2)); -// zeroOrderDetail.forEach(z -> { -// if (Func.isNotEmpty(reservationNum.get(z.getParcelListId()))) { -// z.setReservationNum(reservationNum.get(z.getParcelListId()).getReservationNum()); -// } -// }); - return zeroOrderDetail; + + return R.data(zeroOrderDetail); } @Override diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 37a943d09..45dfb490b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -8649,6 +8649,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionLoadscanAbnormalEntity::getReservationId, reservationId) .eq(DistributionLoadscanAbnormalEntity::getAuditingStatus, LoadingAbnormalAuditingStatusConstant.daishenhe.getValue()) + .eq(DistributionLoadscanAbnormalEntity::getComplete, Integer.parseInt(IsOrNoConstant.yes.getValue())) ); if (count == 0) { //进行签收的维护