样品单报价单作废驳回问题处理

hx-admin/src/main/resources/application-dev.yml

@@ -219,7 +219,7 @@ spring:
                 max-wait: -1ms
 
 server:
-    port: 9901
+    port: 9898
     servlet:
         context-path: /
 

hx-sale/src/main/java/com/fjhx/sale/flow/SaleQuotationFlow.java

@@ -8,14 +8,12 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.core.FlowThreadLocalUtil;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.enums.HandleTypeEnum;
-import com.fjhx.sale.entity.contract.po.Contract;
-import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
-import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
@@ -168,4 +166,18 @@ public class SaleQuotationFlow extends FlowDelegate {
         }
     }
 
+    /**
+     * 作废
+     */
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.cancellation(flowId, businessId, flowStatus);
+
+        saleQuotationService.update(q -> q
+                .eq(SaleQuotation::getId, businessId)
+                .set(SaleQuotation::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
 }

hx-sale/src/main/java/com/fjhx/sale/flow/SampleFlow.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
@@ -14,12 +13,7 @@ import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.flow.core.FlowThreadLocalUtil;
 import com.fjhx.flow.enums.FlowStatusEnum;
-import com.fjhx.flow.enums.HandleTypeEnum;
-import com.fjhx.sale.entity.contract.po.Contract;
-import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
-import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.fjhx.sale.entity.sample.dto.SampleDto;
 import com.fjhx.sale.entity.sample.po.Sample;
 import com.fjhx.sale.entity.sample.po.SampleProduct;
@@ -173,7 +167,7 @@ public class SampleFlow extends FlowDelegate {
         SampleService sampleService = SpringUtil.getBean(SampleService.class);
         //通过业务ID查询样品单数据
         Sample sample = sampleService.getById(businessId);
-        if(ObjectUtils.isEmpty(sample)){
+        if (ObjectUtils.isEmpty(sample)) {
             throw new ServiceException("样品单不存在");
         }
         //修改样品单状态为审批通过
@@ -182,5 +176,15 @@ public class SampleFlow extends FlowDelegate {
         sampleService.updateById(sample);
     }
 
-
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.cancellation(flowId, businessId, flowStatus);
+
+        sampleService.update(q -> q
+                .eq(Sample::getId, businessId)
+                .set(Sample::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
 }