diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
index 69e7f53dd9..2bbc7d1cc1 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.java
@@ -33,7 +33,7 @@ public interface BusVehicleApplyMapper extends BaseMapper<BusVehicleApply> {
 
     int selectBySid(String list);
 
-    int selectNum(String bill);
+    String selectNum(String bill);
 
     BusVehicleApply selectByCode(String code);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
index 9e2c331cd4..7d62ab3a4a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
@@ -44,7 +44,7 @@
           and find_in_set(sid, #{list})
     </select>
 
-    <select id="selectNum" resultType="int">
+    <select id="selectNum" resultType="java.lang.String">
         select RIGHT(applicationCode,4)
         from bus_vehicle_apply
         where applicationCode LIKE concat(#{bill}, '%') order by id desc limit 1
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 d88a468149..c53fdd6052 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
@@ -253,8 +253,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.PCSQ.getBillType());
         String bill = Rule.getBill(b);
-        int i = baseMapper.selectNum(bill);
-        String billNo = Rule.getBillNo(bill, i);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if(StringUtils.isNotBlank(i)){
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        }else{
+            billNo = Rule.getBillNo(bill, 0);
+        }
         return billNo;
     }
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java
index 2c51a2d98d..f5e9e4c19b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.java
@@ -80,5 +80,5 @@ public interface FinCostapplyMapper extends BaseMapper<FinCostapply> {
 
     int selectBySid(String list);
 
-    int selectNum(String bill);
+    String selectNum(String bill);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml
index 2a4bb60cf4..ef7bac732e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyMapper.xml
@@ -73,7 +73,7 @@
           and find_in_set(sid, #{list})
     </select>
 
-    <select id="selectNum" resultType="int">
+    <select id="selectNum" resultType="java.lang.String">
         select RIGHT(billNo,4)
         from fin_costapply
         where billNo LIKE concat(#{bill}, '%') order by id desc limit 1
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java
index 2094de0f8e..41e15a797f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java
@@ -200,8 +200,13 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.FYSQ.getBillType());
         String bill = Rule.getBill(b);
-        int i = baseMapper.selectNum(bill);
-        String billNo = Rule.getBillNo(bill, i);
+        String billNo = "";
+        String i = baseMapper.selectNum(bill);
+        if(StringUtils.isNotBlank(i)){
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        }else{
+            billNo = Rule.getBillNo(bill, 0);
+        }
         return billNo;
     }
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java
index fbea75b1e5..a03a4a3336 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.java
@@ -67,7 +67,7 @@ public interface FinPaymentapplyMapper extends BaseMapper<FinPaymentapply> {
 
     int updateFlowFiled(Map<String, Object> map);
 
-    int selectNum(String bill);
+    String selectNum(String bill);
 
     FinPaymentapplyDetailsVo fetchDetailsVoBySid(String sid);
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
index e726b35c41..89e8c7ae5e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml
@@ -46,7 +46,7 @@
         WHERE sid = #{sid}
     </update>
 
-    <select id="selectNum" resultType="int">
+    <select id="selectNum" resultType="java.lang.String">
         select RIGHT(billNo,4)
         from fin_paymentapply
         where billNo LIKE concat(#{bill}, '%') order by id desc limit 1
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
index 5c7232ece3..743062350f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
@@ -164,8 +164,13 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.FYSQ.getBillType());
         String bill = Rule.getBill(b);
-        int i = baseMapper.selectNum(bill);
-        String billNo = Rule.getBillNo(bill, i);
+        String billNo = "";
+        String i = baseMapper.selectNum(bill);
+        if(StringUtils.isNotBlank(i)){
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        }else{
+            billNo = Rule.getBillNo(bill, 0);
+        }
         return billNo;
     }
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
index 2716cb6d10..4e5f506ff6 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
@@ -112,7 +112,7 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
 
     void updateStateBySid(@Param("sid") String sid, @Param("state") String state);
 
-    int selectNum(String bill);
+    String selectNum(String bill);
 
     List<ScmVehicleGressionVo> getlastTimeEqual(@Param("vinNo") String vinNo, @Param("targetLocationSid") String targetLocationSid);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
index a7069bbcff..e62a3f7446 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
@@ -5,29 +5,34 @@
     <!--    ${ew.customSqlSegment} -->
 
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
-        SELECT * FROM scm_vehicle_gression
-        <where>${ew.sqlSegment}</where>
+        SELECT *
+        FROM scm_vehicle_gression
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
-        SELECT * FROM scm_vehicle_gression
-        <where>${ew.sqlSegment}</where>
+        SELECT *
+        FROM scm_vehicle_gression
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectCarTransferList"
             resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo">
-        SELECT
-        svg.sid,
-        svg.vinNo as vin,
-        svg.applicantNo as applyId,
-        if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
-        svg.applicantName as applyName,
-        svg.applicantDate as applyDate,
-        svg.applicantFunds as applyPrice,
-        svg.temporaryCard as downloadUrl,
-        svg.location,
-        svg.targetLocation,
-        svg.operator
+        SELECT svg.sid,
+               svg.vinNo                                       as vin,
+               svg.applicantNo                                 as applyId,
+               if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
+               svg.applicantName                               as applyName,
+               svg.applicantDate                               as applyDate,
+               svg.applicantFunds                              as applyPrice,
+               svg.temporaryCard                               as downloadUrl,
+               svg.location,
+               svg.targetLocation,
+               svg.operator
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}
@@ -37,24 +42,26 @@
 
     <select id="getCarTransferList"
             resultType="com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageVo">
-        SELECT
-        svg.sid,
-        svg.vinNo as vin,
-        svg.applicantNo as applyId,
-        if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
-        if(length(svg.nodeState) > 0, false , true) as showDetectBtn,
-        if(length(svg.nodeState) > 0, false , true) as showUpdateBtn,
-        if(length(svg.nodeState) > 0, true , false) as showUploadBtn,
-        if(length(svg.nodeState) > 0, true , false) as showDownloadBtn,
-        svg.applicantName as applyName,
-        svg.applicantDate as applyDate,
-        svg.applicantFunds as applyPrice,
-        svg.temporaryCard as downloadUrl
+        SELECT svg.sid,
+               svg.vinNo                                       as vin,
+               svg.applicantNo                                 as applyId,
+               if(length(svg.nodeState) > 0, nodeState, '待提交') as `state`,
+               if(length(svg.nodeState) > 0, false, true)      as showDetectBtn,
+               if(length(svg.nodeState) > 0, false, true)      as showUpdateBtn,
+               if(length(svg.nodeState) > 0, true, false)      as showUploadBtn,
+               if(length(svg.nodeState) > 0, true, false)      as showDownloadBtn,
+               svg.applicantName                               as applyName,
+               svg.applicantDate                               as applyDate,
+               svg.applicantFunds                              as applyPrice,
+               svg.temporaryCard                               as downloadUrl
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}
-            <if test="names != '' and names != null ">
-                and concat(svg.applicantNo,svg.vinNo) LIKE concat('%', #{names}, '%')
+            <if test="names != '' and names != null">
+                and concat(svg.applicantNo
+                  , svg.vinNo) LIKE concat('%'
+                  , #{names}
+                  , '%')
             </if>
         </where>
         ORDER BY id DESC
@@ -90,11 +97,12 @@
           and find_in_set(sid, #{list})
     </select>
 
-    <select id="selectNum" resultType="java.lang.Integer">
-        select RIGHT (applicantNo, 4)
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(applicantNo, 4)
         from scm_vehicle_gression
         where applicantNo LIKE concat(#{bill}, '%')
-        order by id desc limit 1
+        order by id desc
+        limit 1
     </select>
 
     <select id="getlastTimeEqual" resultType="com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionVo">
@@ -103,14 +111,15 @@
         where vinNo = #{vinNo}
           and targetLocationSid = #{targetLocationSid}
           and LENGTH(nodeState) > 0
-        order by id desc limit 1
+        order by id desc
+        limit 1
     </select>
 
 
     <update id="updateFlowFiled">
         UPDATE scm_vehicle_gression
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+          , nodeId=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
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 0d1e198c0c..1937bbb429 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
@@ -29,11 +29,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo;
+import com.yxt.anrui.base.api.basevehicle.VehicleGression;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
-import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
@@ -44,7 +44,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
-import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -54,13 +53,11 @@ 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.portal.api.sysuser.app.AppUserOrgInfoVo;
-import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehiclegression.*;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -362,10 +359,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                     scmFile.setLinkSid(scmVehicleGression.getSid());
                     scmFileService.save(scmFile);
                 }
-                updateById(scmVehicleGression);
             } else if ("0".equals(dto.getInsuranceStateKey())) {
                 scmFileService.deleteByLinkSidAndType(scmVehicleGression.getSid(), type);
             }
+            updateById(scmVehicleGression);
+
         }
         return rb.success().setData(scmVehicleGression.getSid()).setMsg("保存成功");
     }
@@ -493,8 +491,13 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.KCDDBGSQ.getBillType());
         String bill = Rule.getBill(b);
-        int i = baseMapper.selectNum(bill);
-        String billNo = Rule.getBillNo(bill, i);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if(StringUtils.isNotBlank(i)){
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        }else{
+            billNo = Rule.getBillNo(bill, 0);
+        }
         return billNo;
     }
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java
index a388d2745d..c16a3127a8 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.java
@@ -37,7 +37,7 @@ public interface ScmVehicleReturnMapper extends BaseMapper<ScmVehicleReturn> {
 
     int updateFlowFiled(Map<String, Object> map);
 
-    int selectNum(String bill);
+    String selectNum(String bill);
 
     int selectBySid(String list);
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
index 71664522de..64e5bd7250 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnMapper.xml
@@ -36,7 +36,7 @@
         WHERE sid = #{sid}
     </update>
 
-    <select id="selectNum" resultType="int">
+    <select id="selectNum" resultType="java.lang.String">
         select RIGHT(applicationCode,4)
         from scm_vehicle_return
         where applicationCode LIKE concat(#{bill}, '%') order by id desc limit 1
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 b8c17948d0..e2ad977dc3 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
@@ -467,8 +467,13 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         b.setOrgCode(orgCode);
         b.setBillType(BillTypeEnum.PCSQ.getBillType());
         String bill = Rule.getBill(b);
-        int i = baseMapper.selectNum(bill);
-        String billNo = Rule.getBillNo(bill, i);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if(StringUtils.isNotBlank(i)){
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        }else{
+            billNo = Rule.getBillNo(bill, 0);
+        }
         return billNo;
     }
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
index 02bb9bdc1c..101c3d27f3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
@@ -187,18 +187,4 @@ export default {
 }
 </script>
 <style scoped>
-.btn {
-  padding: 15px 0 15px 0;
-  border: 1px solid #e0e3eb;
-}
-
-.tab-header {
-  background-color: #edf1f7;
-  padding: 8px 20px;
-  margin-bottom: 0 !important;
-}
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
index af7589dee9..bdcdab1641 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
@@ -62,7 +62,7 @@
                 <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
               </template>
             </el-table-column>
-            <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
+            <el-table-column label="现销售指导价(元)" header-align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
index 18b85690f3..ab83444ba2 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
@@ -46,8 +46,8 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
-            <div style="margin-right: 5px">
+            <div>申请车辆列表</div>
+            <div>
               <el-button type="primary" v-show="formobj.shuntingTypeKey == '01'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
               <el-button type="primary" v-show="formobj.shuntingTypeKey == '02'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
             </div>
@@ -85,13 +85,13 @@
                 <el-input v-model="scope.row.witPinMoney" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
               </template>
             </el-table-column>
-            <el-table-column label="发票类型" align="center" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">
-                  <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
-                </el-select>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="发票类型" align="center" width="150">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">-->
+<!--                  <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>-->
+<!--                </el-select>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="运费" align="center" width="150">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.freight" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
@@ -169,6 +169,10 @@ export default {
         sid: '',
         taskId: '',
         useOrgSid: '',
+        deductionFreight: 0,
+        deductionPolicyThreeOne: 0,
+        deductionPolicyThreeTwo: 0,
+        deductionPolicyTwoOne: 0,
         baseInternalPurchaseVehicles: []
       },
       rules: {},
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouguanli.vue
index 0e58487af4..74158b8012 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouguanli.vue
@@ -48,8 +48,8 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="操作" width="150px" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='调车申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
index 6ff124acc8..ac0f4c1b2b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
@@ -187,18 +187,4 @@ export default {
 }
 </script>
 <style scoped>
-.btn {
-  padding: 15px 0 15px 0;
-  border: 1px solid #e0e3eb;
-}
-
-.tab-header {
-  background-color: #edf1f7;
-  padding: 8px 20px;
-  margin-bottom: 0 !important;
-}
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
index 59a92ffd4d..a813060f55 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
@@ -61,7 +61,7 @@
                 <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
               </template>
             </el-table-column>
-            <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
+            <el-table-column label="现销售指导价(元)" header-align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>