From 69e5aec6b0366ba465983af375226af5bc799169 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 20 Jul 2023 17:26:09 +0800
Subject: [PATCH] =?UTF-8?q?1.APP=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionReservationMapper.java |  1 +
 .../impl/DistributionStockupServiceImpl.java  | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
index ba85bc968..b5684fd78 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.excel.DistributionReservationExcel;
 import com.logpm.distribution.vo.DistributionReservationVO;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.DistributionStockupOrderListVO;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index e6fef1ea2..b9b93994a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -26,11 +26,13 @@ import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.logpm.distribution.mapper.DistributionStockupMapper;
-import com.logpm.distribution.service.*;
+import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.service.IDistributionReservationService;
+import com.logpm.distribution.service.IDistributionStockService;
+import com.logpm.distribution.service.IDistributionStockupService;
 import com.logpm.distribution.vo.DistributionStockupListVO;
 import com.logpm.distribution.vo.DistributionStockupOrderListVO;
 import com.logpm.distribution.vo.DistributionStockupVO;
-import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -38,6 +40,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,16 +54,17 @@ import java.util.*;
  * @since 2023-06-15
  */
 @Service
-@AllArgsConstructor
 public class DistributionStockupServiceImpl extends BaseServiceImpl<DistributionStockupMapper, DistributionStockupEntity> implements IDistributionStockupService {
 
-	private final IDistributionReservationService distributionReservationService;
+	@Lazy
+	@Autowired
+	private IDistributionReservationService distributionReservationService;
 
-	private final IDistributionStockupInfoService distributionStockupInfoService;
+	@Autowired
+	private IDistributionParcelListService distributionParcelListService;
 
-	private final IDistributionParcelListService distributionParcelListService;
-
-	private final IDistributionStockService distributionStockService;
+	@Autowired
+	private IDistributionStockService distributionStockService;
 
 	@Override
 	public IPage<DistributionStockupVO> selectDistributionStockupPage(IPage<DistributionStockupVO> page, DistributionStockupVO distributionStockup) {