fix: 修复代码 自提备货页面 没有自提备货库存品

的问题

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

@@ -1150,26 +1150,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			log.error("###########myCurrentWarehouse:{}",myCurrentWarehouse);
 			return null;
 		}
-		Long reservationId = stockupDTO.getReservationId();//预约单id
-		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
-		if (Func.isEmpty(reservationEntity)){
-			log.error("###########查询预约失败reservationId:{}",reservationId);
-			return null;
-		}
-		String mallName = reservationEntity.getMallName();
-		if (Func.isBlank(mallName)){
-			//预约商场名称为空  查看是否存在商场ID
-			if (Func.isNotEmpty(reservationEntity.getMallId())){
-				BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(reservationEntity.getMallId());
-				mallName = basicdataClientEntity.getClientName();
-			}else {
-				log.error("###########预约单无商场信息:{}",reservationId);
-			}
-		}
+
 
 		if (stockupDTO.getTypeService().equals("3")) {
 			//自
-			List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupSelf(reservationId);
+			List<DistributionStockupStockListVO> list = distributionStockupService.selectStockupSelf(stockupDTO.getReservationId());
 			list.forEach(i -> {
 				if (i.getPlanNum().equals(i.getRealNum())) {
 					i.setCompleteStact(true);
@@ -1192,7 +1177,22 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			});
 			return list;
 		} else {
-
+			Long reservationId = stockupDTO.getReservationId();//预约单id
+			DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+			if (Func.isEmpty(reservationEntity)){
+				log.error("###########查询预约失败reservationId:{}",reservationId);
+				return null;
+			}
+			String mallName = reservationEntity.getMallName();
+			if (Func.isBlank(mallName)){
+				//预约商场名称为空  查看是否存在商场ID
+				if (Func.isNotEmpty(reservationEntity.getMallId())){
+					BasicdataClientEntity basicdataClientEntity = basicdataClientClient.getMallById(reservationEntity.getMallId());
+					mallName = basicdataClientEntity.getClientName();
+				}else {
+					log.error("###########预约单无商场信息:{}",reservationId);
+				}
+			}
 			//商，市
 			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId,myCurrentWarehouse.getId(),mallName);
             for (DistributionStockupStockListVO distributionStockupStockListVO : list) {