24282 2 gadi atpakaļ
vecāks
revīzija
03cfc28962

+ 12 - 10
hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -1,12 +1,9 @@
 package com.fjhx.sale.flow;
 
-import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
@@ -19,6 +16,7 @@ import com.fjhx.purchase.util.code.CodeEnum;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.obs.services.internal.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -28,13 +26,22 @@ import java.util.List;
 
 /**
  * 采购流程
+ *
  * @Author:caozj
  * @DATE:2023/4/3 17:38
  */
-@DS(SourceConstant.PURCHASE)
 @Component
 public class PurchaseFlow extends FlowDelegate {
 
+    @Autowired
+    private PurchaseService purchaseService;
+
+    @Autowired
+    private PurchaseDetailService purchaseDetailService;
+
+    @Autowired
+    private ContractProductService contractProductService;
+
     @Override
     public String getFlowKey() {
         return "purchase_flow";
@@ -48,8 +55,6 @@ public class PurchaseFlow extends FlowDelegate {
      */
     @Override
     public Long start(Long flowId, JSONObject submitData) {
-        PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
-        PurchaseDetailService purchaseDetailService = SpringUtil.getBean(PurchaseDetailService.class);
         Purchase purchase = submitData.toJavaObject(Purchase.class);
         purchase.setCode(CodeEnum.PURCHASE.getCode());
         purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
@@ -72,9 +77,6 @@ public class PurchaseFlow extends FlowDelegate {
      */
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
-        PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
-        ContractProductService contractProductService = SpringUtil.getBean(ContractProductService.class);
-        PurchaseDetailService purchaseDetailService = SpringUtil.getBean(PurchaseDetailService.class);
         //通过业务ID查询采购数据
         Purchase purchase = purchaseService.getById(businessId);
         if(ObjectUtils.isEmpty(purchase)){
@@ -108,5 +110,5 @@ public class PurchaseFlow extends FlowDelegate {
         purchaseDetailService.update(detail,Wrappers.<PurchaseDetail>query()
                 .lambda().eq(PurchaseDetail::getPurchaseId,purchase.getId()));
     }
-    
+
 }