【需求】避免循环引用问题

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -27,14 +27,13 @@ import com.chanko.yunxi.mes.module.biz.dal.dataobject.workshop.WorkshopDO;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.customer.CustomerMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.material.MaterialMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.projectorder.ProjectOrderMapper;
+import com.chanko.yunxi.mes.module.biz.dal.mysql.storage.StorageMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.supplier.SupplierMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.taskdispatch.TaskDispatchDetailMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.taskreport.TaskReportMapper;
 import com.chanko.yunxi.mes.module.biz.dal.mysql.workshop.WorkshopMapper;
 import com.chanko.yunxi.mes.module.biz.enums.*;
 import com.chanko.yunxi.mes.module.biz.service.procedure.ProcedureService;
-import com.chanko.yunxi.mes.module.biz.service.projectorder.ProjectOrderService;
-import com.chanko.yunxi.mes.module.biz.service.storage.StorageService;
 import com.chanko.yunxi.mes.module.biz.service.storagemat.StorageMatService;
 import com.chanko.yunxi.mes.module.biz.service.taskreport.TaskReportService;
 import com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user.UserSaveReqVO;
@@ -80,8 +79,6 @@ public class ChanjetManager {
     @Resource
     private TaskReportService taskReportService;
     @Resource
-    private StorageService storageService;
-    @Resource
     private StorageMatService storageMatService;
     @Resource
     private DeptMapper deptMapper;
@@ -90,8 +87,6 @@ public class ChanjetManager {
     @Resource
     private DictDataMapper dictDataMapper;
     @Resource
-    private ProjectOrderService projectOrderService;
-    @Resource
     private ProjectOrderMapper projectOrderMapper;
     @Resource
     private ProjectOrderController projectOrderController;
@@ -99,6 +94,8 @@ public class ChanjetManager {
     private TaskReportMapper taskReportMapper;
     @Resource
     private TaskDispatchDetailMapper taskDispatchDetailMapper;
+    @Resource
+    private StorageMapper storageMapper;
 
     /**
      * 查询部门
@@ -804,7 +801,7 @@ public class ChanjetManager {
      */
     @Transactional(rollbackFor = Exception.class)
     public void createStockOutOrder(Long id) throws ChanjetApiException {
-        StorageDO storage = storageService.getStorage(id);
+        StorageDO storage = storageMapper.selectById(id);
         List<StorageMatDO> matList = storageMatService.getStorageMatListByStockId(id);
         if(matList.isEmpty()) return;
 
@@ -835,7 +832,7 @@ public class ChanjetManager {
      * @throws ChanjetApiException
      */
     public void createStorageInOrder(Long id) throws ChanjetApiException {
-        StorageDO storage = storageService.getStorage(id);
+        StorageDO storage = storageMapper.selectById(id);
         List<StorageMatDO> matList = storageMatService.getStorageMatListByStockId(id);
         if(matList.isEmpty()) return;