销售订单合同模板调整

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -860,8 +860,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return url;
     }
 
-    private String getReceiveCar(Map<String, Object> map) {
+    private String getReceiveCar(Map<String, Object> map,AppOrderDetailsVo appOrderDetailsVo) {
         String url = "";
+        //查询销售订单的现车
+        AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
+        List<String> stringList = orderModelInfoVo.getVinList();
+        if (stringList.size() > 0) {
+            map.put("vinNo", String.join(",", stringList));
+        }
         String ftl = "receiveCar";
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
@@ -1642,7 +1648,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
             //接收车辆委托书
             Future<String> future4 = pool.submit(() -> {
-                return getReceiveCar(map);
+                return getReceiveCar(map,appOrderDetailsVo);
             });
             Future<String> future5 = pool.submit(() -> {
                 return getInvoicMessage(map, appOrderDetailsVo);
@@ -1660,17 +1666,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 return getMoneyFin(map, appOrderDetailsVo);
             });
             Future<String> future8 = null;
-            if("02".equals(appOrderDetailsVo.getInvoiceType())){
+            if(!"02".equals(appOrderDetailsVo.getInvoiceType())){
                 future8 = pool.submit(() -> {
                     return getCarContract(map, appOrderDetailsVo);
                 });
             }
             List<File> filesList = new ArrayList<>();
             //合并pdf文件
+            if(future8 != null){
                 if(StringUtils.isNotBlank(future8.get())){
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get());
                     filesList.add(file);
                 }
+            }
             if (StringUtils.isNotBlank(future4.get())) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
                 filesList.add(file);

anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl

@@ -1163,7 +1163,7 @@
                                     <w:sz w:val="28"/>
                                     <w:sz-cs w:val="28"/>
                                 </w:rPr>
-                                <w:t>${cat_index+1}</w:t>
+                                <w:t>${car_index+1}</w:t>
                             </w:r>
                         </w:p>
                     </w:tc>
@@ -1230,7 +1230,7 @@
                                     <w:sz w:val="28"/>
                                     <w:sz-cs w:val="28"/>
                                 </w:rPr>
-                                <w:t>$</w:t>
+                                <w:t></w:t>
                             </w:r>
                             <w:r>
                                 <w:rPr>

anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl

@@ -685,6 +685,7 @@
                         <w:rFonts w:hint="fareast"/>
                         <w:sz w:val="28"/>
                         <w:sz-cs w:val="28"/>
+                        <w:u w:val="single"/>
                     </w:rPr>
                     <w:t>   ${day!} </w:t>
                 </w:r>