From e3a67c94dd1dc5cd1eef52e499a712114a7beb04 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 19 Jul 2024 10:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E9=85=8D=E5=A4=87=E8=B4=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionReservationMapper.xml  | 2 +-
 .../distribution/mapper/DistributionStockupMapper.xml      | 4 ----
 .../service/impl/DistributionDeliveryListServiceImpl.java  | 7 ++++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

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 2572e97f0..63465623a 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
@@ -1055,7 +1055,7 @@
         logpm_distribution_stockup_info AS ldsi
         INNER JOIN logpm_distribution_stockup AS lds ON ldsi.stockup_id = lds.id
         WHERE
-        ldsi.reservation_id = #{reservationId}
+        ldsi.reservation_id = #{reservationId} AND ldsi.stock_status != 4
     </select>
     <select id="selectStockupList" resultType="com.logpm.distribution.entity.DistributionStockupEntity">
         SELECT
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 8e62ecb86..f70f7f49b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -303,10 +303,6 @@
                 <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
                     #{a}
                 </foreach>
-                and ldpl.warehouse_id in
-                <foreach collection="warehouseIdList" item="a" open="(" separator="," close=")">
-                    #{a}
-                </foreach>
             </if>
 
         </where>
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 5da777f39..2c882109e 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
@@ -5010,7 +5010,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		// 构建产品明细的表头 -- 这里目前只处理了定制品和有数据的库存品，对于零担 还没有处理
 		List<Map<String, Object>> listMapTemp = new ArrayList<>();
-
+		//统计备货数量
+		int stockNum = 0;
 		for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
 			if (StringUtils.isBlank(distributionParcelListEntity.getThirdProduct())) {
 				distributionParcelListEntity.setThirdProduct("其它");
@@ -5022,6 +5023,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			} else {
 				m.put(distributionParcelListEntity.getThirdProduct(), 1);
 			}
+			if (OrderPackageStockupStatusConstant.yibeihu.getValue().equals(distributionParcelListEntity.getOrderPackageStockupStatus())){
+				stockNum++;
+			}
 		}
 		// 加入到集合中的去 目的是为了获取分类头部
 		listMapTemp.add(m);
@@ -5060,6 +5064,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				String materialNameStr = buildMaterialNameStr(distributionParcelListEntities);
 				tempMap.put("物料名称", materialNameStr);
 				tempMap.put("签收件数", 0);
+				tempMap.put("备货件数", stockNum);
 
 
 				// 构建产品明细 --对于每一个订单