自提BUG修复、配送客户列表BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -799,7 +799,7 @@ FROM
         LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
         WHERE
         ldsi.reservation_id = lds.reservation_id and
-        ldsi.stock_status != '4'
+        AND ldsi.stock_status != '4'
         ) AS forkliftName,
         CASE
         WHEN ldr.stockup_status ='10' THEN '待指派'

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -3138,6 +3138,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 						List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 							.in(DistributionParcelListEntity::getStockArticleId, ls)
+							.eq(DistributionParcelListEntity::getConditions, 1)
 						);