市配备货列表BUG修复

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

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>

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);
 
 
 				// 构建产品明细 --对于每一个订单