自提备货BUG修复

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

@@ -3212,7 +3212,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			//  查询预约单的上的信息
 			List<DistrilbutionBillStockEntity> list = distrilbutionBillStockService.list(Wrappers.<DistrilbutionBillStockEntity>query().lambda().
 				eq(DistrilbutionBillStockEntity::getBillLadingId, reservationId)
-				.apply("order_status in (1,2)")
+				.apply("order_status in (1,3)")
 			);//预约信息
 			if (!list.isEmpty()) {
 				DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId());
@@ -3225,8 +3225,30 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				}
 
 
+			}else {
+				List<DistributionDeliveryDetailsEntity> detailsEntities = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
+					.eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId)
+					.ne(DistributionDeliveryDetailsEntity::getInventoryStatus, "2")
+				);
+				if (!detailsEntities.isEmpty()) {
+					List<Long> ids = detailsEntities.stream().map(DistributionDeliveryDetailsEntity::getStockListId).distinct().collect(Collectors.toList());
+					List<DistributionStockListEntity> distributionStockListEntities = distributionStockListService.listByIds(ids);
+					if (!distributionStockListEntities.isEmpty()){
+						if (distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()).size() == 1 && distributionStockListEntities.stream().map(DistributionStockListEntity::getMallName).distinct().collect(Collectors.toList()).size() == 1) {
+							mallId = distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()).get(0);
+							mallName = distributionStockListEntities.stream().map(DistributionStockListEntity::getMallName).distinct().collect(Collectors.toList()).get(0);
+						}else {
+							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息reservationId:{}",reservationId);
+							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场ID:{}",distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketId).distinct().collect(Collectors.toList()));
+							log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>自提单错误库存品计划，多个商场信息商场名称:{}",distributionStockListEntities.stream().map(DistributionStockListEntity::getMarketName).distinct().collect(Collectors.toList()));
+						}
+					}else {
+						log.info(">>>>>>>>>>>>>>>>自提单无定制品和库存品   无效字体计划billLadingId:{}",reservationId);
+					}
+				}
 			}
 
+
 		} else {
 			// 查询预约单上的商城
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);