diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java
index 6de6af8bb5..8527d0cf69 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/CrmApplication.java
@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 })
 @EnableScheduling
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin","com.yxt.anrui.crm.fegin.as"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.base", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.messagecenter", "com.yxt.anrui.fin","com.yxt.anrui.crm.fegin.as","com.yxt.anrui.flowable","com.yxt.messagecenter"})
 public class CrmApplication {
 
     public static void main(String[] args) {
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java
index 413a808aa2..66a7e82011 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordRest.java
@@ -29,7 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.flowable.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -39,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecord;
 import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordQuery;
 import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordVo;
 import com.yxt.anrui.crm.api.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordDetailsVo;
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
index e68a9ef173..98284c3ead 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
@@ -65,7 +65,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApply;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
@@ -81,7 +80,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -112,11 +111,11 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
     private MessageListFeign messageListFeign;
     @Autowired
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
-    @Resource
+    @Autowired
     private FlowFeign flowFeign;
-    @Resource
+    @Autowired
     private FlowableFeign flowableFeign;
-    @Resource
+    @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private MessageFeign messageFeign;
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
index 12f6fe68a9..f3c145987a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
@@ -626,6 +626,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         ResultBean rb = ResultBean.fireFail();
         //保存还款记录
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Set<String> setMsg = new HashSet<>();
+        StringBuffer sb = new StringBuffer();
         if (!dto.isEmpty()) {
             for (RepaymentExcelInfo repaymentExcelInfo : dto) {
                 List<LoanRepaymentPlanDetails> planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(repaymentExcelInfo.getBankContractNo(), repaymentExcelInfo.getPeriod());
@@ -639,25 +641,44 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                             check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBankOther(planDetail.getSid());
                         }
                         if (StringUtils.isNotBlank(check)) {
-                            if (!check.equals("0")) {
-                                LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory();
-                                repaymentHistory.setBuckle("未申请");
-                                repaymentHistory.setBuckleKey("001");
-                                repaymentHistory.setScheduleSid(planDetail.getScheduleSid());
-                                repaymentHistory.setPlanDetailSid(planDetail.getSid());
-                                repaymentHistory.setReturnWay("直还");
-                                repaymentHistory.setReturnWayKey("01");
-                                try {
-                                    repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime()));
-                                } catch (ParseException e) {
-                                    e.printStackTrace();
-                                }
-                                BigDecimal realMoney = new BigDecimal(repaymentExcelInfo.getRealMoney());
-                                BigDecimal divide = realMoney.divide(new BigDecimal(planDetails.size()), 2, BigDecimal.ROUND_HALF_UP);
-                                repaymentHistory.setActualMoney(divide);
-                                repaymentHistory.setDataTime(new DateTime());
-                                baseMapper.insert(repaymentHistory);
+                            if (check.equals("0")) {
+                                setMsg.add("资方合同号" + planDetail.getBankContractNo() + "第" + planDetail.getPeriod() + "期");
+                            }
+                        }
+                    }
+                }
+            }
+            if (setMsg.size() > 0) {
+                for (String s : setMsg) {
+                    sb.append(s).append("、");
+                }
+                if (sb.length() > 0) {
+                    sb.delete(sb.length() - 1, sb.length());
+                }
+                sb.append("为非退还垫款导入直还数据，导入失败！");
+                return rb.setMsg(sb.toString());
+            } else {
+                for (RepaymentExcelInfo repaymentExcelInfo : dto) {
+                    List<LoanRepaymentPlanDetails> planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(repaymentExcelInfo.getBankContractNo(), repaymentExcelInfo.getPeriod());
+                    if (!planDetails.isEmpty()) {
+                        for (LoanRepaymentPlanDetails planDetail : planDetails) {
+                            LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory();
+                            repaymentHistory.setBuckle("未申请");
+                            repaymentHistory.setBuckleKey("001");
+                            repaymentHistory.setScheduleSid(planDetail.getScheduleSid());
+                            repaymentHistory.setPlanDetailSid(planDetail.getSid());
+                            repaymentHistory.setReturnWay("直还");
+                            repaymentHistory.setReturnWayKey("01");
+                            try {
+                                repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime()));
+                            } catch (ParseException e) {
+                                e.printStackTrace();
                             }
+                            BigDecimal realMoney = new BigDecimal(repaymentExcelInfo.getRealMoney());
+                            BigDecimal divide = realMoney.divide(new BigDecimal(planDetails.size()), 2, BigDecimal.ROUND_HALF_UP);
+                            repaymentHistory.setActualMoney(divide);
+                            repaymentHistory.setDataTime(new DateTime());
+                            baseMapper.insert(repaymentHistory);
                         }
                     }
                 }
@@ -806,7 +827,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     String isOther = loanRepaymentScheduleService.returnBankOrOtherBankByPlanSid(pSid).getData();
                     String reAdvances = "";
                     if (isOther.equals("0")) {
-                        reAdvances =   loanRepaymentPlanDetailsService.reAdvancesOrPaymentMoney(pSid);
+                        reAdvances = loanRepaymentPlanDetailsService.reAdvancesOrPaymentMoney(pSid);
                     } else if (isOther.equals("1")) {
                         reAdvances = loanRepaymentPlanDetailsService.reAdvancesOrPaymentMoneyOther(pSid);
                     }
@@ -1817,7 +1838,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
     }
 
 
-
     public List<RecordCountVo> exportStatisticsExcel(RepaymentStatisticsQuery pagerQuery) {
         QueryWrapper<LoanRepaymentHistory> qw = new QueryWrapper<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2304,6 +2324,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
     }
 
     public List<AppRepaymentHistoryRecord> selSchSidAndVinNo(String scheduleSid, String vinNo) {
-        return baseMapper.selSchSidAndVinNo(scheduleSid,vinNo);
+        return baseMapper.selSchSidAndVinNo(scheduleSid, vinNo);
     }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index 54953a809b..417f6ca9cf 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -974,7 +974,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     //设置认款月还为已转付
                     updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                     //推送财务凭证
-                    pushSettleVoucher(loanSettleApply,check,actualDeposit);
+                    pushSettleVoucher(loanSettleApply, check, actualDeposit);
                 }
                 baseMapper.updateById(loanSettleApply);
             } else {
@@ -1638,7 +1638,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     }
 
     //--------推送财务结清凭证------------------
-    private void pushSettleVoucher(LoanSettleApply loanSettleApply,int check,BigDecimal actualDeposit) {
+    private void pushSettleVoucher(LoanSettleApply loanSettleApply, int check, BigDecimal actualDeposit) {
         String sid = loanSettleApply.getSid();
         LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(sid);
         LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(sid);
@@ -2896,7 +2896,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         //设置认款月还为已转付
         updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
         //推送财务凭证
-        pushSettleVoucher(loanSettleApply,1,actualDeposit);
+        pushSettleVoucher(loanSettleApply, 1, actualDeposit);
         return rb.success();
     }
 
@@ -3313,6 +3313,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         ResultBean rb = ResultBean.fireFail();
         LoanSettleApply apply = fetchBySid(sid);
         LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(sid);
+//        LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(sid);
         LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(sid);
         if (null != apply) {
             BigDecimal amountAll = BigDecimal.ZERO;//推送资方结清款总数
@@ -3324,6 +3325,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             BigDecimal bbjDDMoney = BigDecimal.ZERO; //资方保证金抵顶
             BigDecimal sub = BigDecimal.ZERO; //资方保证金差额
             BigDecimal shouxufeiCW = new BigDecimal(shouxufei);
+//            // 资方未到期金额
+//            BigDecimal zfwdq = BigDecimal.ZERO;
+//            // 公司未到期金额
+//            BigDecimal gswdq = BigDecimal.ZERO;
             if (null != reduction) {
                 if (null != reduction.getNotDuePriceRelief()) {
                     companyRelief = reduction.getNotDuePriceRelief();
@@ -3341,7 +3346,18 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 if (null != bankCost.getLoanDeposit()) {
                     bbjDDMoney = bankCost.getLoanDeposit();
                 }
+//                if (null != bankCost.getNotDuePrice()) {
+//                    zfwdq = bankCost.getNotDuePrice();
+//                }
             }
+//            if (null != companyCost) {
+//                if (null != companyCost.getBankNotPrice()) {
+//                    gswdq = companyCost.getBankNotPrice();
+//                }
+//            }
+//            if (companyRelief.compareTo(BigDecimal.ZERO) == 0 && bankRelief.compareTo(BigDecimal.ZERO) == 0) {
+//                noRelief = gswdq.subtract(zfwdq);
+//            }
             sub = zfJQK.subtract(bbjDDMoney);
             amountAll = noRelief.add(companyRelief).add(bbjDDMoney).add(sub);
             if (zfJQK.compareTo(BigDecimal.ZERO) > 0) {
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
index a29201a1a2..dcb3142524 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply"})
 public class TerminalApplication {
 
     public static void main(String[] args) {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordFeign.java
index f3eedf4f0f..1ad91d6bdb 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordFeign.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventoryrecord/WmsInventoryRecordFeign.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date: 2024/3/7
  **/
 @FeignClient(
-        contextId = "yxt-wms-WmsInventoryBill",
+        contextId = "yxt-wms-WmsInventoryRecord",
         name = "yxt-wms",
         path = "apiadmin/inventory/wmsinventoryrecord")
 public interface WmsInventoryRecordFeign {