问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java

@@ -112,5 +112,8 @@ public interface BusVehicleApplyFeign {
     @ResponseBody
     public ResultBean assignTask(@RequestBody AppBusVehicleApplyDelegateQuery query);
 
-
+    @ApiOperation("根据排产编号查询")
+    @PostMapping("/getBillNo")
+    @ResponseBody
+    ResultBean<BusVehicleApply> getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java

@@ -121,4 +121,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
     public ResultBean assignTask(AppBusVehicleApplyDelegateQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<BusVehicleApply> getBillNo(String pcApplicationCode) {
+        return null;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java

@@ -133,6 +133,13 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
         return busVehicleApplyService.assignTask(query);
     }
 
+    @Override
+    public ResultBean<BusVehicleApply> getBillNo(String pcApplicationCode) {
+        ResultBean rb = ResultBean.fireFail();
+        BusVehicleApply busVehicleApply = busVehicleApplyService.selectByCode(pcApplicationCode);
+        return rb.success().setData(busVehicleApply);
+    }
+
 /*    @Override
     public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
         return busVehicleApplyService.shareBusVehicleApply(shareQuery);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -553,7 +553,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         }
         //合并pdf文件
         if (filesList.size() > 0) {
-            String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + ".pdf";
+            String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+            long seconds = System.currentTimeMillis();
+            String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + "_" + dateStr + seconds + ".pdf";
             try {
                 File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
             } catch (Exception e) {
@@ -1246,11 +1248,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         } else {
             map.put("pj", "□");
         }
-        //融资金额
-        map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
         List<String> urls = new ArrayList<>();
         if (conSetUpKey.equals("001")) {
             for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
+                //融资金额
+                map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
                 //保证金款项
                 map.put("bondAmounts", solutionsDetailsVo.getBondAmounts());
                 //车辆落户保证金
@@ -1298,6 +1300,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 urls.add(pdfName);
             }
         } else if (conSetUpKey.equals("002")) {
+            //融资金额
+            map.put("downPayMoney", new BigDecimal(solutionsDetailsVo.getLoanAmountTotal()).multiply(new BigDecimal(salesOrderVehicles.size())));
             //保证金款项
             map.put("bondAmounts", new BigDecimal(solutionsDetailsVo.getBondAmounts()).multiply(new BigDecimal(salesOrderVehicles.size())));
             //车辆落户保证金

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -109,6 +109,9 @@ public class ScmApplyInboundVo implements Vo {
     @ApiModelProperty("内部编码")
     private String insideCode;
 
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    
 	@ApiModelProperty("厂家发车日期")
     private String departureDate;
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@@ -20,6 +21,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
@@ -30,6 +32,7 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -132,8 +135,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
-    private ScmApplyInboundQueryService scmApplyInboundQueryService;
-    @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
 
     public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
@@ -262,9 +263,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                     vinNo = vinNo.trim();
                     vinNo = vinNo.replace(" ", "");
                     if (vinNo.length() != 17) {
-                        if (vinNo.length() != 8) {
-                            return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
-                        }
+                        return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
                     }
                 }
             }
@@ -363,6 +362,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         }
         vo.setVehicleList(list);
         vo.setScmFiles(scmFileVos);
+        BusVehicleApply busVehicleApply = busVehicleApplyFeign.getBillNo(scmApplyInbound.getPcApplicationCode()).getData();
+        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(busVehicleApply.getOrgDeptSid()).getData();
+        vo.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
         return vo;
     }
 
@@ -1027,7 +1029,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        if (StringUtils.isBlank(dto.getOrgPriceDate())){
+        if (StringUtils.isBlank(dto.getOrgPriceDate())) {
             return new ResultBean().fail().setMsg("公司入库日期不能为空");
         }
         /*int vinCount = 0;