diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java
index 9390b09e71..0a582d0ab1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/app/VinQuery.java
@@ -18,4 +18,6 @@ public class VinQuery implements Query {
     private String userSid;
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+
+    private String name;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index 9a0f847ded..dba0089737 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -309,6 +309,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
+        order by bvc.id desc limit 1
     </select>
 
     <!-- <select id="configPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
@@ -751,6 +752,7 @@
             <if test="orgSid != null and orgSid != ''">
                 and bvc.useOrgSid = #{orgSid}
             </if>
+            and length(bvc.guidedPrice)>0
         </where>
         ORDER BY nowCarNum DESC
     </select>
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 4a4ce726d0..f41a08c0c8 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
@@ -208,7 +208,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid
      * @return
      */
-    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid);
+    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid,@Param("name")String name);
 
     /**
      * 现车分页列表（新）
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 c7fa21bb9e..a4b49ec0e8 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
@@ -430,6 +430,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
+        order by bvc.id desc limit 1
     </select>
 
     <select id="exiCarPagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleListVo">
@@ -604,6 +605,9 @@
                         or bv.vehicleStateValue = '在途'
                         or bv.vehicleStateValue = '调入'
                 )
+        <if test="name != null and name != ''">
+            and bv.vinNo LIKE concat('%', #{name}, '%')
+        </if>
     </select>
 
     <select id="selExistingCarPageList"
@@ -721,6 +725,7 @@
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
+        order by bvc.id desc limit 1
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index 78ae1dd03e..ed83f369d6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -987,7 +987,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      */
     @Override
     public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, "");
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, "","");
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 
@@ -997,7 +997,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         String configSid = vinQuery.getConfigSid();
         String userSid = vinQuery.getUserSid();
         String orgPath = vinQuery.getOrgPath();
-        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath);
+        String name = vinQuery.getName();
+        List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid, orgPath,name);
         return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
     }
 
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 2550f353eb..575970e6e0 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
@@ -1121,13 +1121,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath) {
+    public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath,String name) {
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath);
+        List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath,name);
         if (vins.size() <= 0) {
             for (AppVinsDetailsVo vin : vins) {
                 vins.add(vin);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index a3d483dc8d..8c49065ace 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1009,12 +1009,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private String getInvoicMessage(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
         String url = "";
         //根据分公司sid查询分公司开票申请
-        String invoicName = "";
+        /*String invoicName = "";
         ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
         if (invoicingDetailsVoResultBean.getData() != null) {
             map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
             invoicName = invoicingDetailsVoResultBean.getData().getName();
-        }
+        }*/
         //查询销售订单的现车
         AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
@@ -1776,7 +1776,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ExecutorService pool = new ThreadPoolExecutor(2, 100,
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-           /*Future<String> future1 = pool.submit(() -> {
+           /* Future<String> future1 = pool.submit(() -> {
                 return genCarSaleContract(dto, map, appOrderDetailsVo);
             });
             Future<String> future1_2 = pool.submit(() -> {
@@ -1784,7 +1784,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             });*/
             PrintConfirmVo printConfirmVo = null;
             String urlAll = "";
-           /* Future<String> future2 = pool.submit(() -> {
+            /*Future<String> future2 = pool.submit(() -> {
                 return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
             });
             Future<String> future2_2 = pool.submit(() -> {
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
index 618f663d43..d1ca34cb1e 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl
@@ -970,7 +970,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r wsp:rsidR="009536AC"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>        ${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r wsp:rsidR="009536AC"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r wsp:rsidR="009536AC"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>        ${createOrgName!}                            </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r wsp:rsidR="009536AC"><w:rPr><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl
index fca0470298..5001c9af04 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl
@@ -579,7 +579,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!}                            </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl
index e648acf8a3..fb379a71eb 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl
@@ -602,7 +602,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!}       </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!}                            </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:proofErr w:type="gramEnd"/>
                 <w:r>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl
index 0f1786f8fe..86d445bb7e 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl
@@ -640,7 +640,7 @@
                         <w:u w:val="single"/>
                         <w:lang w:val="EN-US"/>
                     </w:rPr>
-                    <w:t>${createOrgName!}       </w:t>
+                    <w:t>${createOrgName!}                            </w:t>
                 </w:r>
                 <w:proofErr w:type="spellEnd"/>
                 <w:proofErr w:type="gramStart"/>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
index a7e85ae9cd..97b4e899a9 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
@@ -622,7 +622,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>${createOrgName!}     </w:t>
+                    <w:t>${createOrgName!}                    </w:t>
                 </w:r>
                 <w:proofErr w:type="spellEnd"/>
                 <w:proofErr w:type="gramStart"/>
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java
index 2b0fa71b4b..2b9c31bb01 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java
@@ -119,4 +119,7 @@ public class AppBusMainDepositVo implements Vo {
     @ApiModelProperty("财务确认状态")
     private String paymentState;
 
+    @ApiModelProperty("财务驳回原因")
+    private String reason;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java
index 2303adf897..fd09e135fe 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/ScheduledService.java
@@ -7,14 +7,15 @@ import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDetailVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleListVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.OrderListMessageDto;
+import com.yxt.messagecenter.api.message.OrderMesageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -29,9 +30,11 @@ public class ScheduledService {
     private BusDepositVehicleService busDepositVehicleService;
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private MessageFeign messageFeign;
 
     @Scheduled(cron = "0 0 0 * * ?")
-//    @Scheduled(cron = "0 0/5 12 * * ?")
+//    @Scheduled(cron = "0 0/5 16 * * ?")
     public void remindVehicle() {
         Date now = new Date();
         //获取当前时间
@@ -46,6 +49,8 @@ public class ScheduledService {
         //查询简易订单-车辆预定中
         //查询修改日期包含该日期的已经通过的简易订车单
         List<BusMainDeposit> strList = busDepositVehicleService.selectListByState(tomorrow);
+        OrderMesageDto dto = new OrderMesageDto();
+        List<OrderListMessageDto> orderListMessageDtoList = new ArrayList<>();
         for (BusMainDeposit strDeposit : strList) {
             String sid = strDeposit.getSid();
             AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(sid).getData();
@@ -55,7 +60,29 @@ public class ScheduledService {
             busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
             busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
             baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            //推送解锁提醒
+            OrderListMessageDto orderListMessageDto = new OrderListMessageDto();
+            orderListMessageDto.setBusinessSid(strDeposit.getSid());//业务sid
+            List<String> createBySidList = new ArrayList<>();
+            createBySidList.add(strDeposit.getCreateBySid());
+            orderListMessageDto.setCreateBySid(createBySidList);//接收人sid
+            Map<String, Object> appMaps = new HashMap<>();
+            appMaps.put("virtualOrderSid", strDeposit.getSid());//简易订单sid
+            orderListMessageDto.setModuleName("业务");
+            orderListMessageDto.setMsgTitle("简易订单-车辆预定解锁提醒");
+            List<String> vinList = appBusDepositVehicleDetailVo.getVehicleList().stream().map(v->v.getVin().substring(v.getVin().length()-8)).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            String msgContent = "您在简易订单-车辆预定中预定的车架号："+String.join(",",vinList)+"的"+vinList.size()+"台车现在已经解锁，如需继续预定请重新申请或在销售订单走销售流程。";
+            orderListMessageDto.setMsgContent(msgContent);
+            orderListMessageDto.setMsgTargetUri("com.anrui.android.plugin.autoservice.activity.DetailVirtualOrderReserveCarActivity");
+            orderListMessageDto.setAppMap(appMaps);
+            orderListMessageDto.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
+            orderListMessageDto.setApp_type("2");
+            orderListMessageDtoList.add(orderListMessageDto);
+
         }
+        dto.setList(orderListMessageDtoList);
+        messageFeign.sendOrderMessage(dto);
+        
     }
 
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 6f3c5e1fcc..769a59c7da 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -670,6 +670,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                                 record.setPaymentState("待确认");
                             }else if(finCollectionConfirmation.getAuditState() ==2){
                                 record.setPaymentState("驳回");
+                                record.setReason(finCollectionConfirmation.getReason());
                             }else{
                                 record.setPaymentState("已确认");
                                 if (StringUtils.isNotBlank(record.getUsedDeposit())) {
@@ -2042,6 +2043,13 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             bv.setTaskDefKey(busMainDeposit.get().getTaskDefKey());
             bv.setComment(com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(dto.getInstanceId());
+            //更新已选择的车架号的状态为审批中
+            List<String> list = dto.getCarList().stream().map(AppBusDepositVehicleCarListDto::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinSidList(list);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             return complete(bv);
         }
         return rb;
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 c695969d4d..22e9cec903 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
@@ -954,8 +954,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public BusSalesOrderPowerVo isHavePower(String sid) {
         BusSalesOrder busSalesOrder = fetchBySid(sid);
         BusSalesOrderPowerVo busSalesOrderPowerVo = new BusSalesOrderPowerVo();
-        boolean isHavePower = false;
-        boolean isPower = false;
+        boolean isHavePower = false;//默认不超权限
+        boolean isPower = false;//默认不超权限
         //总指导价-总成交价-总优惠包的价值
         BigDecimal bigDecimalOne = new BigDecimal("0");
         //初始化总促销金额
@@ -1043,6 +1043,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 isHavePower = false;
             }
+        }else{
+            isHavePower = true;
         }
         //总经理的角色sid
 //        roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
@@ -1070,6 +1072,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 isPower = false;
             }
+        }else{
+            isPower = true;
         }
         busSalesOrderPowerVo.setIsPower(isPower);
         busSalesOrderPowerVo.setIsHavePower(isHavePower);
@@ -2488,6 +2492,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //验证总订金是否正确
         //结转金额是否超过订金合计、需补交金额是否是负数
         BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
+        BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(sid);
+        //验证单台订金是否大于单台整体成交价
+        if (busSalesOrderDeposit.getDeposit() != null) {
+            if (StringUtils.isNotBlank(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) {
+                if(busSalesOrderDeposit.getDeposit().compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice()))>0){
+                    return rb.setMsg("单台订金不允许大于单台整体成交价");
+                }
+            }
+        }
         if (busSalesOrderDeposit.getMakeUpDeposit() != null) {
             if (busSalesOrderDeposit.getMakeUpDeposit().compareTo(new BigDecimal("0")) < 0) {
                 return rb.setMsg("订金信息存在错误，请检查");
@@ -2779,8 +2792,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         vo.setInsuranceState(StringUtils.isNotBlank(busSalesOrder.getIsInsurance()));
         vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes()));
         String imagesFile = vo.getImagesFile();
-        if(StringUtils.isNotBlank(imagesFile)){
+        if (StringUtils.isNotBlank(imagesFile)) {
             List<String> imagess = Arrays.asList(imagesFile);
+            imagess.removeAll(Collections.singleton(null));
+            if (!imagess.isEmpty()) {
+                for (int i = 0; i < imagess.size(); i++) {
+                    if (!imagess.get(i).contains(fileUploadComponent.getUrlPrefix())) {
+                        imagess.set(i, fileUploadComponent.getUrlPrefix() + imagess.get(i));
+                    }
+                }
+            }
+            vo.setImages(imagess);
         }
         //根据销售部门sid查询分公司名称
         ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidBySid(vo.getOrgSid());
@@ -2818,12 +2840,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //若订单类型为0则为现车，为1采购订单，为2排产
             if ("0".equals(modelInfo.getType())) {
                 //查询车架号
-                List<String> vinList = busSalesOrderVehicleService.selectList(sid);
+//                List<String> vinList = busSalesOrderVehicleService.selectList(sid);
+                List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
+                List<String> vinList = vinLists.stream().map(v->v.getVinNo()).collect(Collectors.toList());
                 modelInfo.setVinList(vinList);
             } else {
                 if ("1".equals(modelInfo.getType())) {
                     //查询采购订单编号
-                    List<String> stringList = busSalesVehicleOrderService.selectList(sid);
+//                    List<String> stringList = busSalesVehicleOrderService.selectList(sid);
+                    List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
+                    List<String> stringList = stringLists.stream().map(v->v.getLinkNo()).collect(Collectors.toList());
                     modelInfo.setOrderList(stringList);
                 }
             }
@@ -3151,6 +3177,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bv.setTaskDefKey(busSalesOrder.get().getNodeId());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getProcInsId());
+            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            AppOrderDetailsVo vo = resultBean.getData();
+            if ("现车".equals(vo.getOrderType())) {
+                //更新已选择的车架号的状态为审批中
+                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
+                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                busMainDepositUpdateQuery.setVinSidList(list);
+                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            }
             return complete(bv);
         }
         return rb;
@@ -3655,7 +3692,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             vo.setImages(imagesFile);
-        }else{
+        } else {
             vo.setImages(stringList);
         }
         return rb.success().setData(vo);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
index 3c79d12dc4..acda2b12d6 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
@@ -94,4 +94,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     @Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid}")
     List<BusSalesOrderVehicle> fetchByVehSid(String vehSid);
+
+    List<VinListsVo> selectListBySids(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
index a538a8b786..e46d247aac 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
@@ -59,4 +59,8 @@
         from bus_sales_order_vehicle
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="selectListBySids" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo">
+        select sid,linkSid as vinSid,linkNo as vinNo from bus_sales_order_vehicle where salesOrderSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
index 017ee20fde..e948d34957 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
@@ -37,6 +37,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehi
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -94,9 +95,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<AppNowCarListVo> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
         List<AppNowCarListVo> voList = baseMapper.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
         voList.removeAll(Collections.singleton(null));
-        for (AppNowCarListVo vv : voList){
+        for (AppNowCarListVo vv : voList) {
             ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vv.getCarSid());
-            if(vehicleSelectVoResultBean.getData() != null){
+            if (vehicleSelectVoResultBean.getData() != null) {
                 BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
                 //采购系统sid
                 String purchaseSystemSid = baseVehicleSelectVo.getSid();
@@ -124,14 +125,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
             String linkSid = nowCarList.get(0).getLinkSid();
             //根据车辆sid查询采购系统sid和采购系统名称
             ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(linkSid);
-            if(vehicleSelectVoResultBean.getData() != null){
+            if (vehicleSelectVoResultBean.getData() != null) {
                 BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
                 //采购系统sid
                 String purchaseSystemSid = baseVehicleSelectVo.getSid();
                 //采购系统名称
                 String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
                 //根据销售订单sid更新采购系统sid和采购系统名称
-                busSalesOrderService.updatePurchaseSystem(purchaseSystemName,purchaseSystemSid,salesOrderSid);
+                busSalesOrderService.updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid);
 
             }
             for (int i = 0; i < nowCarList.size(); i++) {
@@ -181,4 +182,28 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusSalesOrderVehicle> busSalesOrderVehicles = baseMapper.fetchByVehSid(vehSid);
         return rb.success().setData(busSalesOrderVehicles);
     }
+
+    public List<VinListsVo> selectLists(String sid) {
+        List<VinListsVo> list = baseMapper.selectListBySids(sid);
+        for (VinListsVo v : list) {
+            String vinSid = v.getVinSid();
+            //根据车辆sid查询采购系统sid和采购系统名称
+            ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vinSid);
+            if (vehicleSelectVoResultBean.getData() != null) {
+                BasePurchSystemVo baseVehicleSelectVo = vehicleSelectVoResultBean.getData();
+                //采购系统sid
+                String purchaseSystemSid = baseVehicleSelectVo.getSid();
+                //采购系统名称
+                String purchaseSystemName = baseVehicleSelectVo.getPurchaseSystemName();
+                String vinNo = v.getVinNo();
+                if (StringUtils.isNotBlank(purchaseSystemName)) {
+                    vinNo = vinNo + "  -" + purchaseSystemName;
+                } else {
+                    vinNo = vinNo + "  -";
+                }
+                v.setVinNo(vinNo);
+            }
+        }
+        return list;
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
index b2a10e00a2..1a5c102df8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
@@ -83,4 +83,6 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
     int selectByLinkSid(String linkSid);
 
     List<BusSalesVehicleOrder> selectLinkSid(String businessSid);
+
+    List<BusSalesVehicleOrder> selectLists(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
index a0918235b9..f357dd18e9 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
@@ -63,4 +63,10 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{businessSid}
     </select>
+
+    <select id="selectLists" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">
+        select concat(linkNo, '  x', usingNum) as linkNo,linkSid,sid
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
index e9d4bb13f2..5a0485312f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
@@ -36,6 +36,7 @@ import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOr
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -166,4 +167,30 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     public List<BusSalesVehicleOrder> selectLinkSid(String businessSid) {
         return baseMapper.selectLinkSid(businessSid);
     }
+
+    public List<BusSalesVehicleOrder> selectLists(String sid) {
+        List<BusSalesVehicleOrder> list = baseMapper.selectLists(sid);
+        list.removeAll(Collections.singleton(null));
+        if(list.isEmpty()){
+            for (BusSalesVehicleOrder busSalesVehicleOrder : list){
+                String linkSid = busSalesVehicleOrder.getLinkSid();
+                ResultBean<BasePurchSystemVo> getDetails = busVehicleOrderFeign.getDetails(linkSid);
+                if(getDetails.getData() != null){
+                    BasePurchSystemVo actualAndOrgDeptVo = getDetails.getData();
+                    //采购系统sid
+                    String purchaseSystemSid = actualAndOrgDeptVo.getSid();
+                    //采购系统名称
+                    String linkNo = busSalesVehicleOrder.getLinkNo();
+                    String purchaseSystemName = actualAndOrgDeptVo.getPurchaseSystemName();
+                    if(StringUtils.isNotBlank(purchaseSystemName)){
+                        linkNo = linkNo+"   -"+purchaseSystemName;
+                    }else{
+                        linkNo = linkNo+"   -";
+                    }
+                    busSalesVehicleOrder.setLinkNo(linkNo);
+                }
+            }
+        }
+        return list;
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
index 068f7b84c0..e0d839aece 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
@@ -125,7 +125,7 @@
         </div>
       </div>
     </div>
-    <cashierConfirmationInfo v-show="viewState == 2 || viewState == 3" ref="divInfo" @doback="resetState"/>
+    <cashierConfirmationInfo v-show="viewState == 2 || viewState == 3" ref="divInfo" @doback="resetState" @reloadlist="getList"/>
   </div>
 </template>
 
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
index 456a319a7e..5b6c4a8855 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
@@ -223,6 +223,22 @@
         </el-table>
       </el-form>
     </div>
+    <el-dialog center :visible.sync="dialogVisible" width="50%">
+      <el-form ref="form_obj" class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="4" class="tleftb">
+            <span>意见</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input v-model="reason" clearable placeholder="" type="textarea" :autosize="{ minRows: 2, maxRows: 20}" resize="none"/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -236,6 +252,8 @@ export default {
       sid: '',
       viewTitle: '',
       viewState: '',
+      dialogVisible: false,
+      reason: '', // 驳回原因
       selectedreceivableKey: 0,
       receiptNumber: '',
       formobj: {},
@@ -251,7 +269,7 @@ export default {
       this.receiptNumber = row.billNo
       this.viewTitle = '认款详情'
       fetchDetailBySid(row.sid).then(resp => {
-        if (resp.code === '200') {
+        if (resp.success) {
           this.formobj = resp.data
           if (this.formobj.paymentVoucherAppendixs.length > 0) {
             this.formobj.paymentVoucherAppendixs.forEach((e) => {
@@ -275,22 +293,20 @@ export default {
       })
     },
     handAffirm() {
-      cashierConfirm({ sid: this.sid }).then((res) => {
-        if (res.code === '200') {
-          this.$message({
-            showClose: true,
-            message: '确认成功',
-            type: 'success'
-            }
-          )
+      cashierConfirm({ sid: this.sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, message: '确认成功', type: 'success' })
           this.handleReturn('true')
         }
       })
     },
     handReject() {
-      cashierReject({ sid: this.sid }).then((res) => {
-        if (res.code === '200') {
-          this.message({ showClose: true, message: '已驳回', type: 'success' })
+      this.dialogVisible = true
+    },
+    handleConfirm() {
+      cashierReject({ sid: this.sid, reason: this.reason, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, message: '已驳回', type: 'success' })
           this.handleReturn('true')
         }
       })
@@ -301,6 +317,8 @@ export default {
       this.list1 = []
       this.list2 = []
       this.receiptNumber = ''
+      this.reason = ''
+      this.dialogVisible = false
       this.$emit('doback')
     }
   }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
index 00a4a68ff6..3296a0292f 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
@@ -110,4 +110,7 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String createDeptSid;
     @ApiModelProperty("单据编号")
     private String billNo;
+
+    @ApiModelProperty("驳回原因")
+    private String reason;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
index 1cacb2ac60..3e7bae2126 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
@@ -82,7 +82,7 @@ public interface FinCollectionConfirmationFeign {
 
     @ApiOperation("出纳驳回")
     @PostMapping("/cashierReject")
-    public ResultBean cashierReject(@RequestParam("sid") String sid);
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery);
 
     /*---------------------App接口 ---------------------*/
 
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
index bfd911bc6d..075e8d1c77 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
@@ -79,7 +79,7 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     }
 
     @Override
-    public ResultBean cashierReject(String sid) {
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery) {
         return null;
     }
 
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java
new file mode 100644
index 0000000000..ea4e905209
--- /dev/null
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionRejectQuery.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/9 13:48
+ * @Description
+ */
+@Data
+public class FinCollectionRejectQuery {
+    @ApiModelProperty("款项确认sid")
+    private String sid;
+    @ApiModelProperty("驳回原因")
+    private String reason;
+}
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
index ea8796ce81..9cdd844936 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
@@ -99,8 +99,8 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     }
 
     @Override
-    public ResultBean cashierReject(String sid) {
-        return finCollectionConfirmationService.cashierReject(sid);
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery) {
+        return finCollectionConfirmationService.cashierReject(finCollectionRejectQuery);
     }
 
     /**
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 9d1f73dfa4..f9659f13d0 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -1241,8 +1241,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return qw;
     }
 
-    public ResultBean cashierReject(String sid) {
+    public ResultBean cashierReject(FinCollectionRejectQuery finCollectionRejectQuery) {
         ResultBean rb = ResultBean.fireFail();
+        String sid = finCollectionRejectQuery.getSid();
+        String reason = finCollectionRejectQuery.getReason();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
@@ -1259,6 +1261,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
         });
         confirmation.setAuditState(2);
+        //更新驳回原因
+        confirmation.setReason(reason);
         baseMapper.updateById(confirmation);
         //删除临时表的数据
         ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
index 185f121db9..1e9870fddd 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
@@ -95,7 +95,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="customerName">
-              <el-select v-model="temp.customerName" class="addinputw" clearable placeholder="" @change="changeCustomer">
+              <el-select v-model="temp.customerName" class="addinputw" filterable clearable placeholder="" @change="changeCustomer">
                 <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.name"/>
               </el-select>
             </el-form-item>
@@ -321,8 +321,7 @@ export default {
         price: [{ required: true, message: '成交价不能为空', trigger: 'blur' }],
         concatNo: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }],
         isTerminal: [{ required: true, message: '是否为终端客户不能为空', trigger: 'change' }],
-        customerName: [{ required: true, message: '客户名称不能为空', trigger: 'change' }],
-        trailerOrInstallDealPrice: [{ required: true, message: '成交价不能为空', trigger: 'change' }]
+        customerName: [{ required: true, message: '客户名称不能为空', trigger: 'change' }]
       }
     }
   },
@@ -427,6 +426,10 @@ export default {
     },
     // 保存
     handleCreate() {
+      if (this.temp.trailerOrInstallDealPrice === '' && this.name !== '') {
+        this.$message({ showClose: true, type: 'error', message: '成交价不能为空' })
+        return
+      }
       if (this.temp.giftsDescription !== '' && this.temp.giftsDescription !== '0' && this.temp.remarks === '') {
         this.$message({ showClose: true, type: 'error', message: '因赠品价值大于0，请填写备注' })
         return
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java
index 2ba063f417..1ec9e66343 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java
@@ -77,4 +77,7 @@ public class MainDepositVo implements Vo {
     
     @ApiModelProperty("财务确认状态")
     private String paymentState;
+
+    @ApiModelProperty("财务驳回原因")
+    private String reason;
 }