From 3631fc9f36dd6b0ca1c4fb4ead05861c3b7b0f43 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 26 Sep 2024 14:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/vo/DistributionParcelNumberVO.java | 8 ++++---- .../mapper/DistributionStockArticleMapper.xml | 8 ++------ .../service/impl/DistributionDeliveryListServiceImpl.java | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelNumberVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelNumberVO.java index a81fd23bb..9856bd41a 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelNumberVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelNumberVO.java @@ -36,12 +36,12 @@ public class DistributionParcelNumberVO extends DistributionParcelNumberEntity { private String firsts; //零担包件名称 // private Integer quantity; //总数量 private String warehouse; //零担包件名称 - private String orderCode; //订单自编码 - private String serviceNumber; //服务号 + private String orderCode; //零担包件名称 private Integer reservationNum; //预约数量 - private Integer loadingNum; //装车数量 - private Integer signingNum; //签收数量 + private Integer loadingNum; //预约数量 + private Integer signingNum; //预约数量 private Integer number; //预约数量 + private Integer maxPlanNum; //最大计划数 private Long stockArticleId; //订单ID private String orderPackageReservationStatus; //预约状态，限制是否能进行预约 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 f4727b62f..505044a10 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 @@ -882,17 +882,13 @@ ldpn.stock_article_id AS stockArticleId, ldpn.parcel_list_id AS parcelListId, ldpl.firsts AS firsts, - ldpl.warehouse AS warehouse, - ldpl.order_code AS orderCode, - ldpl.service_number AS serviceNumber, - ldpl.brand_name AS brandName, ldpn.quantity AS quantity, ldpn.hand_quantity AS handQuantity, - ldpn.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.hand_quantity - ldpn.delivery_quantity) AS reservationNum, + (ldpn.hand_quantity - ldpn.delivery_quantity) AS maxPlanNum 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/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 337a7d3c3..78d44cd64 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 @@ -6025,6 +6025,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl zeroOrderDetail = distributionStockArticleService.getZeroOrderDetail(orderId); List parcelNumberVOS = baseMapper.selectDeliveryZeroOrderDetail(orderId, deliveryId); Map reservationNum = parcelNumberVOS.stream().collect(Collectors.toMap(DistributionParcelNumberVO::getParcelListId, Function.identity(), (k1, k2) -> k2));