diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java index c7bee8cdf..0b888375e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java @@ -100,6 +100,11 @@ public class DistributionAppReservationVO extends DistributionReservationEntity */ @ApiModelProperty(value = "托盘码") private String trayCode; + /** + * 托盘名称 + */ + @ApiModelProperty(value = "托盘码") + private String trayName; /** * 货物名称 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 4334a3a0c..67e04b3a4 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 @@ -320,7 +320,7 @@ ldsl.id, ldrs.id as deliveryDetailsId, ldsl.cargo_unit as cargoUnit, - SUM(ldrs.reservation_num) AS reservationNum + ldrs.reservation_num AS reservationNum FROM logpm_distribution_reservation_stocklist ldrs LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id 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 6f6e8d857..900c4f0cf 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 @@ -5004,6 +5004,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl goodsLsit = trayTypeDataVO.getGoodsLsit(); if (Func.isNotEmpty(goodsLsit)) { List longs = goodsLsit.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toList()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 8224a9141..056b1a5c8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -486,7 +486,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl list = distributionReservationService.selectStockupStockList(reservationId); - for (int i = 0; i < list.size(); i++) { DistributionStockupStockListVO distributionStockupStockListVO = list.get(i); if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {