From 1e4713697e3af18243b3d0c2fa48bce58b69cf32 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 21 Mar 2024 17:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E9=9B=B6=E6=8B=85=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=81=E7=AD=BE=E6=94=B6=E5=AE=A2=E6=88=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=BB=B4=E6=8A=A4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionStockupOrderListVO.java | 2 ++ .../feign/IWarehouseUpdownGoodsClient.java | 4 +++ .../DistributionStockupAppController.java | 30 +++++++++++++++---- .../mapper/DistributionReservationMapper.java | 7 +++++ .../mapper/DistributionReservationMapper.xml | 21 +++++++++++-- .../mapper/DistributionStockupMapper.xml | 2 +- .../IDistributionReservationService.java | 8 +++++ .../DistributionReservationServiceImpl.java | 15 +++++++--- .../impl/DistributionStockupServiceImpl.java | 12 ++++---- .../feign/WarehouseTaryAllocationClient.java | 5 ++-- .../feign/WarehouseUpdownGoodsClient.java | 11 +++++++ 11 files changed, 97 insertions(+), 20 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java index f3362d9e9..97b7188c8 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java @@ -37,11 +37,13 @@ public class DistributionStockupOrderListVO implements Serializable { private String trayId; //托盘id private String customerAddress; //客户地址 private String firstsNumber; //品类数量 + private String descriptionGoods; //订单货物名称 private Long shelfId; //货架id private Long parcelListId; //包件id private Long stockId; //备货id private Long allocationId; //货位id private Integer stockQuantity; //备货数量 private Integer allocationNumber; //货位数量 + private Integer num; //货位数量 } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java index dc232eae4..e70594345 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java @@ -105,4 +105,8 @@ public interface IWarehouseUpdownGoodsClient { @GetMapping(API_PREFIX+"/findEntityByOrderPackageCode") WarehouseUpdownGoodsEntity findEntityByOrderPackageCode(@RequestParam String unitNo); + + @GetMapping(API_PREFIX+"/getBatchLocationStockListInformation") + List getBatchLocationStockListInformation(WarehouseUpdownGoodsEntity updownGoodsEntity); + } 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 25dd801fb..147257f38 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 @@ -49,6 +49,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.RabbitConstant; +import org.springblade.common.constant.common.IsOrNoConstant; import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant; import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant; import org.springblade.common.constant.pda.PdaAudioLingoStatus; @@ -121,6 +122,7 @@ public class DistributionStockupAppController extends BladeController { private final IDisStockOrdercodeRecoService disStockOrdercodeRecoService; + private final IDistributionReservationStockarticleService distributionReservationStockarticleService; private final BladeRedis redis; @@ -259,11 +261,9 @@ public class DistributionStockupAppController extends BladeController { DistributionStockupSelfVO distributionStockupSelfVO = distributionStockupService.selectStockupStockListDetails(reservationId); map = convertObjectToMap(distributionStockupSelfVO); //库存品 - List list = distributionStockupService.selectStockupStockList(stockupDTO); map.put("stockList", list); } - } else { //商，市 DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); @@ -278,6 +278,7 @@ public class DistributionStockupAppController extends BladeController { //根据list列表统计计划件数 Integer planNum = 0; Integer scanNum = 0; + if (!list.isEmpty()) { for (DistributionStockupOrderListVO vo : list) { planNum = planNum + vo.getPlanNum(); @@ -295,9 +296,26 @@ public class DistributionStockupAppController extends BladeController { vo.setTrayLean(distributionStockupService.getTrayBoot(vo, stockupDTO.getTypeService())); } } + if (IsOrNoConstant.yes.getValue().equals(stockupDTO.getIsZero())){ + //查询客户零担计划数量 + List reservationStockarticleEntities = distributionReservationStockarticleService.list(Wrappers.query().lambda() + .eq(DistributionReservationStockarticleEntity::getReservationId, reservationId) + .eq(DistributionReservationStockarticleEntity::getIsZero, IsOrNoConstant.yes.getValue()) + .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()) + ); + planNum = reservationStockarticleEntities.stream().mapToInt(DistributionReservationStockarticleEntity::getReservationNum).sum(); + List collect = list.stream().map(DistributionStockupOrderListVO::getParcelListId).collect(Collectors.toList()); + List stockEntityList = distributionStockService.list(Wrappers.query().lambda() + .eq(DistributionStockEntity::getReservationId, reservationId) + .eq(DistributionStockEntity::getOutboundType, "3") + .in(DistributionStockEntity::getParcelListId, collect) + ); + scanNum = stockEntityList.stream().mapToInt(DistributionStockEntity::getStockQuantity).sum(); + } } map.put("planNum", planNum); map.put("scanNum", scanNum); + list.stream().forEach(f->f.setCompleteStact(false)); map.put("orderList", list); } else if (orderStatus==2) { @@ -306,10 +324,10 @@ public class DistributionStockupAppController extends BladeController { List list = distributionStockupService.selectStockupStockList(stockupDTO); //根据list列表统计计划件数 //查询结果为null，判定为当前库存品未进行上架操作 - if (Func.isEmpty(list)){ - log.info("##################库存品库位信息:{}",list); - return R.fail("该库存品未上架"); - } +// if (Func.isEmpty(list)){ +// log.info("##################库存品库位信息:{}",list); +// return R.fail("该库存品未上架"); +// } Integer planNum = 0; Integer scanNum = 0; for (DistributionStockupStockListVO vo : list) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 5d123357d..c5d400b04 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -373,4 +373,11 @@ public interface DistributionReservationMapper extends BaseMapper selectZeroPackageByReservationInfo(@Param("param")Map reservationPackageDTO, IPage page); + + /** + * 查询零担订单 + * @param reservationId + * @return + */ + List selectStockupZeroOrderList(Long reservationId); } 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 20d09b421..a5843c2d9 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 @@ -235,7 +235,7 @@ <!– and lwug.association_type = '3' and lwtg.association_type = '3' –> --> - select DISTINCT CONCAT(lwug.position_code ) allocation , lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId, + select DISTINCT CONCAT(lwug.position_code ) allocation ,lwug.num AS num, lwtg.tray_code pallet,lwug.area_id areaId,ldpl.id parcelListId,lds.id stockId, lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id trayId,ldpl.order_code orderCode,ldpl.stock_article_id stockArticleId from logpm_distribution_reservation_package ldrp LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id and ldpl.order_package_status != '70' @@ -246,7 +246,6 @@ ldrp.reservation_id = #{reservationId} and ldrp.packet_bar_status in (1,3) and ldsa.is_zero = #{isZero} -