diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java
index 5f0a6464a0..1b0202ff13 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java
@@ -4,8 +4,6 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * @Author dimengzhe
  * @Date 2023/3/22 15:02
@@ -23,10 +21,6 @@ public class SolutionsDto implements Dto {
     private Integer isPack;
     @ApiModelProperty("产品政策名称")
     private String policyName;
-    @ApiModelProperty("产品政策sid")
-    private String policySid;
-    @ApiModelProperty("融资项目总额")
-    private String loanTotal;
     @ApiModelProperty("主车发票价")
     private String mainVehicleAmount;
     @ApiModelProperty("融资票据")
@@ -39,6 +33,9 @@ public class SolutionsDto implements Dto {
     private String premium;
     @ApiModelProperty("车损上浮")
     private String vehDamageFloat;
+    @ApiModelProperty("融资项目总额")
+    private String loanTotal;
+
     @ApiModelProperty("首付款比例")
     private String downPayRatio;
     @ApiModelProperty("首付金额")
@@ -47,24 +44,24 @@ public class SolutionsDto implements Dto {
     private String loanAmount;
     @ApiModelProperty("贷款期数")
     private int loanPeriod;
-    @ApiModelProperty("保证金比例")
+    @ApiModelProperty("贷款保证金比例")
     private String bondRatio;
-    @ApiModelProperty("保证金金额")
+    @ApiModelProperty("贷款保证金金额")
     private String bondAmount;
     @ApiModelProperty("厂家贴息")
     private String factoryDiscount;
     @ApiModelProperty("年利率")
     private String policyYearRatio;
-    @ApiModelProperty("贷款月还")
+    @ApiModelProperty("月还金额")
     private String loanPayMoney;
-    @ApiModelProperty("贷款利息")
+    @ApiModelProperty("利息总额")
     private String loanInterest;
 
     //其他融
 
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
-    @ApiModelProperty("其它融金额")
+    @ApiModelProperty("其它融贷款金额")
     private String otherPolicyAmount;
     @ApiModelProperty("其它融期数")
     private Integer otherPolicyPeriod;
@@ -73,24 +70,23 @@ public class SolutionsDto implements Dto {
     @ApiModelProperty("其它融利息总额")
     private String otherPolicyInterest;
 
-    @ApiModelProperty("'融资首付")
-    private BigDecimal loanDownPay;
-    @ApiModelProperty("总贷款金额")
-    private BigDecimal loanAmountTotal;
-    @ApiModelProperty("期数")
-    private Integer period;
-    @ApiModelProperty("月还金额")
-    private BigDecimal monthlyRepay;
+  /*  @ApiModelProperty("'融资首付")
+    private String loanDownPay;*/
+   /* @ApiModelProperty("总贷款金额")
+    private String loanAmountTotal;*/
+   /* @ApiModelProperty("期数")
+    private Integer period;*/
+  /*  @ApiModelProperty("月还金额")
+    private String monthlyRepay;
     @ApiModelProperty("利息总额")
-    private BigDecimal interest;
+    private String interest;*/
     @ApiModelProperty("预计首期还款日")
     private String returnTime;
 
-
     //金融方案费用明细
-    
-    @ApiModelProperty("融资首付")
-    private String downPayAmounts;
+
+  /*  @ApiModelProperty("融资首付")
+    private String downPayAmounts;*/
     @ApiModelProperty("贷款保证金")
     private String bondAmounts;
     @ApiModelProperty("保险保证金")
@@ -121,8 +117,8 @@ public class SolutionsDto implements Dto {
     private String offsetPremium;
     @ApiModelProperty("抵顶购置税")
     private String offsetPurchasetax;
-    @ApiModelProperty("抵顶费用合计")
-    private String offsetTotal;
+  /*  @ApiModelProperty("抵顶费用合计")
+    private String offsetTotal;*/
     @ApiModelProperty("应收合计")
     private String receivableTotal;
     @ApiModelProperty("实收合计")
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
index e0d778fda0..c02aea9d1a 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java
@@ -57,7 +57,7 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
     @ApiModelProperty("其它融金额")
-    private Integer otherPolicyAmount;
+    private BigDecimal otherPolicyAmount;
     @ApiModelProperty("其它融期数")
     private Integer otherPolicyPeriod;
     @ApiModelProperty("其它融月还")
@@ -69,9 +69,9 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
     @ApiModelProperty("总贷款金额")
     private BigDecimal loanAmountTotal;
     @ApiModelProperty("期数")
-    private Integer period;
+    private String period;
     @ApiModelProperty("月还金额")
-    private BigDecimal monthlyRepay;
+    private String monthlyRepay;
     @ApiModelProperty("利息总额")
     private BigDecimal interest;
     @ApiModelProperty("预计首期还款日")
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.java
index 3535353c41..5582021f03 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.java
@@ -1,16 +1,8 @@
 package com.yxt.anrui.riskcenter.biz.loansolutions;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
-import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Map;
 
 /**
  * Project: anrui-riskcenter(风控中心) <br/>
@@ -27,9 +19,11 @@ import java.util.Map;
  */
 @Mapper
 public interface LoanSolutionsMapper extends BaseMapper<LoanSolutions> {
-    
+
     LoanSolutions selectBySaleOrderSid(String saleOrderSid);
 
+    int deleteByOrderSid(String saleOrderSid);
+
 
    /* IPage<LoanSolutionsVo> selectPageVo(IPage<LoanSolutions> page, @Param(Constants.WRAPPER) Wrapper<LoanSolutions> qw);
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml
index d7a9c598e8..f4e8980763 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsMapper.xml
@@ -54,4 +54,10 @@
         from loan_solutions
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <delete id="deleteByOrderSid">
+        delete
+        from loan_solutions
+        where salesOrderSid = #{saleOrderSid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index a852eab254..dec2111774 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -9,10 +9,14 @@ import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherp
 import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService;
 import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 /**
  * Project: anrui-riskcenter(风控中心) <br/>
  * File: LoanSolutionsService.java <br/>
@@ -44,43 +48,265 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
 
     public ResultBean saveDto(SolutionsDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        //验证必填
-        //融资项目总额
-        //首付比例
-        //首付金额 = 首付比例*融资项目总额
-        //产品贷款金额 = 融资项目总额-首付比例
-        //贷款保证金比例
-        //贷款保证金 = 贷款金额*保证金比例
-        //厂家贴息
-        //年利率计算
-        //月还金额计算
-        //利息总额计算
-
-        //查询金融方案
-        String saleOrderSid = dto.getSaleOrderSid();
-        LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid);
-        if (loanSolutions == null) {
-            loanSolutions = new LoanSolutions();
+        //自营非担保和贷款的需要填写金融方案
+        if ("1".equals(dto.getTypeKey()) || StringUtils.isBlank(dto.getTypeKey())) {
+            //融资项目总额 = 主车发票价+融资票据+挂车+保险+购置税+车损上浮
+            BigDecimal loanTotal = new BigDecimal(BigInteger.ZERO);
+            //主车发票价
+            String mainVehicleAmount = dto.getMainVehicleAmount();
+            if (StringUtils.isNotBlank(mainVehicleAmount)) {
+                loanTotal = loanTotal.add(new BigDecimal(mainVehicleAmount));
+            }
+            //融资票据
+            String accessoriesAmount = dto.getAccessoriesAmount();
+            if (StringUtils.isNotBlank(accessoriesAmount)) {
+                loanTotal = loanTotal.add(new BigDecimal(accessoriesAmount));
+            }
+            //挂车
+            String trailerAmount = dto.getTrailerAmount();
+            if (StringUtils.isNotBlank(trailerAmount)) {
+                loanTotal = loanTotal.add(new BigDecimal(trailerAmount));
+            }
+            //购置税
+            String purchaseTax = dto.getPurchaseTax();
+            if (StringUtils.isNotBlank(purchaseTax)) {
+                loanTotal = loanTotal.add(new BigDecimal(purchaseTax));
+            }
+            //保险金额
+            String premium = dto.getPremium();
+            if (StringUtils.isNotBlank(premium)) {
+                loanTotal = loanTotal.add(new BigDecimal(premium));
+            }
+            //车损上浮
+            String vehDamageFloat = dto.getVehDamageFloat();
+            if (StringUtils.isNotBlank(vehDamageFloat)) {
+                loanTotal = loanTotal.add(new BigDecimal(vehDamageFloat));
+            }
+            //首付款比例
+            String downPayRatio = dto.getDownPayRatio();
+            //首付金额
+            BigDecimal downPayAmount = new BigDecimal(BigInteger.ZERO);
+            //首付金额 = 融资项目总*首付比例（可调整）
+            if (StringUtils.isBlank(downPayRatio)) {
+                return rb.setMsg("首付款比例不能为空");
+            } else {
+                if (StringUtils.isBlank(dto.getDownPayAmount())) {
+                    downPayAmount = loanTotal.multiply(new BigDecimal(downPayRatio)).divide(new BigDecimal("100"));
+                } else {
+                    downPayAmount = new BigDecimal(dto.getDownPayAmount());
+                }
+            }
+            int loanPeriod = dto.getLoanPeriod();
+            //产品贷款金额 = 融资项目总额-首付金额
+            BigDecimal loanAmount = loanTotal.subtract(downPayAmount);
+            //贷款保证金比例
+            String bondRatio = dto.getBondRatio();
+            //贷款保证金 = 贷款金额*贷款保证金比例（可调整）
+            BigDecimal bondAmount = new BigDecimal(BigInteger.ZERO);
+            if (StringUtils.isBlank(bondRatio)) {
+                return rb.setMsg("贷款保证金比例不能为空");
+            } else {
+                if (StringUtils.isBlank(dto.getBondAmount())) {
+                    bondAmount = loanAmount.multiply(new BigDecimal(bondRatio)).divide(new BigDecimal("100"));
+                } else {
+                    bondAmount = new BigDecimal(dto.getBondAmount());
+                }
+
+            }
+            //厂家贴息
+            String factoryDiscount = dto.getFactoryDiscount();
+            //年利率 =
+            String policyYearRatio = dto.getPolicyYearRatio();
+            //月还金额
+            String loanPayMoney = dto.getLoanPayMoney();
+            //利息总额 = 贷款利息总额+利息总额
+            BigDecimal interest = new BigDecimal(BigInteger.ZERO);
+            //利息总额
+            String loanInterest = dto.getLoanInterest();
+            if (StringUtils.isNotBlank(loanInterest)) {
+                interest = interest.add(new BigDecimal(loanInterest));
+            }
+            //==================================其它融
+            //其它融名称
+            String otherPolicyName = dto.getOtherPolicyName();
+            //其它融贷款金额
+            BigDecimal otherPolicyAmount = new BigDecimal(BigInteger.ZERO);
+            if (StringUtils.isNotBlank(dto.getOtherPolicyAmount())) {
+                otherPolicyAmount = new BigDecimal(dto.getOtherPolicyAmount());
+            }
+            //其它融期数
+            int otherPolicyPeriod = dto.getOtherPolicyPeriod();
+            //其它融月还
+            String otherPolicyMonthlyRepay = dto.getOtherPolicyMonthlyRepay();
+            //其它融利息总额
+            String otherPolicyInterest = dto.getOtherPolicyInterest();
+            if (StringUtils.isNotBlank(otherPolicyInterest)) {
+                interest = interest.add(new BigDecimal(otherPolicyInterest));
+            }
+
+            //==================================方案汇总
+            //融资首付 = 首付金额-其它融贷款金额
+            BigDecimal loanDownPay = downPayAmount.subtract(otherPolicyAmount);
+            //期数 = 其它融期数/剩余期数
+            int periods = loanPeriod - otherPolicyPeriod;
+            String period = otherPolicyInterest + "/" + periods;
+            //总贷款金额 = 产品贷款金额+其它融贷款金额
+            BigDecimal loanAmountTotal = loanAmount.add(otherPolicyAmount);
+            //月还金额 = 总月还/贷款月还
+            String monthlyRepay = dto.getLoanPayMoney() + "/" + dto.getOtherPolicyMonthlyRepay();
+            //预计首期还款日
+            String returnTime = dto.getReturnTime();
+
+            //====================================应收明细
+            //应收合计 = 融资首付+贷款保证金+保险保证金+落户保证金+服务费+代收意外险+补车价+上牌费+运管费+其它费用
+            BigDecimal receivableTotal = new BigDecimal(BigInteger.ZERO);
+            //融资首付 = 首付金额-其它融贷款金额
+            BigDecimal downPayAmounts = new BigDecimal(BigInteger.ZERO);
+            downPayAmounts = loanDownPay;
+
+            //贷款保证金
+            String bondAmounts = dto.getBondAmounts();
+            if (StringUtils.isNotBlank(bondAmounts)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(bondAmounts));
+            }
+            //保险保证金
+            String depositPremium = dto.getDepositPremium();
+            if (StringUtils.isNotBlank(depositPremium)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(depositPremium));
+            }
+            //落户保证金
+            String depositSettle = dto.getDepositSettle();
+            if (StringUtils.isNotBlank(depositSettle)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(depositPremium));
+            }
+            //服务费
+            String serviceAmount = dto.getServiceAmount();
+            if (StringUtils.isNotBlank(serviceAmount)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(serviceAmount));
+            }
+            //代收意外险
+            String proxyAccidentPremium = dto.getProxyAccidentPremium();
+            if (StringUtils.isNotBlank(proxyAccidentPremium)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(proxyAccidentPremium));
+
+            }
+            //上牌费
+            String registerAmount = dto.getRegisterAmount();
+            if (StringUtils.isNotBlank(registerAmount)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(registerAmount));
+            }
+            //运管费
+            String operationAmount = dto.getOperationAmount();
+            if (StringUtils.isNotBlank(operationAmount)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(operationAmount));
+
+            }
+            //补车价
+            String vehOtherPrice = dto.getVehOtherPrice();
+            if (StringUtils.isNotBlank(vehOtherPrice)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(vehOtherPrice));
+            }
+            //其它费用
+            String otherAmount = dto.getOtherAmount();
+            if (StringUtils.isNotBlank(otherAmount)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(otherAmount));
+            }
+            //其它费用说明
+            String otherAmountRemark = dto.getOtherAmountRemark();
+            //办理方式选择
+            String dealWay = dto.getDealWay();
+            //代收首年保险费
+            String proxyPremium = dto.getProxyPremium();
+            if (StringUtils.isNotBlank(proxyPremium)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(proxyPremium));
+            }
+            //代收购置费
+            String proxyPurchasetax = dto.getProxyPurchasetax();
+            if (StringUtils.isNotBlank(proxyPurchasetax)) {
+                receivableTotal = receivableTotal.add(new BigDecimal(proxyPurchasetax));
+            }
+            //抵顶费用合计 = 抵顶首年保险费+抵顶购置税
+            BigDecimal offsetTotal = new BigDecimal(BigInteger.ZERO);
+            //抵顶首年保险费
+            String offsetPremium = dto.getOffsetPremium();
+            if (StringUtils.isNotBlank(offsetPremium)) {
+                offsetTotal = offsetTotal.add(new BigDecimal(offsetPremium));
+            }
+            //抵顶购置税
+            String offsetPurchasetax = dto.getOffsetPurchasetax();
+            if (StringUtils.isNotBlank(offsetPurchasetax)) {
+                offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
+            }
+            //实收合计 = 应收合计-抵顶合计
+            BigDecimal realTotal = receivableTotal.subtract(offsetTotal);
+            //车辆总价
+            String vehTotalPrice = dto.getVehTotalPrice();
+            //名义留购价
+            String nominalPrice = dto.getNominalPrice();
+            //查询金融方案
+            LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(dto.getSaleOrderSid());
+            if (loanSolutions != null) {
+                //删除该销售订单的
+                baseMapper.deleteByOrderSid(dto.getSaleOrderSid());
+                loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
+                loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
+            }
+
             BeanUtil.copyProperties(dto, loanSolutions);
+            //融资项目总额
+            loanSolutions.setLoanTotal(loanTotal);
+            //首付金额
+            loanSolutions.setDownPayAmount(downPayAmount);
+            //产品贷款金额
+            loanSolutions.setLoanAmount(loanAmount);
+            //贷款保证金
+            loanSolutions.setBondAmount(bondAmount);
             baseMapper.insert(loanSolutions);
             //其他融
             LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy();
             loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
             BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy);
+            //其它融贷款金额
+            loanSolutionsOtherpolicy.setOtherPolicyAmount(otherPolicyAmount);
+            //方案汇总：融资首付
+            loanSolutionsOtherpolicy.setLoanDownPay(loanDownPay);
+            //总贷款金额
+            loanSolutionsOtherpolicy.setLoanAmountTotal(loanAmountTotal);
+            //期数
+            loanSolutionsOtherpolicy.setPeriod(period);
+            //月还金额
+            loanSolutionsOtherpolicy.setMonthlyRepay(monthlyRepay);
+            //利息总额
+            loanSolutionsOtherpolicy.setInterest(interest);
+            loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
             //费用明细
             LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
             loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
             BeanUtil.copyProperties(dto, loanSolutionsDetail);
+            loanSolutionsDetail.setDownPayAmount(downPayAmounts);
+            //抵顶费用合计
+            loanSolutionsDetail.setOffsetTotal(offsetTotal);
+            //应收合计
+            loanSolutionsDetail.setReceivableTotal(receivableTotal);
+            //实收合计
+            loanSolutionsDetail.setRealTotal(realTotal);
             loanSolutionsDetailService.insert(loanSolutionsDetail);
-            loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
-        } else {
-            //修改其他融
-            //修改费用明细
-            //
 
+        } else {//外部金融的只需要录入厂家贴息
+            //查询金融方案
+            LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(dto.getSaleOrderSid());
+            if (loanSolutions != null) {
+                //删除该销售订单的
+                baseMapper.deleteByOrderSid(dto.getSaleOrderSid());
+                loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
+                loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
+            }
+            //查询金融方案
+            loanSolutions = new LoanSolutions();
+            BeanUtil.copyProperties(dto, loanSolutions);
+            baseMapper.insert(loanSolutions);
         }
-
-        return null;
+        return rb.success();
     }
   /*  @Autowired
     private LoanSolutionsTopService loanSolutionsTopService;
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.java
index 1afb3efb3e..d2877dcd20 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.java
@@ -1,19 +1,8 @@
 package com.yxt.anrui.riskcenter.biz.loansolutionsdetail;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.riskcenter.api.loansolutionsdetail.AppLoanSolutionsDetailVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
-import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailDetailsVo;
-import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailVo;
-import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.Map;
 
 /**
  * Project: anrui-riskcenter(风控中心) <br/>
@@ -30,6 +19,7 @@ import java.util.Map;
  */
 @Mapper
 public interface LoanSolutionsDetailMapper extends BaseMapper<LoanSolutionsDetail> {
+    int deleteByLoanSid(String sid);
 
 
     /*IPage<LoanSolutionsDetailVo> selectPageVo(IPage<LoanSolutionsDetail> page, @Param(Constants.WRAPPER) Wrapper<LoanSolutionsDetail> qw);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.xml
index a820530808..388f0a1d5f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailMapper.xml
@@ -30,4 +30,10 @@
 			incidentalsRemarks=#{incidentalsRemarks},prePayInterestRemarks=#{prePayInterestRemarks}
 		WHERE sid=#{sid}
 	</update>-->
+
+    <delete id="deleteByLoanSid">
+        delete
+        from loan_solution_detail
+        where solutionSid = #{sid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java
index 89867b7c38..36e87bab02 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsdetail/LoanSolutionsDetailService.java
@@ -19,6 +19,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LoanSolutionsDetailService extends MybatisBaseService<LoanSolutionsDetailMapper, LoanSolutionsDetail> {
+    public int deleteByLoanSid(String sid) {
+        return baseMapper.deleteByLoanSid(sid);
+    }
     /*private QueryWrapper<LoanSolutionsDetail> createQueryWrapper(LoanSolutionsDetailQuery query) {
         QueryWrapper<LoanSolutionsDetail> qw = new QueryWrapper<>();
 
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.java
index 04f67c6db3..5911565352 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.java
@@ -54,9 +54,10 @@ import java.util.List;
  */
 @Mapper
 public interface LoanSolutionsOtherpolicyMapper extends BaseMapper<LoanSolutionsOtherpolicy> {
+    int deleteByLoanSid(String sid);
 
-	//@Update("update loan_solutions_otherpolicy set name=#{msg} where id=#{id}")
-	//IPage<LoanSolutionsOtherpolicyVo> voPage(IPage<LoanSolutionsOtherpolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSolutionsOtherpolicy> qw);
+    //@Update("update loan_solutions_otherpolicy set name=#{msg} where id=#{id}")
+    //IPage<LoanSolutionsOtherpolicyVo> voPage(IPage<LoanSolutionsOtherpolicy> page, @Param(Constants.WRAPPER) QueryWrapper<LoanSolutionsOtherpolicy> qw);
 	
 	/*IPage<LoanSolutionsOtherpolicyVo> selectPageVo(IPage<LoanSolutionsOtherpolicy> page, @Param(Constants.WRAPPER) Wrapper<LoanSolutionsOtherpolicy> qw);
 	
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.xml
index 506349c55b..48680efb13 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyMapper.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-<!--	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyVo">
-		SELECT * FROM loan_solutions_otherpolicy <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyVo">
-		SELECT * FROM loan_solutions_otherpolicy <where> ${ew.sqlSegment} </where>
-	</select>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <!--	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyVo">
+            SELECT * FROM loan_solutions_otherpolicy <where> ${ew.sqlSegment} </where>
+        </select>
+
+        <select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyVo">
+            SELECT * FROM loan_solutions_otherpolicy <where> ${ew.sqlSegment} </where>
+        </select>-->
+
+    <delete id="deleteByLoanSid">
+        delete
+        from loan_solutions_otherpolicy
+        where solutionsSid = #{sid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyService.java
index 16a02508c5..57fba45c59 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutionsotherpolicy/LoanSolutionsOtherpolicyService.java
@@ -44,6 +44,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LoanSolutionsOtherpolicyService extends MybatisBaseService<LoanSolutionsOtherpolicyMapper, LoanSolutionsOtherpolicy> {
+    public int deleteByLoanSid(String sid) {
+        return baseMapper.deleteByLoanSid(sid);
+    }
    /* private QueryWrapper<LoanSolutionsOtherpolicy> createQueryWrapper(LoanSolutionsOtherpolicyQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
index cdc3c14c6a..2b7aba6b72 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
@@ -23,7 +23,7 @@
               <el-col :span="12">
                 <div class="span-sty"><span><span class="icon">*</span>发动机号:</span></div>
                 <el-form-item prop="engineNo">
-                  <el-input v-model="temp.engineNo" placeholder="请输入发动机号" class="addinputw" :readonly="temp.purchaseKey !== '002'"/>
+                  <el-input v-model="temp.engineNo" placeholder="请输入发动机号" class="addinputw"/>
                 </el-form-item>
               </el-col>
             </el-row>
diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql
index 9f6c48c53e..71e2744e1a 100644
--- a/doc/databases/risk_center.sql
+++ b/doc/databases/risk_center.sql
@@ -961,7 +961,7 @@ CREATE TABLE `loan_solutions_otherPolicy`
     `otherPolicyInterest`     decimal(10, 2)       DEFAULT NULL COMMENT '其它融利息总额',
     `loanDownPay`             decimal(10, 2)       DEFAULT NULL COMMENT '融资首付',
     `loanAmountTotal`         decimal(10, 2)       DEFAULT NULL COMMENT '总贷款金额',
-    `period`                  int(32)              DEFAULT NULL COMMENT '期数',
+    `period`                  varchar(64)            DEFAULT NULL COMMENT '期数',
     `monthlyRepay`            decimal(10, 2)       DEFAULT NULL COMMENT '月还金额',
     `interest`                decimal(10, 2)       DEFAULT NULL COMMENT '利息总额',
     `returnTime`              varchar(64)          DEFAULT NULL COMMENT '预计首期还款日',