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

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

@@ -3202,6 +3202,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 		// 查询预约单上的商城
 		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
+		String mallName = "";
+		if (Objects.isNull(distributionReservationEntity)){
+			mallName = distributionReservationEntity.getReceivingUnit();
+		}
+		//查询自提
+		DistrilbutionBillLadingEntity billLadingEntity = distrilbutionBillLadingService.getById(reservationId);
+		if (Objects.isNull(billLadingEntity)){
+			mallName = billLadingEntity.getConsigneeUnit();
+		}
 		//查询货位上物料信息
 		// todo
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -3235,7 +3244,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			LambdaQueryWrapper<DistributionStockListEntity> lambdaQueryWrapper = new LambdaQueryWrapper();
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getIncomingBatch, incomingBatches);
 			lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber);
-			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, distributionReservationEntity.getMallName());
+			lambdaQueryWrapper.eq(DistributionStockListEntity::getMarketName, mallName);
 			// 入库 时间先进的先出
 			lambdaQueryWrapper.orderByAsc(DistributionStockListEntity::getCreateTime);
 			DistributionStockListEntity distributionStockListEntities = distributionStockListMapper.selectOne(lambdaQueryWrapper);