问题处理

hx-sale/src/main/java/com/fjhx/sale/controller/purchase/EhsdPurchaseController.java

@@ -85,4 +85,12 @@ public class EhsdPurchaseController {
         return ehsdPurchaseService.getListBySupplyId(supplyId);
     }
 
+    /**
+     * 采购合同作废
+     */
+    @PostMapping("/cancellation")
+    public void cancellation(@RequestBody BaseSelectDto dto) {
+        ehsdPurchaseService.cancellation(dto.getId());
+    }
+
 }

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

@@ -173,7 +173,7 @@ public class ContractFlow extends FlowDelegate {
      * @param submitData
      */
     @Override
-    @LogicIgnore(tableName = {""},alias = {""})
+    @LogicIgnore
     @Transactional(rollbackFor = Exception.class)
     public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
         //删除采购合同
@@ -192,13 +192,12 @@ public class ContractFlow extends FlowDelegate {
      */
     @Override
     public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
-        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
             contractService.update(q -> q
-                    .eq(Contract::getId, FlowThreadLocalUtil.getBusinessId())
+                    .eq(Contract::getId, businessId)
                     .set(Contract::getStatus, 20)//20为驳回
                     .set(Contract::getUpdateTime, new Date())
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
             );
-        }
+
     }
 }

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

@@ -13,9 +13,7 @@ import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
 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.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
@@ -33,11 +31,9 @@ import com.fjhx.sale.service.purchase.*;
 import com.fjhx.sale.service.sample.SampleProductService;
 import com.fjhx.sale.service.sample.SampleService;
 import com.ruoyi.common.annotation.LogicIgnore;
-import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
-import lombok.experimental.Delegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -160,7 +156,7 @@ public class EhsdPurchaseFlow extends FlowDelegate {
                     purchaseProductMountingsList.forEach(obj -> obj.setPurchaseProductId(id));
                     addMountingsList.addAll(purchaseProductMountingsList);
                 }
-                ObsFileUtil.saveAllFile(s.getFileList(), s.getId(),0);
+                ObsFileUtil.saveAllFile(s.getFileList(), s.getId(), 0);
 
                 if ("0".equals(purchase.getDataResource())) {
                     //计算采购数量是否大于申购数量
@@ -198,7 +194,6 @@ public class EhsdPurchaseFlow extends FlowDelegate {
     }
 
 
-
     /**
      * 公共代码块--发起
      */
@@ -220,10 +215,10 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         List<EhsdPurchaseProductMountings> addMountingsList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(purchaseProductList)) {
             for (EhsdPurchaseProduct s : purchaseProductList) {//产品
-                long id ;
-                if(ObjectUtils.isNotEmpty(s.getId())){
+                long id;
+                if (ObjectUtils.isNotEmpty(s.getId())) {
                     id = s.getId();
-                }else{
+                } else {
                     id = IdWorker.getId();
                 }
                 s.setId(id);
@@ -346,18 +341,19 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 
     /**
      * 重新发起
+     *
      * @param flowId
      * @param businessId
      * @param flowStatus
      * @param submitData
      */
     @Override
-    @LogicIgnore(tableName = {""},alias = {""})
+    @LogicIgnore
     @Transactional(rollbackFor = Exception.class)
     public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
         //删除采购合同
         EhsdPurchaseDto purchase = submitData.toJavaObject(EhsdPurchaseDto.class);
-        if(ObjectUtils.isEmpty(purchase)){
+        if (ObjectUtils.isEmpty(purchase)) {
             throw new ServiceException("采购数据不能为空");
         }
         purchase.setFlowId(flowId);
@@ -366,20 +362,19 @@ public class EhsdPurchaseFlow extends FlowDelegate {
 
     /**
      * 驳回
+     *
      * @param flowId
      * @param businessId
      * @param flowStatus
      */
     @Override
     public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
-        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
-            sampleService.update(q -> q
-                    .eq(Sample::getId, FlowThreadLocalUtil.getBusinessId())
-                    .set(Sample::getStatus, 20)//20为驳回
-                    .set(Sample::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+        sampleService.update(q -> q
+                .eq(Sample::getId, businessId)
+                .set(Sample::getStatus, 20)//20为驳回
+                .set(Sample::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 
 }

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

@@ -74,6 +74,13 @@ public class EhsdPurchaseUpdateFlow extends FlowDelegate {
         EhsdPurchaseDto purchase = submitData.toJavaObject(EhsdPurchaseDto.class);
         Assert.notEmpty(purchase.getId(), "采购合同id不能为空");
 
+        //判断合同是否在变更中，防止用户缓存导致重复变更
+        EhsdPurchase byId = ehsdPurchaseService.getById(purchase.getId());
+        Assert.notEmpty(byId, "查询不到采购信息");
+        if (byId.getStatus().equals(FlowStatusEnum1.UPDATE_LOADING.getKey())) {
+            throw new ServiceException("合同正在变更中，禁止重复变更！");
+        }
+
         //赋值原合同id
         purchase.setOldPurchaseId(purchase.getId());
 
@@ -127,7 +134,7 @@ public class EhsdPurchaseUpdateFlow extends FlowDelegate {
      * @param submitData
      */
     @Override
-    @LogicIgnore(tableName = {""},alias = {""})
+    @LogicIgnore
     @Transactional(rollbackFor = Exception.class)
     public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
         //删除采购合同
@@ -147,14 +154,12 @@ public class EhsdPurchaseUpdateFlow extends FlowDelegate {
      */
     @Override
     public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
-        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
             ehsdPurchaseService.update(q -> q
-                    .eq(EhsdPurchase::getId, FlowThreadLocalUtil.getBusinessId())
+                    .eq(EhsdPurchase::getId, businessId)
                     .set(EhsdPurchase::getStatus, 20)//20为驳回
                     .set(EhsdPurchase::getUpdateTime, new Date())
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
             );
-        }
     }
 
     /**

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

@@ -108,7 +108,7 @@ public class SaleQuotationFlow extends FlowDelegate {
      * @param submitData
      */
     @Override
-    @LogicIgnore(tableName = {""},alias = {""})
+    @LogicIgnore
     @Transactional(rollbackFor = Exception.class)
     public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
         //删除采购合同
@@ -127,14 +127,13 @@ public class SaleQuotationFlow extends FlowDelegate {
      */
     @Override
     public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
-        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
             saleQuotationService.update(q -> q
-                    .eq(SaleQuotation::getId, FlowThreadLocalUtil.getBusinessId())
+                    .eq(SaleQuotation::getId, businessId)
                     .set(SaleQuotation::getStatus, 20)//20为驳回
                     .set(SaleQuotation::getUpdateTime, new Date())
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
             );
-        }
+
     }
     /**
      * 结束流程

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

@@ -94,7 +94,7 @@ public class SampleFlow extends FlowDelegate {
      * @param submitData
      */
     @Override
-    @LogicIgnore(tableName = {""},alias = {""})
+    @LogicIgnore
     @Transactional(rollbackFor = Exception.class)
     public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
         //删除采购合同
@@ -113,14 +113,13 @@ public class SampleFlow extends FlowDelegate {
      */
     @Override
     public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
-        if (HandleTypeEnum.REJECT.equals(FlowThreadLocalUtil.getHandleTypeEnum())) {
             sampleService.update(q -> q
-                    .eq(Sample::getId, FlowThreadLocalUtil.getBusinessId())
+                    .eq(Sample::getId,businessId)
                     .set(Sample::getStatus, 20)//20为驳回
                     .set(Sample::getUpdateTime, new Date())
                     .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
             );
-        }
+
     }
 
     public Long start(SampleDto sample){

hx-sale/src/main/java/com/fjhx/sale/service/purchase/EhsdPurchaseService.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.service.purchase;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.pay.vo.PayVo;
 import com.fjhx.sale.entity.purchase.dto.EhsdPurchaseDto;
@@ -52,6 +53,11 @@ public interface EhsdPurchaseService extends BaseService<EhsdPurchase> {
     void delete(Long id);
 
     /**
+     * 采购合同作废
+     */
+    void cancellation(Long id);
+
+    /**
      * 根据供应商查询无发票的采购合同
      */
     List<EhsdPurchaseVo> getListBySupplyId(String supplyId);

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,6 +17,7 @@ import com.fjhx.common.entity.documentary.bo.DocumentaryData;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -51,9 +53,11 @@ import com.fjhx.sale.service.purchase.*;
 import com.fjhx.sale.service.sample.SampleProductService;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -63,10 +67,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -382,6 +383,50 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
     }
 
     /**
+     * 采购合同作废
+     */
+    @DSTransactional
+    @Override
+    public void cancellation(Long id) {
+        EhsdPurchase purchase = getById(id);
+        Assert.notEmpty(purchase, "查询不到采购信息");
+        if (ObjectUtil.isNotEmpty(purchase) && purchase.getPayStatus() != 0) {
+            throw new ServiceException("采购合同已付款，禁止作废");
+        }
+        purchase.setStatus(FlowStatusEnum1.CANCELLATION.getKey());
+        this.updateById(purchase);
+        List<EhsdPurchaseProduct> list = ehsdPurchaseProductService.list(q -> q.eq(EhsdPurchaseProduct::getPurchaseId, id));
+        if (ObjectUtils.isEmpty(list)) {
+            return;
+        }
+        //回滚待采购数量
+        for (EhsdPurchaseProduct ehsdPurchaseProduct : list) {
+            Long dataResourceId = ehsdPurchaseProduct.getDataResourceId();
+            BigDecimal purchaseQuantity = ehsdPurchaseProduct.getQuantity();
+
+            //合同来源
+            if (ehsdPurchaseProduct.getDataResource() == 1) {
+                contractProductService.update(q -> q
+                        .eq(ContractProduct::getId, dataResourceId)
+                        .setSql("expend_quantity = expend_quantity + " + purchaseQuantity)
+                        .set(BasePo::getUpdateTime, new Date())
+                        .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                );
+            }
+
+            //样品单来源
+            if (ehsdPurchaseProduct.getDataResource() == 1) {
+                sampleProductService.update(q -> q
+                        .eq(SampleProduct::getId, dataResourceId)
+                        .setSql("expend_quantity = expend_quantity + " + purchaseQuantity)
+                        .set(BasePo::getUpdateTime, new Date())
+                        .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+                );
+            }
+        }
+    }
+
+    /**
      * 根据供应商(卖方)查询无发票的采购合同
      */
     @Override

hx-sale/src/main/java/com/fjhx/sale/service/quality/impl/EhsdQualityServiceImpl.java

@@ -100,7 +100,7 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
      * @param ehsdQualityDto
      */
     @Override
-    @LogicIgnore(tableName = {""},alias = {""})
+    @LogicIgnore
     @DSTransactional
     public void submit(EhsdQualityDto ehsdQualityDto) {
         if(ObjectUtils.isEmpty(ehsdQualityDto.getId())){//添加

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -139,8 +139,8 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             List<Long> customerIds = customerService.listObject(Customer::getId, q -> q.like(Customer::getName, dto.getKeyword()));
             wrapper.and(q -> q
-                    .like("t1", Sample::getCode, dto.getKeyword())
-                    .like("t1", Sample::getUserName, dto.getKeyword())
+                    .or().like("t1", Sample::getCode, dto.getKeyword())
+                    .or().like("t1", Sample::getUserName, dto.getKeyword())
                     .or().in("t1", Sample::getBuyCorporationId, customerIds)
             );
         }