优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1793,7 +1793,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 fEntity.setFMaterialID(dto.getMaterialCode());
             } else if ("003".equals(dto.getMaterialTypeKey())) {
                 //物料编码
-                fEntity.setFMaterialID(dto.getMaterialCode().substring(dto.getMaterialCode().length() - 8) + "SZ");
+                fEntity.setFMaterialID(dto.getMaterialCode());
             }
             //仓库id
             fEntity.setFStockID("ARZSCK");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -509,6 +509,7 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         baseVehicleOut.setMaterialTypeKey("003");
         baseVehicleOut.setMaterialTypeValue("上装");
         baseVehicleOut.setMaterialSid(baseVehinstall.getSid());
+        baseVehicleOut.setCwCustomerNo(baseVehicleOutDetailsVo.getCwCustomerNo());
         //保存车辆出库单子表
         baseVehicleOutService.save(baseVehicleOut);
         //推送金蝶上装销售出库单

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -1410,6 +1410,36 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         financeForm52.setType(1);
         financeForm52.setBold(true);
         orderInfo.add(financeForm52);
+        FinanceForm financeForm53 = new FinanceForm();
+        financeForm53.setValue("现场询问客户车辆信息是否与订单一致：" + loanHomevisitInvestigateOrderDetailsVo.getCarConfirm());
+        financeForm53.setSpanSize(2);
+        orderInfo.add(financeForm53);
+        FinanceForm financeForm54 = new FinanceForm();
+        financeForm54.setValue("备注：" + loanHomevisitInvestigateOrderDetailsVo.getCarRemarks());
+        financeForm54.setSpanSize(2);
+        orderInfo.add(financeForm54);
+        FinanceForm financeForm55 = new FinanceForm();
+        financeForm55.setValue("金融方案信息确认");
+        financeForm55.setSpanSize(2);
+        financeForm55.setType(1);
+        financeForm55.setBold(true);
+        orderInfo.add(financeForm55);
+        FinanceForm financeForm56 = new FinanceForm();
+        financeForm56.setValue("现场询问客户金融方案信息是否与订单一致：" + loanHomevisitInvestigateOrderDetailsVo.getFinConfirm());
+        financeForm56.setSpanSize(2);
+        orderInfo.add(financeForm56);
+        FinanceForm financeForm57 = new FinanceForm();
+        financeForm57.setValue("备注：" + loanHomevisitInvestigateOrderDetailsVo.getFinRemarks());
+        financeForm57.setSpanSize(2);
+        orderInfo.add(financeForm57);
+        FinanceForm financeForm58 = new FinanceForm();
+        financeForm58.setValue("首付比例：" + loanHomevisitInvestigateOrderDetailsVo.getFinDownPay());
+        financeForm58.setSpanSize(2);
+        orderInfo.add(financeForm58);
+        FinanceForm financeForm59 = new FinanceForm();
+        financeForm59.setValue("备注：" + loanHomevisitInvestigateOrderDetailsVo.getFinDownPayRemarks());
+        financeForm59.setSpanSize(2);
+        orderInfo.add(financeForm59);
         loanHomeVisitInvestigateNewDetailsVo.setUserInfo(userInfo);
         loanHomeVisitInvestigateNewDetailsVo.setYYInfo(yYInfo);
         loanHomeVisitInvestigateNewDetailsVo.setTransInfo(transInfo);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -143,13 +143,25 @@ public class LoanHomeVisitInvestigateService {
 
     public ResultBean<AppLoanHomeVisitInvestigateDetailsVo> details(String sid) {
         ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateFeign.fetchDetailsBySid(sid).getData();
         LoanHomeVisitInvestigateNewDetailsVo loanHomeVisitInvestigateNewDetailsVo = loanHomevisitInvestigateFeign.details(sid).getData();
         AppLoanHomeVisitInvestigateDetailsVo appLoanHomeVisitInvestigateDetailsVo = new AppLoanHomeVisitInvestigateDetailsVo();
         BeanUtil.copyProperties(loanHomeVisitInvestigateNewDetailsVo,appLoanHomeVisitInvestigateDetailsVo);
         List<AppFinanceForm> orderInfo = appLoanHomeVisitInvestigateDetailsVo.getOrderInfo();
         for (AppFinanceForm appFinanceForm : orderInfo) {
-            appFinanceForm.setJumpPage(true);
-
+            if ("车辆信息确认".equals(appFinanceForm.getValue())){
+                appFinanceForm.setJumpPage(true);
+                CarModelVo orderPage1 = commonService.getOrder(loanHomevisitInvestigateDetailsVo.getSaleOrderSid()).getData();
+                AppLoanHomeVisitVo orderPage2 = new AppLoanHomeVisitVo();
+                BeanUtil.copyProperties(orderPage1,orderPage2);
+                appFinanceForm.setPluginPage(orderPage2);
+            }else if ("金融方案信息确认".equals(appFinanceForm.getValue())){
+                appFinanceForm.setJumpPage(true);
+                CarModelVo finPage1 = commonService.getLoanSolution(loanHomevisitInvestigateDetailsVo.getSaleOrderSid()).getData();
+                AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo();
+                BeanUtil.copyProperties(finPage1,finPage2);
+                appFinanceForm.setPluginPage(finPage2);
+            }
         }
         return rb.success().setData(appLoanHomeVisitInvestigateDetailsVo);
     }