Merge remote-tracking branch 'origin/master'

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

@@ -298,6 +298,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         ResultBean rb = ResultBean.fireFail();
         //获取调车车辆信息
         List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
+        for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
+            BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), dto.getCreateOrgSid());
+            if (baseVehicle.getVehicleState().equals("0009")){
+                return rb.setMsg("选择的车架号为" + baseVehicle.getVinNo() + "的车辆已在审批过程中，请重新选择");
+            }
+        }
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
         if (!userVoResultBean.getSuccess()) {
@@ -744,7 +750,13 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
-
+                String nodeState = map.get("nodeState").toString();
+                if (nodeState.equals("调车申请")){
+                    List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
+                    for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
+                        baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(),VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(),baseInternalPurchase.getCreateOrgSid());
+                    }
+                }
                 //极光推送
                 UpdateFlowFieldVo ufVo = resultBean.getData();
                 String businessSid = query.getBusinessSid();