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

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

@@ -3203,12 +3203,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		// 查询预约单上的商城
 		DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(reservationId);
 		String mallName = "";
-		if (Objects.isNull(distributionReservationEntity)){
+		if (!Objects.isNull(distributionReservationEntity)){
 			mallName = distributionReservationEntity.getReceivingUnit();
 		}
 		//查询自提
 		DistrilbutionBillLadingEntity billLadingEntity = distrilbutionBillLadingService.getById(reservationId);
-		if (Objects.isNull(billLadingEntity)){
+		if (!Objects.isNull(billLadingEntity)){
 			mallName = billLadingEntity.getConsigneeUnit();
 		}
 		//查询货位上物料信息