更改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -88,6 +88,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1050,7 +1051,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             return rb.setMsg("参数错误：userSid");
         }
         BaseAccadjApply baseAccadjApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = baseAccadjApply.getTaskId();
         List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+        if (StringUtils.isNotBlank(businessTaskId)) {
             if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
@@ -1064,9 +1067,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0");
                 }
                 return rb.success().setData(resultBean.getData());
-        }
-        String businessTaskId = baseAccadjApply.getTaskId();
-        if (StringUtils.isNotBlank(businessTaskId)) {
+            } else {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -1082,6 +1083,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     return rb.success().setData(resultBean.getData());
                 }
             }
+        }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -940,6 +940,24 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         BaseInternalPurchase baseInternalPurchase = fetchBySid(query.getBusinessSid());
         String businessTaskId = baseInternalPurchase.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
+            if (query.getUserSid().equals(baseInternalPurchase.getCreateBySid())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
+                for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
+                    BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid());
+                    baseVehicle.setVinNo(baseInternalPurchaseVehicleVo.getVinNo());
+                    baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+                    baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+                    baseVehicleService.updateVeh(baseVehicle);
+                }
+                return rb.success().setData(resultBean.getData());
+            } else {
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -959,6 +977,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     return rb.success().setData(resultBean.getData());
                 }
             }
+        }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }