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 44a0959c5b..d488fd1ccc 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
@@ -55,6 +55,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
@@ -76,6 +77,9 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -122,6 +126,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     private BaseVehmodelConfigService baseVehmodelConfigService;
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
+    @Autowired
+    private MessageFeign messageFeign;
 
     private QueryWrapper<BaseInternalPurchase> createQueryWrapper(BaseInternalPurchaseQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -199,6 +205,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
+        if (baseInternalPurchaseVehicles.size() < 1) {
+            return rb.setMsg("请选择调车申请车辆");
+        }
         if (StringUtils.isBlank(dtoSid)) {//新增
             if (StringUtils.isBlank(dto.getShuntingTypeKey())) {
                 return rb.setMsg("调车类型不能为空");
@@ -315,9 +324,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
         //=====================添加app所需参数
-        Map<String,Object> appMap = new HashMap<>();
-        appMap.put("sid",businessSid);
-        variables.put("app",appMap);
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -342,6 +351,19 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     baseVehicleService.updateVeh(baseVehicle);
                 }
             }
+            //=======================消息推送开始
+             baseInternalPurchase = fetchBySid(businessSid);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("分公司间调车申请");
+            messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            //=======================消息推送结束
 
             return voResultBean;
         }
@@ -437,6 +459,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             }
         }
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
+            Map<String,Object> variables = new HashMap<>();
+            Map<String,Object> appMap = new HashMap<>();
+            appMap.put("sid",bv.getBusinessSid());
+            variables.put("app",appMap);
+            bv.setFormVariables(variables);
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -503,6 +530,21 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                         }
                     }
                 }
+            }else{
+                //极光推送
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                baseInternalPurchase = fetchBySid(bv.getBusinessSid());
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                messageFlowableQuery.setModuleName("分公司间调车申请");
+                messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -561,11 +603,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             bv.setNextNodeUserSids(substring);
         }
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
+            Map<String,Object> variables = new HashMap<>();
+            Map<String,Object> appMap = new HashMap<>();
+            appMap.put("sid",bv.getBusinessSid());
+            variables.put("app",appMap);
+            bv.setFormVariables(variables);
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            //极光推送
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            baseInternalPurchase = fetchBySid(bv.getBusinessSid());
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+            messageFlowableQuery.setModuleName("分公司间调车申请");
+            messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
@@ -595,11 +656,30 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
         bv.setNextNodeUserSids(substring);
         if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
+            Map<String,Object> variables = new HashMap<>();
+            Map<String,Object> appMap = new HashMap<>();
+            appMap.put("sid",bv.getBusinessSid());
+            variables.put("app",appMap);
+            bv.setFormVariables(variables);
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
             if (!resultBean1.getSuccess()) {
                 return rb.setMsg(resultBean1.getMsg());
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
+            //极光推送
+            UpdateFlowFieldVo ufVo = resultBean1.getData();
+            baseInternalPurchase = fetchBySid(bv.getBusinessSid());
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            ufVo.setProcInsId(baseInternalPurchase.getProcInstId());
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+            messageFlowableQuery.setModuleName("分公司间调车申请");
+            messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return rb.success().setData(resultBean1.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
@@ -641,6 +721,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             if (businessTaskId.equals(query.getTaskId())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
+                Map<String,Object> appMap = new HashMap<>();
+                appMap.put("sid",query.getBusinessSid());
+                flowTaskVo.getValues().put("app",appMap);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
@@ -648,6 +731,31 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+
+                //极光推送
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                String businessSid = query.getBusinessSid();
+                baseInternalPurchase = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                String procId = baseInternalPurchase.getProcInstId();
+                ufVo.setProcInsId(procId);
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("分公司间调车申请");
+                ResultBean<List<LatestTaskVo>>  listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseInternalPurchase.getCreateBySid())){
+                    messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
+                }else{
+                    messageFlowableQuery.setMsgContent(baseInternalPurchase.getApplyPeoName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                }
+
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
                 return rb.success();
             }
         }
@@ -729,9 +837,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 Map<String, Object> map = new HashMap<>();
                 map.put("modelSid", modelSid);
                 map.put("configSid", configSid);
-                map.put("selectType",0);
+                map.put("selectType", 0);
                 appSubVersionVo.setJson(JSONObject.toJSONString(map));
-                BeanUtil.copyProperties(appSubVersionVo,appVehicleVersionVo);
+                BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
                 appCompanyShuntingListVo.setCarDetailPage(appVehicleVersionVo);
                 appCompanyShuntingListVo.setEditVin("调入".equals(vo.getShuntingTypeValue()));
                 appCompanyShuntingListVo.setEditPrice("调出".equals(vo.getShuntingTypeValue()));
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
index a889a71c0f..f8b390ec43 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
@@ -58,9 +58,7 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.message.MessageFlowableDto;
-import com.yxt.messagecenter.api.message.MessageJsonDto;
+import com.yxt.messagecenter.api.message.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -232,7 +230,17 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
             baseModelModprice = fetchBySid(businessSid);
-            String msgSid = getMessage(ufVo, appMap, baseModelModprice);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("车型调价申请");
+            messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(ufVo, appMap, baseModelModprice);
             return voResultBean;
         }
         if (r == 2) {
@@ -313,13 +321,25 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                     if (baseVehmodelConfig == null) {
                         return rb.setMsg("车型配置不存在");
                     }
-                    baseVehmodelConfigMapper.updateGuidedPrice(guidedPrice,manufactorSettlementPrice,baseVehmodelConfig.getSid());
+                    baseVehmodelConfigMapper.updateGuidedPrice(guidedPrice, manufactorSettlementPrice, baseVehmodelConfig.getSid());
                 }
-            }else{
+            } else {
                 //极光推送
                 UpdateFlowFieldVo ufVo = resultBean.getData();
                 baseModelModprice = fetchBySid(businessSid);
-                String msgSid = getMessage(ufVo, appMap, baseModelModprice);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                ufVo.setProcInsId(baseModelModprice.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                messageFlowableQuery.setModuleName("车型调价申请");
+                messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+
+//                String msgSid = getMessage(ufVo, appMap, baseModelModprice);
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -379,7 +399,26 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 //极光推送
                 UpdateFlowFieldVo ufVo = resultBean.getData();
                 baseModelModprice = fetchBySid(businessSid);
-                String msgSid = getMessage(ufVo, appMap, baseModelModprice);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                String procId = baseModelModprice.getProcInstId();
+                ufVo.setProcInsId(procId);
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(query.getBusinessSid());
+                messageFlowableQuery.setModuleName("车型调价申请");
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseModelModprice.getCreateBySid())) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                }
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//                String msgSid = getMessage(ufVo, appMap, baseModelModprice);
                 return rb.success();
             }
         }
@@ -443,7 +482,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BaseModelModprice baseModelModprice) {
         //=====极光推送信息========================================参数组装
         String procId = baseModelModprice.getProcInstId();
-        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
         String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index 1887b8a8f1..f86c058443 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -54,7 +54,6 @@ import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign;
-import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
@@ -80,8 +79,8 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.message.MessageFlowableDto;
-import com.yxt.messagecenter.api.message.MessageJsonDto;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -151,9 +150,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         if (StringUtils.isNotBlank(query.getModelName())) {
             qw.like("modelName", query.getModelName());
         }
-        qw.eq("useOrgSid", query.getUseOrgSid());
+        //qw.eq("useOrgSid", query.getUseOrgSid());
         qw.eq("createBySid", query.getUserSid());
-//		qw.eq("createBySid",query.getUserSid());
         return qw;
     }
 
@@ -391,10 +389,20 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
-            BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
             //======================添加消息推送开始
+            BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(uff,messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("外采申请");
+            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             //极光推送
-            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
+//            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return resultBean1;
         }
@@ -429,8 +437,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(BeanUtil.beanToMap(uff));
             //======================添加消息推送开始
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
-            //极光推送
-            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(uff,messageFlowVo);
+            uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("外采申请");
+            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return resultBean1;
         } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
@@ -443,8 +461,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(stringObjectMap);
             //======================添加消息推送开始
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
-            //极光推送
-            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(uff,messageFlowVo);
+            uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("外采申请");
+            messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return rb;
         } else {
@@ -488,7 +516,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(stringObjectMap);
             if ("Event_end".equals(taskDefKey)) {
                 BigDecimal deposit = booad.getDeposit();
-                if ("是".equals(booad.getIsBeforePayment())) {
+                if ("1".equals(booad.getIsBeforePayment())) {
                     ThreadUtil.execute(() -> sendFinPaymentrecord(bv, booad, ManPurOrderType.CostTitle.CK_COSTTITLE.getCode(), ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks()));
                 } else {
                     if (deposit != null) {
@@ -520,8 +548,18 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                 //======================添加消息推送开始
                 UpdateFlowFieldVo uff = rb.getData();
                 BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
-                //极光推送
-                String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(uff,messageFlowVo);
+                uff.setProcInsId(baseOutsourcingApplication.getProcInstSid());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                messageFlowableQuery.setModuleName("外采申请");
+                messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//                String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
                 //======================添加消息推送结束
             }
 
@@ -701,8 +739,27 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             updateFlowFiled(stringObjectMap);
             //======================添加消息推送开始
             BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(flowTaskVo.getBusinessSid());
-            //极光推送
-            String msgSid = getMessage(data, appMap, baseOutsourcingApplication);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(data,messageFlowVo);
+            String procId = baseOutsourcingApplication.getProcInstSid();
+            data.setProcInsId(procId);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
+            messageFlowableQuery.setModuleName("外采申请");
+            ResultBean<List<LatestTaskVo>>  listResultBean = flowTaskFeign.getLatestTasks(procId);
+            String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+            List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+            if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseOutsourcingApplication.getCreateBySid())){
+                messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
+            }else{
+                messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            }
+
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(data, appMap, baseOutsourcingApplication);
             //======================添加消息推送结束
             return resultBean;
         } else {
@@ -800,55 +857,4 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         vo.setImages(stringList);
         return rb.success().setData(vo);
     }
-
-    /**
-     * 消息推送
-     * @param ufVo
-     * @param appMap
-     * @param baseOutsourcingApplication
-     * @return
-     */
-    public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BaseOutsourcingApplication baseOutsourcingApplication) {
-        //=====极光推送信息========================================参数组装
-        String procId = baseOutsourcingApplication.getProcInstSid();
-        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
-        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
-        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-        //根据用户的sid查询用户的id
-        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
-        List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
-        MessageFlowableDto messageFlowableDto = new MessageFlowableDto();
-        MessageJsonDto messageJsonDto = new MessageJsonDto();
-        BeanUtil.copyProperties(ufVo, messageJsonDto);
-        //查询流程审批的页面操作地址组装json的参数
-        //根据taskDef和移动端标识
-        ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId(), ufVo.getTaskDefKey(), "1", "2");
-        SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
-        messageFlowableDto.setBusinessSid(baseOutsourcingApplication.getSid());
-        messageFlowableDto.setApp_type("2");
-        if (sysProUrlVo.getUrl().contains("#")) {
-            messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
-            List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
-            int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
-            messageJsonDto.setButtons(ints);
-        } else {
-            messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
-        }
-        messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
-        messageJsonDto.setTaskName(ufVo.getNodeState());
-        messageJsonDto.setProcInsId(ufVo.getProcInsId());
-        messageJsonDto.setAppMap(appMap);
-        messageFlowableDto.setJson(messageJsonDto);
-        messageFlowableDto.setList(receiveSidList);
-        messageFlowableDto.setReceiveIdList(reveiveIdList);
-        messageFlowableDto.setModuleName("外采申请");
-        messageFlowableDto.setMsgContent("外采申请");
-        messageFlowableDto.setMsgTitle("外采申请");
-        messageFlowableDto.setCreateName(baseOutsourcingApplication.getCreateByName());
-        messageFlowableDto.setTaskId(ufVo.getTaskId());
-        ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
-        String msgSid = stringResultBean.getData();
-        return msgSid;
-
-    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
index 24fdee954b..70850b6d79 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
@@ -446,5 +446,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
     IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-
+    @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue} where vinNo = #{vinNo}")
+    void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("vinNo") String vinNo);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 8b88d764ba..21a713e3b1 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1001,21 +1001,13 @@
 
     <select id="vehiclePurchasePageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehiclePurchaseVo">
         SELECT bv.sid,
-        <!--品牌名称-->
         bvm.brandName,
-        <!--车型名称-->
         bvm.vehicleAlias,
-        <!--车型sid-->
         bvm.sid as modelSid,
-        <!--车架号-->
         bv.vinNo,
-        <!--颜色-->
         bmc.carColor color,
-        <!--存放地点-->
         bv.locationName location,
-        <!--存放地点sid-->
         bv.location locationSid,
-        <!--销售指导价-->
         bvc.guidedPrice,
         bmc.configName,
         bmc.sid as configSid,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index a8ee343fdd..9e109a0bca 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -1240,7 +1240,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public PagerVo<BaseVehiclePurchaseVo> vehiclePurchaseList(PagerQuery<BaseVehiclePurchaseQuery> pagerQuery) {
         IPage<BaseVehiclePurchaseVo> page = vehiclePurchasePageList(pagerQuery);
-        List<BaseVehiclePurchaseVo> records = page.getRecords();
+        /*List<BaseVehiclePurchaseVo> records = page.getRecords();
         for (BaseVehiclePurchaseVo record : records) {
             String configSid = record.getConfigSid();
             String modelSid = record.getModelSid();
@@ -1257,8 +1257,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             } else {
                 record.setGuidedPrice("");
             }
-
-        }
+        }*/
         PagerVo<BaseVehiclePurchaseVo> pv = new PagerVo<>();
         PagerVo<BaseVehiclePurchaseVo> pv1 = PagerUtil.pageToVo(page, pv);
         return pv1;
@@ -1955,7 +1954,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
 
         //调出分公司车辆台账更新库存状态
-        baseMapper.updateVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(),VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getVinNo(),baseVehicle.getUseOrgSid());
+        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(),VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getVinNo());
 
         //新建调入分公司车辆台账，设置调入分公司sid
         BaseVehicle new_baseVehicle = new BaseVehicle();
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index 7976fb8bbe..2a3ddfd618 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -36,9 +36,7 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.message.MessageFlowableDto;
-import com.yxt.messagecenter.api.message.MessageJsonDto;
+import com.yxt.messagecenter.api.message.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -320,7 +318,17 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             }
             //极光推送
             baseVehicleActualSales = fetchBySid(businessSid);
-            String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo,messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("未售买断申请");
+            messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
             return voResultBean;
         }
         if (r == 2) {
@@ -387,7 +395,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if(!"Event_end".equals(ufVo.getTaskDefKey())){
                 //极光推送
                 baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
-                String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                ufVo.setProcInsId(baseVehicleActualSales.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                messageFlowableQuery.setModuleName("未售买断申请");
+                messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//                String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
             }
 
             return rb.success().setData(resultBean.getData());
@@ -480,7 +499,27 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 updateFlowFiled(map);
                 //极光推送
                 baseVehicleActualSales = fetchBySid(query.getBusinessSid());
-                String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo,messageFlowVo);
+                String procId = baseVehicleActualSales.getProcInstId();
+                ufVo.setProcInsId(procId);
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(query.getBusinessSid());
+                messageFlowableQuery.setModuleName("未售买断申请");
+                ResultBean<List<LatestTaskVo>>  listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+                if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())){
+                    messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交");
+                }else{
+                    messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
+                }
+
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//                String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
                 return rb.success();
             }
         }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index ed42f74556..8eb2af49a5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -532,7 +532,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             } else {
                 //极光推送
                 busVehicleApply = fetchBySid(businessSid);
-                ufVo.setProcInsId(busVehicleApply.getProcInstId());
                 MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                 MessageFlowVo messageFlowVo = new MessageFlowVo();
                 BeanUtil.copyProperties(ufVo,messageFlowVo);
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java
index 2d63d5ad52..4a5966bd60 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineInfoVo.java
@@ -4,7 +4,6 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,4 +67,6 @@ public class AppScmVehicleExamineInfoVo implements Vo {
     @ApiModelProperty(value = "厂家入库日期")
     private String inboundDate;
 
+    private AppScmVehicleVersionVo carDetailPage;
+
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java
new file mode 100644
index 0000000000..f74b3d4002
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleVersionVo.java
@@ -0,0 +1,32 @@
+package com.yxt.anrui.scm.api.scmvehicleexamine;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/29 9:22
+ * @Description
+ */
+@Data
+public class AppScmVehicleVersionVo implements Vo {
+    private static final long serialVersionUID = -4041552955974494273L;
+
+    @ApiModelProperty("版本编码")
+    private Integer moduleVersion;
+
+    @ApiModelProperty("apk下载地址")
+    private String path;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
+
+    private String json;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
index c191945d6f..4fc429e4b1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
@@ -68,6 +68,11 @@ public interface ScmVehRebateFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
 
+    @ApiOperation("单车返利核对申请选择单车返利信息")
+    @PostMapping("/checkApplyGetVehRebate")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
+
     @ApiOperation("新增")
     @PostMapping("/save")
     @ResponseBody
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
index a6e8c16a65..a90df51409 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
@@ -59,6 +59,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(ScmVehRebateDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/save无法访问");
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
index 890375cf62..e51fbd2d24 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
@@ -57,7 +57,7 @@ public class ScmVehRebateVo implements Vo {
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime; // 创建日期
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态（0未提计，1已提计，2待核对，3已核对）")
     private String state; // 状态
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java
index 5aa45acf29..4de0a73cfb 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java
@@ -56,6 +56,8 @@ public class ScmVehRebateWithApply extends BaseEntity {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
index b04e9d0ec3..d6cc3fe478 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
@@ -55,6 +55,8 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("申请人sid")
+    private String createBySid; // 申请人sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
 	@ApiModelProperty("品牌sid")
@@ -63,6 +65,8 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
index da79650848..a2ef0a493c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
@@ -62,6 +62,8 @@ public class ScmVehRebateWithApplyDto implements Dto {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
     @ApiModelProperty("创建人sid")
     private String createBySid; // 创建人sid
 	@ApiModelProperty("创建人姓名")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
index 6e32976b85..69334686d0 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
@@ -63,6 +63,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")
@@ -75,4 +77,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("流程状态")
     private String nodeState;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index aaaa68e6ea..2f12b9625c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -506,7 +506,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos);
                     ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);
                 } catch (Exception e) {
-                    return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:" + scmApplyInbound.getSid());
+                    //return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:" + scmApplyInbound.getSid());
                 }
             }
             return rb.success().setData(resultBean.getData());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
index 3b6e5a65a7..597a5b460f 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java
@@ -391,6 +391,10 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     }
                     baseVehicleDto.setCostPrice(Integer.valueOf(vehicleDetailsVo.getWitPinMoney()));
                     baseVehicleDto.setVinNo(vehicleEnterlibrary.getVin());
+                    baseVehicleDto.setModelSid(scmVehicleEnterlibrary.getModelSid());//车型sid
+                    baseVehicleDto.setModelName(scmVehicleEnterlibrary.getModelName());//车型名称
+                    baseVehicleDto.setConfigName(scmVehicleEnterlibrary.getConfigName());//配置名称
+                    baseVehicleDto.setModelConfigSid(scmVehicleEnterlibrary.getConfigSid());//配置sid
                     baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
                     baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName());
                     baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid());
@@ -398,6 +402,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setLocation(scmVehicleEnterlibrary.getLocationSid());
                     baseVehicleDto.setLocationName(scmVehicleEnterlibrary.getLocation());
                     baseVehicleDto.setArrivalDate(scmVehicleEnterlibrary.getInboundDate());
+                    baseVehicleDto.setPriceDate(scmVehicleEnterlibrary.getInboundFactoryDate());
+                    baseVehicleDto.setWarrantyCardNo(scmVehicleEnterlibrary.getWarrantyCardNo());// 保修卡号 验车
+                    baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.TC_SAVEVEH.getCode());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
index f3c9a42f90..bfc55bd077 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@@ -26,17 +26,19 @@
 package com.yxt.anrui.scm.biz.scmvehicleexamine;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
+import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
@@ -60,11 +62,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Project: scm(scm) <br/>
@@ -111,6 +110,8 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
 
     @Autowired
     BaseOutsourcingApplicationFeign baseOutsourcingApplicationFeign;
+    @Autowired
+    private AppSubsetVersionFeign appSubsetVersionFeign;
 
 
     private QueryWrapper<ScmVehicleExamine> createQueryWrapper(ScmVehicleExamineQuery query) {
@@ -282,6 +283,21 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
         } else {
             vo.setEditVin(false);
         }
+        //添加车型相关开始
+        ResultBean<AppSubVersionVo> resultBean = appSubsetVersionFeign.selectLast();
+        AppSubVersionVo appSubVersionVo = resultBean.getData();
+        AppScmVehicleVersionVo appVehicleVersionVo = new AppScmVehicleVersionVo();
+        String modelSid = vo.getModelSid();
+        String configSid = vo.getConfigSid();
+        Map<String, Object> map = new HashMap<>();
+        map.put("modelSid", modelSid);
+        map.put("configSid", configSid);
+        map.put("selectType", 0);
+        appSubVersionVo.setJson(JSONObject.toJSONString(map));
+        BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
+        vo.setCarDetailPage(appVehicleVersionVo);
+        //添加车型相关结束
+
         List<ScmVehinspectItemVo> scmVehinspectItemVos = scmVehinspectItemService.selInfoByVehInspectSid(inspectedSid);
         List<AppScmInspectionItemVo> inspectionItemVos = new ArrayList<>();
         for (ScmVehinspectItemVo scmVehinspectItemVo : scmVehinspectItemVos) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index d6430b9652..61758537a8 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -661,7 +661,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
-            messageFlowableQuery.setModuleName("移位变更申请");
+            messageFlowableQuery.setModuleName("存放地点变更申请");
             messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("供应链");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
@@ -765,7 +765,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
-                messageFlowableQuery.setModuleName("移位变更申请");
+                messageFlowableQuery.setModuleName("存放地点变更申请");
                 messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
@@ -863,7 +863,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(query.getBusinessSid());
-                messageFlowableQuery.setModuleName("移位变更申请");
+                messageFlowableQuery.setModuleName("存放地点变更申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
index 46466074a2..59db4d1387 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
@@ -47,9 +47,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.MessageFeign;
-import com.yxt.messagecenter.api.message.MessageFlowableDto;
-import com.yxt.messagecenter.api.message.MessageJsonDto;
+import com.yxt.messagecenter.api.message.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -255,9 +253,22 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery);*/
             baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.UPDATE_VEHICLE.getCode());
 
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
             ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
-            String msgSid = getMessage(uff, appMap, scmVehicleReturn);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("采购退库申请");
+            messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(uff, appMap, scmVehicleReturn);
             return resultBean1;
         }
         return submitBusinessData(scmVehicleReturnDto, busSid, orgSidPath, variables);
@@ -296,10 +307,22 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             baseVehicleUpdateQuery.setVehicleState("0003");
             baseVehicleUpdateQuery.setVihicleStateValue("采购退库中");
             baseVehicleFeign.updateByVinNo(baseVehicleUpdateQuery);
-
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
             ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
-            String msgSid = getMessage(uff, appMap, scmVehicleReturn);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("采购退库申请");
+            messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+//            String msgSid = getMessage(uff, appMap, scmVehicleReturn);
             return resultBean1;
         } else if (org.apache.commons.lang3.StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
             saveOrUpdateVehicleReturn(dto);//update
@@ -340,9 +363,9 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         String businessTaskid = booad.getTaskId();
         String businessSid = bv.getBusinessSid();
         if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
-            Map<String,Object> appMap = new HashMap<>();
-            appMap.put("sid",businessSid);
-            bv.getFormVariables().put("app",appMap);
+            Map<String, Object> appMap = new HashMap<>();
+            appMap.put("sid", businessSid);
+            bv.getFormVariables().put("app", appMap);
             ResultBean<UpdateFlowFieldVo> rb1 = flowableFeign.handleProsess(bv);
             if (!rb1.getSuccess()) {
                 return rb.setMsg(rb1.getMsg());
@@ -387,11 +410,24 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
                 brd.setBaseManufacturerRetwareVehs(baseManufacturerRetwareVehs);//aseManufacturerRetwareVehs;
                 brd.setApplyName(sysUserResultBean.getData().getName());
                 baseManufacturerRetwareFeign.save(brd);
-            }else{
+            } else {
                 //极光推送
                 UpdateFlowFieldVo uff = rb1.getData();
                 ScmVehicleReturn scmVehicleReturn = fetchBySid(businessSid);
-                String msgSid = getMessage(uff, appMap, scmVehicleReturn);
+                uff.setProcInsId(scmVehicleReturn.getInstanceId());
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(uff, messageFlowVo);
+                uff.setProcInsId(scmVehicleReturn.getInstanceId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                messageFlowableQuery.setModuleName("采购退库申请");
+                messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("供应链");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+
+//                String msgSid = getMessage(uff, appMap, scmVehicleReturn);
             }
             return rb1;
         } else {
@@ -680,9 +716,9 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
             BeanUtil.copyProperties(flowTaskVo, fl);
             ScmVehicleReturnDto boad = baseMapper.getBySid(flowTaskVo.getBusinessSid());
-            Map<String,Object> appMap = new HashMap<>();
-            appMap.put("sid",flowTaskVo.getBusinessSid());
-            fl.getValues().put("app",appMap);
+            Map<String, Object> appMap = new HashMap<>();
+            appMap.put("sid", flowTaskVo.getBusinessSid());
+            fl.getValues().put("app", appMap);
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(fl);
             UpdateFlowFieldVo data = resultBean.getData();
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(resultBean.getData());
@@ -694,6 +730,26 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
             //极光推送
             UpdateFlowFieldVo uff = resultBean.getData();
             ScmVehicleReturn scmVehicleReturn = fetchBySid(flowTaskVo.getBusinessSid());
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(uff, messageFlowVo);
+            String procId = scmVehicleReturn.getInstanceId();
+            uff.setProcInsId(procId);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(flowTaskVo.getBusinessSid());
+            messageFlowableQuery.setModuleName("采购退库申请");
+            ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+            String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+            List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+            if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(scmVehicleReturn.getCreateBySid())) {
+                messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+            } else {
+                messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            }
+            messageFlowableQuery.setMsgTitle("供应链");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+
             String msgSid = getMessage(uff, appMap, scmVehicleReturn);
             return resultBean;
         } else {
@@ -704,7 +760,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
     public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, ScmVehicleReturn scmVehicleReturn) {
         //=====极光推送信息========================================参数组装
         String procId = scmVehicleReturn.getInstanceId();
-        ResultBean<List<LatestTaskVo>>  resultBean = flowTaskFeign.getLatestTasks(procId);
+        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
         String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
         //根据用户的sid查询用户的id
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
index b3ad11da68..03f23cf6cb 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
@@ -73,6 +73,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
 		return rb.success().setData(pv);
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehRebateVo> pv = scmVehRebateService.checkApplyGetVehRebate(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	public ResultBean save(@RequestBody ScmVehRebateDto dto){
 		return scmVehRebateService.saveAll(dto);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
index 9b7697831e..42a42f3ab1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
@@ -129,6 +129,40 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return p;
     }
 
+    public PagerVo<ScmVehRebateVo> checkApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+        ScmVehRebateQuery query = pq.getParams();
+        QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.like("vehModelName", query.getVehModelName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getRebateName())) {
+            qw.like("rebateName", query.getRebateName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("createOrgSid",query.getCreateOrgSid());
+        qw.eq("state", 2);
+        if (query.getSidList().size() > 0) {
+            qw.notIn("sid", query.getSidList());
+        }
+        IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public void insertByDto(ScmVehRebateDto dto) {
         ScmVehRebate entity = new ScmVehRebate();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -167,5 +201,4 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         return rb.success().setMsg("保存成功");
     }
-
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java
index 27c00f80d9..3797d18ff2 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/companyShunting/flowable/CompanyShuntingDto.java
@@ -1,13 +1,11 @@
 package com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.List;
 
 /**
  * @Author dimengzhe
@@ -37,7 +35,9 @@ public class CompanyShuntingDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
-    private List<CompanyShuntingList> json;
+//    private List<CompanyShuntingList> json;
+
+    private String json;
 
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java
index ae7c22964e..df3c293900 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java
@@ -49,7 +49,6 @@ public class AppScmVehiclePatrolinVo implements Vo {
     @ApiModelProperty(value = "定位地址")
     private String address;
 
-    @ApiModelProperty(value = "定位地址")
-    @JsonProperty("location")
+    @ApiModelProperty(value = "定位经纬度")
     private String addressCode;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java
index 9d808d45e7..ac849fe1d3 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineInfoVo.java
@@ -67,4 +67,6 @@ public class AppExamineInfoVo implements Vo {
     @ApiModelProperty(value = "厂家入库日期")
     private String inboundDate;
 
+    private AppScmVehicleVo carDetailPage;
+
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java
new file mode 100644
index 0000000000..33fdd26dac
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppScmVehicleVo.java
@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/29 9:27
+ * @Description
+ */
+@Data
+public class AppScmVehicleVo implements Vo {
+    private static final long serialVersionUID = -5802337580742368734L;
+
+    @ApiModelProperty("版本编码")
+    private Integer moduleVersion;
+
+    @ApiModelProperty("apk下载地址")
+    private String path;
+
+    @ApiModelProperty("0.内置Activity  1.内置WebView  2.RePlugin插件")
+    private String type;
+
+    @ApiModelProperty("插件名称")
+    private String modulePluginName;
+
+    @ApiModelProperty("地址")
+    private String moduleAction;
+
+    private String json;
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java
index da8e0463e0..335fed16ee 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/companyShunting/CompanyShuntingService.java
@@ -1,6 +1,8 @@
 package com.yxt.anrui.terminal.biz.supplychain.companyShunting;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.yxt.anrui.base.api.baseinternalpurchase.AppCompanyShuntingVo;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.BaseInterNalPurchaseCompleteDto;
@@ -11,7 +13,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingList;
 import com.yxt.anrui.terminal.api.supplychain.companyShunting.CompanyShuntingVo;
 import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingDto;
 import com.yxt.anrui.terminal.api.supplychain.companyShunting.flowable.CompanyShuntingQuery;
@@ -24,7 +25,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author dimengzhe
@@ -79,16 +79,9 @@ public class CompanyShuntingService {
 
     public ResultBean upDateAgreeCompanyShuntingInfo(CompanyShuntingDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        List<CompanyShuntingList> list = dto.getJson();
-        if (list.isEmpty()) {
-            return rb.setMsg("车辆list不能为空");
-        }
-        List<Map<String, Object>> dataList = list.stream().map(companyShuting -> {
-            Map<String, Object> map = new HashMap<>();
-            map.put("sid", companyShuting.getSid());
-            map.put("guidedPrice", companyShuting.getGuidedPrice());
-            return map;
-        }).collect(Collectors.toList());
+        String json = dto.getJson();
+        List<Map<String, Object>> list2 = JSON.parseObject(json, new TypeReference<List<Map<String, Object>>>() {
+        });
         Map<String, Object> map = new HashMap<>();
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
@@ -104,7 +97,7 @@ public class CompanyShuntingService {
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         BaseInterNalPurchaseCompleteDto baseInterNalPurchaseCompleteDto = new BaseInterNalPurchaseCompleteDto();
         BeanUtil.copyProperties(dto, baseInterNalPurchaseCompleteDto);
-        map.put("baseInternalPurchaseVehicles", dataList);
+        map.put("baseInternalPurchaseVehicles", list2);
         baseInterNalPurchaseCompleteDto.setFormVariables(map);
         baseInterNalPurchaseCompleteDto.setOrgSidPath(orgSidPath);
         ResultBean resultBean = baseInternalPurchaseFeign.complete(baseInterNalPurchaseCompleteDto);