diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl index 9c8bb2042a..d0bd1e6aa8 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl @@ -1211,7 +1211,7 @@ - 户籍/注册地址 + 地址 @@ -1272,6 +1272,50 @@ + + + + + + + + + 联系电话： + + + + + + + + + + <#if phone??> + ${phone!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + @@ -1504,30 +1548,6 @@ - <#if trailerName??> - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - <#if remarks??> @@ -1552,6 +1572,106 @@ + <#if trailerName1??> + + + + + + + + + + + + + + + + + + + + + ${trailerName1!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice1!} + + + + <#if trailerName2??> + + + + + + + + + + + + + + + + + + + + + ${trailerName2!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice2!} + + + <#if discountDetail??> @@ -2529,7 +2649,7 @@ - 同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + 同发生争议协商解决，协商不成向甲方住所地人民法院起诉解决。 @@ -2561,7 +2681,7 @@ - 、本合同双方签字或盖章之时生效。 + 、本协议自双方签字或盖章之日起生效。 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl index 4aa78fbd79..ddec373cfc 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar_black.ftl @@ -1201,7 +1201,7 @@ - 户籍/注册地址 + 地址 @@ -1257,6 +1257,50 @@ + + + + + + + + + 联系电话： + + + + + + + + + + <#if phone??> + ${phone!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + @@ -1489,30 +1533,6 @@ - <#if trailerName??> - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - <#if remarks??> @@ -1537,6 +1557,106 @@ + <#if trailerName1??> + + + + + + + + + + + + + + + + + + + + + ${trailerName1!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice1!} + + + + <#if trailerName2??> + + + + + + + + + + + + + + + + + + + + + ${trailerName2!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice2!} + + + <#if discountDetail??> @@ -2514,7 +2634,7 @@ - 同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + 同发生争议协商解决，协商不成向甲方住所地人民法院起诉解决。 @@ -2546,7 +2666,7 @@ - 、本合同双方签字或盖章之时生效。 + 、本协议自双方签字或盖章之日起生效。 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl index 6473376455..8c2b0ba8e3 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl @@ -1283,7 +1283,7 @@ - 户籍/注册地址 + 地址 @@ -1339,6 +1339,50 @@ + + + + + + + + + 联系电话： + + + + + + + + + + <#if phone??> + ${phone!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + @@ -1563,30 +1607,6 @@ - <#if trailerName??> - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - <#if remarks??> @@ -1611,6 +1631,106 @@ + <#if trailerName1??> + + + + + + + + + + + + + + + + + + + + + ${trailerName1!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice1!} + + + + <#if trailerName2??> + + + + + + + + + + + + + + + + + + + + + ${trailerName2!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice2!} + + + <#if discountDetail??> @@ -2426,7 +2546,7 @@ - 同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + 同发生争议协商解决，协商不成向甲方住所地人民法院起诉解决。 @@ -2458,7 +2578,7 @@ - 、本合同双方签字或盖章之时生效。 + 、本协议自双方签字或盖章之日起生效。 diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl index a02b1d64eb..f410976648 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl @@ -1281,7 +1281,7 @@ - 户籍/注册地址 + 地址 @@ -1336,6 +1336,50 @@ + + + + + + + + + 联系电话： + + + + + + + + + + <#if phone??> + ${phone!} + <#else> + + + + + + + + + + + + + + + + + + + + + + + @@ -1560,30 +1604,6 @@ - <#if trailerName??> - - - - - - - - - - - - - - - - - - - ${trailerName!} - - - <#if remarks??> @@ -1608,6 +1628,106 @@ + <#if trailerName1??> + + + + + + + + + + + + + + + + + + + + + ${trailerName1!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice1!} + + + + <#if trailerName2??> + + + + + + + + + + + + + + + + + + + + + ${trailerName2!} + + + + + + + + + + + + + + + + + + + + + + + ${trailerNumAndPrice2!} + + + <#if discountDetail??> @@ -2423,7 +2543,7 @@ - 同发生争议协商解决，协商不成向甲方所在地人民法院起诉解决。 + 同发生争议协商解决，协商不成向甲方住所地人民法院起诉解决。 @@ -2455,7 +2575,7 @@ - 、本合同双方签字或盖章之时生效。 + 、本协议自双方签字或盖章之日起生效。 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/pom.xml b/anrui-riskcenter/anrui-riskcenter-biz/pom.xml index 9819173d34..575bc97b38 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/pom.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/pom.xml @@ -15,6 +15,11 @@ 0.0.1 + + com.yxt.anrui.scm + anrui-scm-api + 0.0.1-SNAPSHOT + com.yxt.anrui.fin anrui-fin-api diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java index ec70a4e25e..8c256eda4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; }) @EnableDiscoveryClient @EnableScheduling -@EnableFeignClients(basePackages = {"com.yxt.anrui.fin","com.yxt.anrui.portal","com.yxt.anrui.buscenter","com.yxt.messagecenter","com.yxt.anrui.crm","com.yxt.anrui.base","com.yxt.anrui.flowable"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.fin","com.yxt.anrui.portal","com.yxt.anrui.buscenter","com.yxt.messagecenter","com.yxt.anrui.crm","com.yxt.anrui.base","com.yxt.anrui.flowable","com.yxt.anrui.scm"}) public class RiskCenterApplication { public static void main(String[] args) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java index eecf4e5793..b983c33238 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java @@ -58,6 +58,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign; +import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; @@ -88,6 +89,8 @@ import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevis import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoService; import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.utils.TransformMoney; import com.yxt.common.base.utils.WordConvertUtils; @@ -177,6 +180,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanHomevisitPrepQuery query = pq.getParams(); @@ -292,7 +297,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByOrderSidAndDkrSid(loanHomevisitPrep.getSaleOrderSid(), loanHomevisitPrep.getSaleOrderBorrowerSid()).getData(); @@ -482,7 +487,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData(); //查询金融方案中挂车信息 List cljszcghtUrls = new ArrayList<>(); - if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()){ + if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()) { //生成车辆及上装采购合同 cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey); } @@ -573,7 +578,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService - + @@ -942,13 +942,13 @@ w:cs="宋体"/> - 车辆型号 + 颜 色 - + @@ -978,13 +978,13 @@ - ${xh!} + ${ys!} - + @@ -1008,13 +1008,13 @@ w:cs="宋体"/> - 颜 色 + 车辆型号 - + @@ -1044,7 +1044,7 @@ - ${ys!} + ${xh!} @@ -1101,7 +1101,8 @@ - + + @@ -1125,14 +1126,13 @@ w:cs="宋体"/> - 车 架 号 + 发动机号 - - + @@ -1156,7 +1156,7 @@ w:cs="宋体"/> - 发动机号 + 车 架 号 @@ -1219,7 +1219,8 @@ - + + @@ -1234,10 +1235,8 @@ - - - + @@ -1250,14 +1249,13 @@ - ${ls.vinNo!} + ${ls.fdjNo!} - - + @@ -1272,8 +1270,10 @@ + + - + @@ -1286,7 +1286,7 @@ - ${ls.fdjNo!} + ${ls.vinNo!} @@ -1415,105 +1415,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${y?c} - - - - - - - - - - 年 - - - - - - - - - - - - - ${m!} - - - - - - - - - - 月 - - - - - - - - - - - - - ${d!} - - - - - - - - - - 日 - -