Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionStockupAppController.java

@@ -122,6 +122,7 @@ public class DistributionStockupAppController extends BladeController {
 	private final BladeRedis redis;
 	private final ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
 	private final IDistributionNodeWorkService distributionNodeWorkService;
+	private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService;
 
 
 	/**
@@ -721,10 +722,18 @@ public class DistributionStockupAppController extends BladeController {
 
 	private int judgmentIsStockUp(Long reservationId, Long stockListId, DistributionParcelListEntity distributionParcelListEntity, Long warehouseId, String cargoNumber) {
 		List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = distributionReservationMapper.selectStockListByReservationId(reservationId);
+		List<Long> stockListIds = new ArrayList<>();
 		if (Func.isNotEmpty(distributionReservationStocklistEntities)) {
 			//查询库存品信息
-			List<Long> stockListIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList());
+			stockListIds = distributionReservationStocklistEntities.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList());
+		}
+		List<DistributionDeliveryDetailsEntity> detailsEntities = distributionDeliveryDetailsService.list(Wrappers.<DistributionDeliveryDetailsEntity>query().lambda()
+			.eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId)
+		);
+		if (!detailsEntities.isEmpty()) {
+			stockListIds = detailsEntities.stream().map(DistributionDeliveryDetailsEntity::getStockListId).collect(Collectors.toList());
 
+		}
 		List<DistributionStockListEntity> stockListEntityList = distributionStockListService.list(Wrappers.<DistributionStockListEntity>query().lambda()
 			.in(DistributionStockListEntity::getId, stockListIds)
 			.eq(DistributionStockListEntity::getWarehouseId, warehouseId)
@@ -742,7 +751,6 @@ public class DistributionStockupAppController extends BladeController {
 			return 2;
 		}
 
-		}
 		return 3;
 	}