diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index c28b16f3f8..4fa9c037aa 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -996,7 +996,8 @@ public class BusSalesOrderService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 updateFlowFiled(map); + BusSalesOrder busSalesOrder1 = fetchBySid(query.getBusinessSid()); + String procId1 = busSalesOrder1.getProcInstId(); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId1); + String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getStaffSid())) { + ResultBean details = getSaleOrderDetails(query.getBusinessSid()); + AppOrderDetailsVo vo = details.getData(); + if ("现车".equals(vo.getOrderType())) { + //更新已选择的车架号的状态为未锁定 + List list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid()); + BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); + busMainDepositUpdateQuery.setVinSidList(list); + busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode()); + busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks()); + baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); + } + } try { ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() .setNameFormat("demo-pool-%d").build(); @@ -1187,10 +1207,10 @@ public class BusSalesOrderService extends MybatisBaseService) variables.get("app")); messageFlowableQuery.setBusinessSid(query.getBusinessSid()); messageFlowableQuery.setModuleName("销售订单申请"); - ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.get().getStaffSid())) { + ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(procId); + String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); + List receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); + if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getStaffSid())) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); @@ -1199,7 +1219,7 @@ public class BusSalesOrderService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); }); - Future future2 = pool.submit(() -> { + /*Future future2 = pool.submit(() -> { ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); @@ -1216,7 +1236,7 @@ public class BusSalesOrderService extends MybatisBaseService