diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 018357a735..1060a2b321 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/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; @@ -481,21 +482,21 @@ public class BaseAccadjApplyService extends MybatisBaseService flowList = flowRecordVo.getFlowList(); for (FlowTask flowTask : flowList) { - if (flowTask.getTaskName().equals("发起方分公司会计主管审批")){ + if (flowTask.getTaskName().equals("发起方分公司会计主管审批")) { confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); } } - }else if (baseAccadjApply.getAccadjTypeValue().equals("调出")){ + } else if (baseAccadjApply.getAccadjTypeValue().equals("调出")) { FlowRecordVo flowRecordVo = flowTaskFeign.businessFlowRecord(bv.getInstanceId()).getData(); List flowList = flowRecordVo.getFlowList(); for (FlowTask flowTask : flowList) { - if (flowTask.getTaskName().equals("应对方分公司会计主管审批")){ + if (flowTask.getTaskName().equals("应对方分公司会计主管审批")) { confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); @@ -1050,24 +1051,10 @@ public class BaseAccadjApplyService extends MybatisBaseService purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); - if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) { - FlowTaskVo flowTaskVo = new FlowTaskVo(); - BeanUtil.copyProperties(query, flowTaskVo); - ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - Map map = BeanUtil.beanToMap(resultBean.getData()); - updateFlowFiled(map); - for (String purchaseSid : purchaseSids) { - baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0"); - } - return rb.success().setData(resultBean.getData()); - } String businessTaskId = baseAccadjApply.getTaskId(); + List purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); if (StringUtils.isNotBlank(businessTaskId)) { - if (businessTaskId.equals(query.getTaskId())) { + if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) { FlowTaskVo flowTaskVo = new FlowTaskVo(); BeanUtil.copyProperties(query, flowTaskVo); ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -1080,6 +1067,21 @@ public class BaseAccadjApplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + for (String purchaseSid : purchaseSids) { + baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0"); + } + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index f4ee8c02e3..53267796d3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -940,7 +940,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -957,6 +957,25 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + List 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()); + } } } return rb.setMsg("操作失败!提交的数据不一致!");