diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java
index 78041e5af5..a413fb18d2 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java
@@ -8,5 +8,6 @@ public class VehicleCustomerVo {
     private String customerSid;
     private String saleDate;
     private String useOrgName;
+    private String orderSid;
 
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
index 6fe194edba..6deaa49f44 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
@@ -82,10 +82,12 @@
         SELECT
             date_format (o.createTime,'%Y-%m-%d') saleDate,
             a.customerSid,
-            s.`name` useOrgName
+            s.`name` useOrgName,
+            so.sid as orderSid
         FROM
             base_vehicle_out AS o
                 LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
+                LEFT JOIN anrui_buscenter.bus_sales_order AS so ON so.contractNo = a.contractNo
                 LEFT JOIN anrui_portal.sys_organization AS s ON s.sid = a.createOrgSid
         WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
     </select>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
index ec3681a1e2..00d9d74b35 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
@@ -10,12 +10,16 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign;
+import com.yxt.anrui.base.api.basevehicleoutapply.VehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
-import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanRepaymentPlanDetailsExportVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
@@ -29,7 +33,6 @@ import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -69,8 +72,6 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.PushMessageQuery;
 import com.yxt.messagecenter.api.message.PushSmsDto;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
@@ -5120,15 +5121,97 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 customerTemps.add(crmCustomerTemp);
             }
             //根据车架号查询销售订单
-            String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
-            if (StringUtils.isNotBlank(orderSid)) {
-                salesOrderSid = orderSid;
-                // 查询销售订单车辆列表
-                ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo);
-                BusSalesOrderVehicle vehicleData = busSalesOrderVehicle.getData();
-                if (vehicleData != null) {
-                    busVinSid = vehicleData.getSid();
-                    if (StringUtils.isBlank(vehicleData.getBorrowerSid())) {
+            VehicleCustomerVo vehicleCustomerVo = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
+            if (null != vehicleCustomerVo) {
+                String orderSid = vehicleCustomerVo.getOrderSid();
+                if (StringUtils.isNotBlank(orderSid)) {
+                    salesOrderSid = orderSid;
+                    // 查询销售订单车辆列表
+                    ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selByOrderSidAndVinNo(salesOrderSid, vinNo);
+                    BusSalesOrderVehicle vehicleData = busSalesOrderVehicle.getData();
+                    if (vehicleData != null) {
+                        busVinSid = vehicleData.getSid();
+                        if (StringUtils.isBlank(vehicleData.getBorrowerSid())) {
+                            //生成销售订单贷款人表
+                            BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
+                            borrowerSid = busSalesOrderBorrower.getSid();
+                            busSalesOrderBorrower.setSalesOrderSid(salesOrderSid);
+                            busSalesOrderBorrower.setCustomSid(borrowerCustomerSid);
+                            busSalesOrderBorrower.setBorrowerName(borrowerCustomerName);
+                            busSalesOrderBorrower.setMobile("");
+                            busSalesOrderBorrower.setVehCount(1);
+                            busSalesOrderBorrower.setBankSid(bankSid);
+                            busSalesOrderBorrower.setBankName(bankName);
+                            busSalesOrderBorrower.setPolicyName(policyName);
+                            busSalesOrderBorrower.setIsEnable(3);
+                            busSalesOrderBorrower.setCreateBySid(userSid);
+                            borrowers.add(busSalesOrderBorrower);
+                        } else {
+                            borrowerSid = vehicleData.getBorrowerSid();
+                            BusSalesOrderBorrower borrower = busSalesOrderBorrowerFeign.fetchEntityBySid(borrowerSid).getData();
+                            if (null == borrower) {
+                                //生成销售订单贷款人表
+                                BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
+                                busSalesOrderBorrower.setSid(borrowerSid);
+                                busSalesOrderBorrower.setSalesOrderSid(salesOrderSid);
+                                busSalesOrderBorrower.setCustomSid(borrowerCustomerSid);
+                                busSalesOrderBorrower.setBorrowerName(borrowerCustomerName);
+                                busSalesOrderBorrower.setMobile("");
+                                busSalesOrderBorrower.setVehCount(1);
+                                busSalesOrderBorrower.setBankSid(bankSid);
+                                busSalesOrderBorrower.setBankName(bankName);
+                                busSalesOrderBorrower.setPolicyName(policyName);
+                                busSalesOrderBorrower.setIsEnable(3);
+                                busSalesOrderBorrower.setCreateBySid(userSid);
+                                borrowers.add(busSalesOrderBorrower);
+                            }
+                        }
+                        if (StringUtils.isBlank(vehicleData.getLoanContractSid())) {
+                            //生成消贷合同表
+                            BusSalesOrderLoancontract bsl = new BusSalesOrderLoancontract();
+                            loanContractSid = bsl.getSid();
+                            bsl.setSalesOrderSid(salesOrderSid);
+                            bsl.setLoanContractNo(loanContractNo);
+                            bsl.setBankContractNo(bankContractNo);
+                            bsl.setBankName(bankName);
+                            bsl.setPolicyName(policyName);
+                            bsl.setBorrowerSid(borrowerSid);
+                            bsl.setBorrowerName(borrowerCustomerName);
+                            bsl.setVehCount(1);
+                            bsl.setIsEnable(3);
+                            bsl.setCreateBySid(userSid);
+                            bsl.setBusNo("305");
+                            bsl.setRepaymentState("1");
+                            bsl.setRepaymentCreateTime(new Date());
+                            contracts.add(bsl);
+                        } else {
+                            loanContractSid = vehicleData.getLoanContractSid();
+                            BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchEntityBySid(loanContractSid).getData();
+                            if (null == loancontract) {
+                                //生成消贷合同表
+                                BusSalesOrderLoancontract bsl = new BusSalesOrderLoancontract();
+                                bsl.setSid(loanContractSid);
+                                bsl.setSalesOrderSid(salesOrderSid);
+                                bsl.setLoanContractNo(loanContractNo);
+                                bsl.setBankContractNo(bankContractNo);
+                                bsl.setBankName(bankName);
+                                bsl.setPolicyName(policyName);
+                                bsl.setBorrowerSid(borrowerSid);
+                                bsl.setBorrowerName(borrowerCustomerName);
+                                bsl.setVehCount(1);
+                                bsl.setIsEnable(3);
+                                bsl.setCreateBySid(userSid);
+                                bsl.setBusNo("305");
+                                bsl.setRepaymentState("1");
+                                bsl.setRepaymentCreateTime(new Date());
+                                contracts.add(bsl);
+                            }
+                        }
+                        vehicleData.setTemporaryNo(borrowerNo);
+                        vehicleData.setBorrowerSid(borrowerSid);
+                        vehicleData.setLoanContractSid(loanContractSid);
+                        updateVehicles.add(vehicleData);
+                    } else {
                         //生成销售订单贷款人表
                         BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
                         borrowerSid = busSalesOrderBorrower.getSid();
@@ -5143,27 +5226,6 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         busSalesOrderBorrower.setIsEnable(3);
                         busSalesOrderBorrower.setCreateBySid(userSid);
                         borrowers.add(busSalesOrderBorrower);
-                    } else {
-                        borrowerSid = vehicleData.getBorrowerSid();
-                        BusSalesOrderBorrower borrower = busSalesOrderBorrowerFeign.fetchEntityBySid(borrowerSid).getData();
-                        if (null == borrower) {
-                            //生成销售订单贷款人表
-                            BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
-                            busSalesOrderBorrower.setSid(borrowerSid);
-                            busSalesOrderBorrower.setSalesOrderSid(salesOrderSid);
-                            busSalesOrderBorrower.setCustomSid(borrowerCustomerSid);
-                            busSalesOrderBorrower.setBorrowerName(borrowerCustomerName);
-                            busSalesOrderBorrower.setMobile("");
-                            busSalesOrderBorrower.setVehCount(1);
-                            busSalesOrderBorrower.setBankSid(bankSid);
-                            busSalesOrderBorrower.setBankName(bankName);
-                            busSalesOrderBorrower.setPolicyName(policyName);
-                            busSalesOrderBorrower.setIsEnable(3);
-                            busSalesOrderBorrower.setCreateBySid(userSid);
-                            borrowers.add(busSalesOrderBorrower);
-                        }
-                    }
-                    if (StringUtils.isBlank(vehicleData.getLoanContractSid())) {
                         //生成消贷合同表
                         BusSalesOrderLoancontract bsl = new BusSalesOrderLoancontract();
                         loanContractSid = bsl.getSid();
@@ -5181,34 +5243,43 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         bsl.setRepaymentState("1");
                         bsl.setRepaymentCreateTime(new Date());
                         contracts.add(bsl);
-                    } else {
-                        loanContractSid = vehicleData.getLoanContractSid();
-                        BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchEntityBySid(loanContractSid).getData();
-                        if (null == loancontract) {
-                            //生成消贷合同表
-                            BusSalesOrderLoancontract bsl = new BusSalesOrderLoancontract();
-                            bsl.setSid(loanContractSid);
-                            bsl.setSalesOrderSid(salesOrderSid);
-                            bsl.setLoanContractNo(loanContractNo);
-                            bsl.setBankContractNo(bankContractNo);
-                            bsl.setBankName(bankName);
-                            bsl.setPolicyName(policyName);
-                            bsl.setBorrowerSid(borrowerSid);
-                            bsl.setBorrowerName(borrowerCustomerName);
-                            bsl.setVehCount(1);
-                            bsl.setIsEnable(3);
-                            bsl.setCreateBySid(userSid);
-                            bsl.setBusNo("305");
-                            bsl.setRepaymentState("1");
-                            bsl.setRepaymentCreateTime(new Date());
-                            contracts.add(bsl);
+                        //生成销售订单车辆表
+                        BusSalesOrderVehicle busSalesOrderVehicleEntity = new BusSalesOrderVehicle();
+                        busVinSid = busSalesOrderVehicleEntity.getSid();
+                        busSalesOrderVehicleEntity.setSalesOrderSid(salesOrderSid);
+                        busSalesOrderVehicleEntity.setLinkNo(vinNo);
+                        busSalesOrderVehicleEntity.setTemporaryNo(borrowerNo);
+                        BaseVehicle baseVehicle = baseVehicleFeign.selOneByVinNo(vinNo).getData();
+                        if (null != baseVehicle) {
+                            linkSid = baseVehicle.getSid();
+                        } else {
+                            linkSid = vinNo;
                         }
+                        busSalesOrderVehicleEntity.setLinkSid(linkSid);
+                        busSalesOrderVehicleEntity.setBorrowerSid(borrowerSid);
+                        busSalesOrderVehicleEntity.setLoanContractSid(loanContractSid);
+                        busSalesOrderVehicleEntity.setIsEnable(3);
+                        busSalesOrderVehicleEntity.setCreateBySid(userSid);
+                        vehicles.add(busSalesOrderVehicleEntity);
                     }
-                    vehicleData.setTemporaryNo(borrowerNo);
-                    vehicleData.setBorrowerSid(borrowerSid);
-                    vehicleData.setLoanContractSid(loanContractSid);
-                    updateVehicles.add(vehicleData);
                 } else {
+                    //生成销售订单
+                    BusSalesOrder busSalesOrder = new BusSalesOrder();
+                    salesOrderSid = busSalesOrder.getSid();
+                    busSalesOrder.setPayType("贷款(担保、非担保)");
+                    busSalesOrder.setPayTypeKey("2");
+                    busSalesOrder.setFinancePlan("01");
+                    busSalesOrder.setFinancePlanValue("担保");
+                    busSalesOrder.setCustomerSid(customerSid);
+                    busSalesOrder.setCustomerName(customerName);
+                    busSalesOrder.setUseOrgSid(useOrgSid);
+                    busSalesOrder.setUseOrgName(useOrgName);
+                    busSalesOrder.setOrgSid(deptSid);
+                    busSalesOrder.setOrgName(deptName);
+                    busSalesOrder.setOrgSidPath(orgPath);
+                    busSalesOrder.setIsEnable(3);
+                    busSalesOrder.setCreateBySid(userSid);
+                    orders.add(busSalesOrder);
                     //生成销售订单贷款人表
                     BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
                     borrowerSid = busSalesOrderBorrower.getSid();
@@ -5241,92 +5312,26 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                     bsl.setRepaymentCreateTime(new Date());
                     contracts.add(bsl);
                     //生成销售订单车辆表
-                    BusSalesOrderVehicle busSalesOrderVehicleEntity = new BusSalesOrderVehicle();
-                    busVinSid = busSalesOrderVehicleEntity.getSid();
-                    busSalesOrderVehicleEntity.setSalesOrderSid(salesOrderSid);
-                    busSalesOrderVehicleEntity.setLinkNo(vinNo);
-                    busSalesOrderVehicleEntity.setTemporaryNo(borrowerNo);
+                    BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
+                    busVinSid = busSalesOrderVehicle.getSid();
+                    busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);
+                    busSalesOrderVehicle.setLinkNo(vinNo);
+                    busSalesOrderVehicle.setTemporaryNo(borrowerNo);
                     BaseVehicle baseVehicle = baseVehicleFeign.selOneByVinNo(vinNo).getData();
                     if (null != baseVehicle) {
                         linkSid = baseVehicle.getSid();
                     } else {
                         linkSid = vinNo;
                     }
-                    busSalesOrderVehicleEntity.setLinkSid(linkSid);
-                    busSalesOrderVehicleEntity.setBorrowerSid(borrowerSid);
-                    busSalesOrderVehicleEntity.setLoanContractSid(loanContractSid);
-                    busSalesOrderVehicleEntity.setIsEnable(3);
-                    busSalesOrderVehicleEntity.setCreateBySid(userSid);
-                    vehicles.add(busSalesOrderVehicleEntity);
+                    busSalesOrderVehicle.setLinkSid(linkSid);
+                    busSalesOrderVehicle.setBorrowerSid(borrowerSid);
+                    busSalesOrderVehicle.setLoanContractSid(loanContractSid);
+                    busSalesOrderVehicle.setIsEnable(3);
+                    busSalesOrderVehicle.setCreateBySid(userSid);
+                    vehicles.add(busSalesOrderVehicle);
                 }
-            } else {
-                //生成销售订单
-                BusSalesOrder busSalesOrder = new BusSalesOrder();
-                salesOrderSid = busSalesOrder.getSid();
-                busSalesOrder.setPayType("贷款(担保、非担保)");
-                busSalesOrder.setPayTypeKey("2");
-                busSalesOrder.setFinancePlan("01");
-                busSalesOrder.setFinancePlanValue("担保");
-                busSalesOrder.setCustomerSid(customerSid);
-                busSalesOrder.setCustomerName(customerName);
-                busSalesOrder.setUseOrgSid(useOrgSid);
-                busSalesOrder.setUseOrgName(useOrgName);
-                busSalesOrder.setOrgSid(deptSid);
-                busSalesOrder.setOrgName(deptName);
-                busSalesOrder.setOrgSidPath(orgPath);
-                busSalesOrder.setIsEnable(3);
-                busSalesOrder.setCreateBySid(userSid);
-                orders.add(busSalesOrder);
-                //生成销售订单贷款人表
-                BusSalesOrderBorrower busSalesOrderBorrower = new BusSalesOrderBorrower();
-                borrowerSid = busSalesOrderBorrower.getSid();
-                busSalesOrderBorrower.setSalesOrderSid(salesOrderSid);
-                busSalesOrderBorrower.setCustomSid(borrowerCustomerSid);
-                busSalesOrderBorrower.setBorrowerName(borrowerCustomerName);
-                busSalesOrderBorrower.setMobile("");
-                busSalesOrderBorrower.setVehCount(1);
-                busSalesOrderBorrower.setBankSid(bankSid);
-                busSalesOrderBorrower.setBankName(bankName);
-                busSalesOrderBorrower.setPolicyName(policyName);
-                busSalesOrderBorrower.setIsEnable(3);
-                busSalesOrderBorrower.setCreateBySid(userSid);
-                borrowers.add(busSalesOrderBorrower);
-                //生成消贷合同表
-                BusSalesOrderLoancontract bsl = new BusSalesOrderLoancontract();
-                loanContractSid = bsl.getSid();
-                bsl.setSalesOrderSid(salesOrderSid);
-                bsl.setLoanContractNo(loanContractNo);
-                bsl.setBankContractNo(bankContractNo);
-                bsl.setBankName(bankName);
-                bsl.setPolicyName(policyName);
-                bsl.setBorrowerSid(borrowerSid);
-                bsl.setBorrowerName(borrowerCustomerName);
-                bsl.setVehCount(1);
-                bsl.setIsEnable(3);
-                bsl.setCreateBySid(userSid);
-                bsl.setBusNo("305");
-                bsl.setRepaymentState("1");
-                bsl.setRepaymentCreateTime(new Date());
-                contracts.add(bsl);
-                //生成销售订单车辆表
-                BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
-                busVinSid = busSalesOrderVehicle.getSid();
-                busSalesOrderVehicle.setSalesOrderSid(salesOrderSid);
-                busSalesOrderVehicle.setLinkNo(vinNo);
-                busSalesOrderVehicle.setTemporaryNo(borrowerNo);
-                BaseVehicle baseVehicle = baseVehicleFeign.selOneByVinNo(vinNo).getData();
-                if (null != baseVehicle) {
-                    linkSid = baseVehicle.getSid();
-                } else {
-                    linkSid = vinNo;
-                }
-                busSalesOrderVehicle.setLinkSid(linkSid);
-                busSalesOrderVehicle.setBorrowerSid(borrowerSid);
-                busSalesOrderVehicle.setLoanContractSid(loanContractSid);
-                busSalesOrderVehicle.setIsEnable(3);
-                busSalesOrderVehicle.setCreateBySid(userSid);
-                vehicles.add(busSalesOrderVehicle);
             }
+
             //生成还款计划主表及还款计划表明细
             if (sleep.equals("否")) {
                 LoanRepaymentSchedule scheduleDetails = new LoanRepaymentSchedule();