备货库存品获取商场修复

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

@@ -3215,17 +3215,29 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			);//预约信息
 			if (!list.isEmpty()) {
 				DistributionStockArticleEntity byId = distributionStockArticleService.getById(list.get(0).getStockArticleId());
-				mallId = byId.getMallId();
+				if (!Func.isEmpty(byId)){
-				mallName = byId.getMallName();
+					BasicdataClientEntity byName = basicdataClientClient.findByName(byId.getMallName());
+					if (!Func.isEmpty(byName)){
+						mallId = byId.getMallId();
+						mallName = byId.getMallName();
+					}
+				}
+
 
 			}
 
 		} else {
 			// 查询预约单上的商城
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
-			mallId = distributionReservationEntity.getMallId();
+			if (!Func.isEmpty(distributionReservationEntity)){
-			mallName = distributionReservationEntity.getMallName();
+				BasicdataClientEntity byName = basicdataClientClient.findByName(distributionReservationEntity.getMallName());
-
+				if (!Func.isEmpty(byName)){
+					mallId = distributionReservationEntity.getMallId();
+					mallName = distributionReservationEntity.getMallName();
+				}
+			}else {
+				log.info("查询预约单客户信息失败reservationId:{}",reservationId);
+			}
 		}
 
 		//查询货位上物料信息