From 12a928c89f63b703a2d8ee06aadc87e9eb3fe555 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 9 Feb 2023 18:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commoncontract/CommonContractService.java | 170 +++++++++++++++---
 .../main/resources/ftl/existingvehicles.ftl   |  37 +++-
 .../resources/ftl/existingvehicles_black.ftl  |  39 +++-
 .../src/main/resources/ftl/orderacar.ftl      |  39 +++-
 .../main/resources/ftl/orderacar_black.ftl    |  39 +++-
 .../BusDepositVehicleService.java             |   1 +
 .../bussalesorder/BusSalesOrderService.java   |  69 ++++---
 7 files changed, 312 insertions(+), 82 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index f92f0130fe..ffea6381a8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1648,17 +1648,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             return rb.setMsg(resultBean.getMsg());
         }
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
-        //ToDo:排产，需采购
-       /* if("排产".equals(appOrderDetailsVo.getOrderType())){
-            //根据分公司sid查询采购系统，并取第一个
-            List<BasePurchaseSystem> systemList = basePurchaseSystemService.selectByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
-            systemList.removeAll(Collections.singleton(null));
-            if(systemList.size()>0){
-                BasePurchaseSystem basePurchaseSystem = systemList.get(0);
-                appOrderDetailsVo.setPurchaseSystemName(basePurchaseSystem.getPurchaseSystemName());
-                appOrderDetailsVo.setPurchaseSystemSid(basePurchaseSystem.getDeptSid());
-            }
-        }*/
         //甲方
         String createOrgName = appOrderDetailsVo.getSalesOrg();
         //乙方
@@ -1683,11 +1672,152 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
         BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appOrderModelInfoVo.getConfigSid());
         String modelName1 = baseVehicleModelService.appendModelName(baseVehicleModel);
-        String modelName = "车型：" + baseVehicleModel.getVehicleAlias()+"。";
-        //配置：后桥/速比/轴距/悬架/鞍座/颜色/驾驶室/保险杠/燃料箱/导流罩/独立热源/缓速器/护轮罩/后视镜/轮胎/轮毂材质/空调/坐骑/多媒体/配置包
-        String configName = baseModelConfigService.configNameSpell(baseModelConfig);
-        String modelConfig = "配置：" + modelName1+"/"+configName + "。";
-        //上装
+        String modelName = "车型：";
+        StringBuilder modeNameValue = new StringBuilder();
+        //车型名称(小名)：系列+驱动+功能+空格+版本
+        if (StringUtils.isNotBlank(baseVehicleModel.getProductLineValue()) && !"-".equals(baseVehicleModel.getProductLineValue())){
+            modeNameValue.append(baseVehicleModel.getProductLineValue());
+        }
+        //驱动
+        if (StringUtils.isNotBlank(baseVehicleModel.getDriveFormValue()) && !"-".equals(baseVehicleModel.getDriveFormValue())){
+            modeNameValue.append(baseVehicleModel.getDriveFormValue());
+        }
+        //功能
+        if (StringUtils.isNotBlank(baseVehicleModel.getVehicleTypeValue()) && !"-".equals(baseVehicleModel.getVehicleTypeValue())){
+            modeNameValue.append(baseVehicleModel.getVehicleTypeValue());
+        }
+        //版本
+        if (StringUtils.isNotBlank(baseVehicleModel.getVehicleVersionValue()) && !"-".equals(baseVehicleModel.getVehicleVersionValue())){
+            modeNameValue.append(baseVehicleModel.getVehicleVersionValue());
+        }
+        modelName = modelName+modeNameValue.toString();
+        //车型全名称：发动机型号（空格）xxx马力+燃料+排放标准发动机、变速箱、缓速器、
+        // 后桥(若存在“桥”字样后不带“后桥”)、速比、轴距、悬架(若存在“悬架”字样后不带“悬架”)、
+        // 鞍座(若存在“鞍座”字样后不带“鞍座”)、燃料箱(若存在“油箱”字样后不带“燃料箱”）、轮胎(若存在“胎”字样后不带“轮胎”)、
+        // 轮毂材质、护轮罩。换行
+        //驾驶室+颜色驾驶室、导流罩、保险杠、后视镜、座椅、空调、独立热源、多媒体
+        StringBuilder modelAllName = new StringBuilder();
+        //发动机型号
+        if (StringUtils.isNotBlank(baseVehicleModel.getEngineTypeValue()) && !"-".equals(baseVehicleModel.getEngineTypeValue())){
+            modelAllName.append(baseVehicleModel.getEngineTypeValue());
+        }
+        //马力
+        if (StringUtils.isNotBlank(baseVehicleModel.getPowerValue()) && !"-".equals(baseVehicleModel.getPowerValue())){
+            modelAllName.append(baseVehicleModel.getPowerValue()).append("马力");
+        }
+        //燃料
+        if (StringUtils.isNotBlank(baseVehicleModel.getFuelTypeValue()) && !"-".equals(baseVehicleModel.getFuelTypeValue())){
+            modelAllName.append(baseVehicleModel.getFuelTypeValue());
+        }
+        //排放标准
+        if (StringUtils.isNotBlank(baseVehicleModel.getEmissionStandardValue()) && !"-".equals(baseVehicleModel.getEmissionStandardValue())){
+            modelAllName.append(baseVehicleModel.getEmissionStandardValue());
+        }
+        modelAllName.append("发动机");
+        //变速箱
+        if (StringUtils.isNotBlank(baseVehicleModel.getGearboxTypeValue()) && !"-".equals(baseVehicleModel.getGearboxTypeValue())){
+            modelAllName.append("、").append(baseVehicleModel.getGearboxTypeValue()).append("变速箱");
+        }
+        //缓速器
+        if (StringUtils.isNotBlank(baseModelConfig.getSlowMachine()) && !"-".equals(baseModelConfig.getSlowMachine())) {
+            modelAllName.append("、").append(baseModelConfig.getSlowMachine());
+        }
+        //后桥
+        if (StringUtils.isNotBlank(baseModelConfig.getRearAxleValue()) && !"-".equals(baseModelConfig.getRearAxleValue())) {
+            modelAllName.append("、").append(baseModelConfig.getRearAxleValue());
+            if(!baseModelConfig.getRearAxleValue().contains("桥")){
+                modelAllName.append("后桥");
+            }
+        }
+        //速比
+        if (StringUtils.isNotBlank(baseModelConfig.getRearAxleRatio()) && !"-".equals(baseModelConfig.getRearAxleRatio())) {
+            modelAllName.append("、").append(baseModelConfig.getRearAxleRatio()).append("速比");
+        }
+        //轴距
+        if (StringUtils.isNotBlank(baseModelConfig.getWheelbase()) && !"-".equals(baseModelConfig.getWheelbase())) {
+            modelAllName.append("、").append(baseModelConfig.getWheelbase()).append("mm轴距");
+        }
+        //悬架
+        if (StringUtils.isNotBlank(baseModelConfig.getSuspension()) && !"-".equals(baseModelConfig.getSuspension())) {
+            modelAllName.append("、").append(baseModelConfig.getSuspension());
+            if(!baseModelConfig.getSuspension().contains("悬架")){
+                modelAllName.append("悬架");
+            }
+        }
+        //鞍座
+        if (StringUtils.isNotBlank(baseModelConfig.getSaddle()) && !"-".equals(baseModelConfig.getSaddle())) {
+            modelAllName.append("、").append(baseModelConfig.getSaddle());
+            if(!baseModelConfig.getSaddle().contains("鞍座")){
+                modelAllName.append("鞍座");
+            }
+        }
+        //燃料箱
+        if (StringUtils.isNotBlank(baseModelConfig.getFuelTank()) && !"-".equals(baseModelConfig.getFuelTank())) {
+            modelAllName.append("、").append(baseModelConfig.getFuelTank());
+            if(!baseModelConfig.getFuelTank().contains("油箱")){
+                modelAllName.append("燃料箱");
+            }
+        }
+        //轮胎
+        if (StringUtils.isNotBlank(baseModelConfig.getTireSize()) && !"-".equals(baseModelConfig.getTireSize())) {
+            modelAllName.append("、").append(baseModelConfig.getTireSize());
+            if(!baseModelConfig.getTireSize().contains("胎")){
+                modelAllName.append("轮胎");
+            }
+        }
+        //轮毂材质
+        if (StringUtils.isNotBlank(baseModelConfig.getHubMaterial()) && !"-".equals(baseModelConfig.getHubMaterial())) {
+            modelAllName.append("、").append(baseModelConfig.getHubMaterial());
+        }
+        //护轮罩
+        if (StringUtils.isNotBlank(baseModelConfig.getTireCover()) && !"-".equals(baseModelConfig.getTireCover())) {
+            modelAllName.append("、").append(baseModelConfig.getTireCover());
+        }
+//        modelAllName.append("<w:p></w:p>");
+        StringBuilder modelAllName2 = new StringBuilder();
+        modelAllName2.append("\t");
+        //驾驶室
+        if (StringUtils.isNotBlank(baseModelConfig.getSpecification()) && !"-".equals(baseModelConfig.getSpecification())) {
+            modelAllName2.append(baseModelConfig.getSpecification());
+        }
+        //颜色
+        if (StringUtils.isNotBlank(baseModelConfig.getCarColor()) && !"-".equals(baseModelConfig.getCarColor())) {
+            modelAllName2.append(baseModelConfig.getCarColor()).append("驾驶室");
+        }
+        //导流罩
+        if (StringUtils.isNotBlank(baseModelConfig.getBaffleModel()) && !"-".equals(baseModelConfig.getBaffleModel())) {
+            modelAllName2.append("、").append(baseModelConfig.getBaffleModel());
+        }
+        //保险杠
+        if (StringUtils.isNotBlank(baseModelConfig.getBumper()) && !"-".equals(baseModelConfig.getBumper())) {
+            modelAllName2.append("、").append(baseModelConfig.getBumper());
+        }
+        //后视镜
+        if (StringUtils.isNotBlank(baseModelConfig.getRearViewMirror()) && !"-".equals(baseModelConfig.getRearViewMirror())) {
+            modelAllName2.append("、").append(baseModelConfig.getRearViewMirror());
+        }
+        //座椅
+        if (StringUtils.isNotBlank(baseModelConfig.getSeat()) && !"-".equals(baseModelConfig.getSeat())) {
+            modelAllName2.append("、").append(baseModelConfig.getSeat());
+            if(!baseModelConfig.getSeat().contains("椅")){
+                modelAllName2.append("座椅");
+            }
+        }
+        //空调
+        if (StringUtils.isNotBlank(baseModelConfig.getAirConditioner()) && !"-".equals(baseModelConfig.getAirConditioner())) {
+            modelAllName2.append("、").append(baseModelConfig.getAirConditioner());
+        }
+        //独立热源
+        if (StringUtils.isNotBlank(baseModelConfig.getIndependentSources()) && !"-".equals(baseModelConfig.getIndependentSources())) {
+            modelAllName2.append("、").append(baseModelConfig.getIndependentSources());
+        }
+        //多媒体
+        if (StringUtils.isNotBlank(baseModelConfig.getMultimedia()) && !"-".equals(baseModelConfig.getMultimedia())) {
+            modelAllName2.append("、").append(baseModelConfig.getMultimedia());
+        }
+        modelAllName2.append("。");
+        String modelConfig = "配置：" +modelAllName.toString() + "。";
+        //上装：外廓尺寸+颜色+上装名称、板材厚度、板材材质、篷布滑道、冷藏冷机、自卸液压盖板、底板加热、更多配置
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();
             String topName = appOrderDetailsVo.getTopMessage();
@@ -1767,6 +1897,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 return rb.setMsg("请与出纳人员联系完善开票信息");
             }
         }
+        map.put("modelConfigs",modelAllName2.toString());
         map.put("customerName", customerName);
         map.put("mobile", mobile);
         map.put("idNo", idNo);
@@ -1792,7 +1923,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
             if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
-               /* Future<String> future1 = pool.submit(() -> {
+                /*Future<String> future1 = pool.submit(() -> {
                     return genCarSaleContract(dto, map, appOrderDetailsVo);
                 });
                 Future<String> future1_2 = pool.submit(() -> {
@@ -2090,16 +2221,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         //获取分公司sid
         ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
         ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
-//        String orgCode = resultBean1.getData().getOrgCode();
         String orgCode = resultBean1.getData().getOrgAbbre();
         //根据车型sid查询品牌简称
         String brandCode = baseVehicleBrandService.selectShortName(modelSid);
         String date = DateUtil.format(DateUtil.date(), "yyyyMM");
         String bill = brandCode + orgCode + date;
-       /* BillNo b = new BillNo();
-        b.setOrgCode(orgCode);
-        b.setBillType(BillTypeEnum.XSDD.getBillType());
-        String bill = Rule.getBill(b);*/
         int i = baseMapper.selectNum(bill);
         String billNo = Rule.getBillNo(bill, i);
         return billNo;
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
index 57fd867b9c..a38a59e7b7 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
@@ -910,7 +910,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -933,7 +933,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -952,11 +952,34 @@
                             </w:r>
                         </w:p>
                         </#if>
+                        <#if modelConfigs??>
+                            <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:widowControl/>
+                                    <w:spacing w:line="240" w:line-rule="exact"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                    <w:t>${modelConfigs!}</w:t>
+                                </w:r>
+                            </w:p>
+                        </#if>
                         <#if topName??>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -1002,7 +1025,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
                                     <wx:font wx:val="宋体"/>
@@ -1025,7 +1048,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -1048,7 +1071,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -1072,7 +1095,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
index 4ed6204ce3..f4f3d9f322 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
+++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
@@ -910,7 +910,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -933,7 +933,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -952,11 +952,34 @@
                             </w:r>
                         </w:p>
                         </#if>
+                        <#if modelConfigs??>
+                            <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:widowControl/>
+                                    <w:spacing w:line="240" w:line-rule="exact"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                    <w:t>${modelConfigs!}</w:t>
+                                </w:r>
+                            </w:p>
+                        </#if>
                         <#if topName??>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -979,7 +1002,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -1002,7 +1025,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
                                     <wx:font wx:val="宋体"/>
@@ -1025,7 +1048,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -1048,7 +1071,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
@@ -1072,7 +1095,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
                                     <wx:font wx:val="宋体"/>
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 1cc2c83b97..98b11ffd3b 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
@@ -1025,7 +1025,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1049,7 +1049,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1069,11 +1069,34 @@
                             </w:r>
                         </w:p>
                         </#if>
+                        <#if modelConfigs??>
+                            <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:widowControl/>
+                                    <w:spacing w:line="240" w:line-rule="exact"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                    <w:t>${modelConfigs!}</w:t>
+                                </w:r>
+                            </w:p>
+                        </#if>
                         <#if topName??>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1097,7 +1120,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1121,7 +1144,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
@@ -1145,7 +1168,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1169,7 +1192,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
@@ -1194,7 +1217,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
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 2eb00280cd..4e98afa949 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
@@ -1025,7 +1025,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1049,7 +1049,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1069,11 +1069,34 @@
                             </w:r>
                         </w:p>
                         </#if>
+                        <#if modelConfigs??>
+                            <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                                <w:pPr>
+                                    <w:widowControl/>
+                                    <w:spacing w:line="240" w:line-rule="exact"/>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                </w:pPr>
+                                <w:r>
+                                    <w:rPr>
+                                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
+                                        <wx:font wx:val="宋体"/>
+                                        <w:sz w:val="18"/>
+                                        <w:sz-cs w:val="20"/>
+                                    </w:rPr>
+                                    <w:t>${modelConfigs!}</w:t>
+                                </w:r>
+                            </w:p>
+                        </#if>
                         <#if topName??>
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1097,7 +1120,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1121,7 +1144,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
@@ -1145,7 +1168,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@@ -1169,7 +1192,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
@@ -1194,7 +1217,7 @@
                         <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                             <w:pPr>
                                 <w:widowControl/>
-                                <w:spacing w:line="360" w:line-rule="exact"/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
                                 <w:jc w:val="left"/>
                                 <w:rPr>
                                     <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
index 0d382320ec..df10f620b1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
@@ -254,6 +254,7 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         vo.setCustomerName(appCrmCustomerTempInfoVo.getName());//客户名称
+        vo.setCustomerSid(query.getCustomerSid());
         vo.setMobile(appCrmCustomerTempInfoVo.getMobile());//手机号
         vo.setStaffName(sysUserVo.getName());//销售专员
         vo.setDepartmentName(data.getName());//部门名称
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 135409e0b3..6d48e7fd7f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -1923,13 +1923,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         for (AppNowCarListVo car : appNowCarList) {
             String vinNo = car.getVin();
             if (!vinNoList.contains(vinNo)) {
-                log.info("=====车架号为"+vinNo+"的现车已发生变化");
+                log.info("=====车架号为" + vinNo + "的现车已发生变化");
                 isCheck = true;
                 break;
             }
             String topSid = vinNoMap.get(vinNo).toString();
             if (!topSid.equals(car.getTopSid())) {
-                log.info("=====车架号为"+vinNo+"的现车的上装已发生变化");
+                log.info("=====车架号为" + vinNo + "的现车的上装已发生变化");
                 isCheck = true;
                 break;
             }
@@ -1951,11 +1951,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             String orderId = order.getOrderId();
             if (orderIdMap.containsKey(orderId)) {
                 if (Integer.parseInt(orderIdMap.get(orderId).toString()) == 0 || Integer.parseInt(orderIdMap.get(orderId).toString()) < Integer.parseInt(order.getSelectNum())) {
-                    if(Integer.parseInt(orderIdMap.get(orderId).toString()) == 0){
-                        log.info("======"+orderId+"上装已发生变化");
+                    if (Integer.parseInt(orderIdMap.get(orderId).toString()) == 0) {
+                        log.info("======" + orderId + "上装已发生变化");
                     }
-                    if(Integer.parseInt(orderIdMap.get(orderId).toString()) < Integer.parseInt(order.getSelectNum())){
-                        log.info("======"+orderId+"数量已发生变化");
+                    if (Integer.parseInt(orderIdMap.get(orderId).toString()) < Integer.parseInt(order.getSelectNum())) {
+                        log.info("======" + orderId + "数量已发生变化");
                     }
                     isCheck = true;
                     break;
@@ -2826,24 +2826,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
             String topMessage = "";
-            if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
-                topMessage = topMessage + busSalesOrderMakeup.getTopName();
-            }
-            //委改方式
-            if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefitMethod())) {
-                topMessage = topMessage + " " + busSalesOrderMakeup.getRefitMethod();
-            }
-            //委改厂
-            if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefitFactory())) {
-                topMessage = topMessage + " " + busSalesOrderMakeup.getRefitFactory();
-            }
             //外廓尺寸
             String sizeMessage = "";
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeLong())) {
-                sizeMessage = "外廓尺寸" + busSalesOrderMakeup.getSizeLong() + "mm";
+                sizeMessage = busSalesOrderMakeup.getSizeLong();
             }
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeWide())) {
-                sizeMessage = sizeMessage + "*" + busSalesOrderMakeup.getSizeWide() + "mm";
+                sizeMessage = sizeMessage + "*" + busSalesOrderMakeup.getSizeWide();
             }
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeHigh())) {
                 sizeMessage = sizeMessage + "*" + busSalesOrderMakeup.getSizeHigh() + "mm";
@@ -2851,25 +2840,47 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (StringUtils.isNotBlank(sizeMessage)) {
                 topMessage = topMessage + " " + sizeMessage;
             }
+            //颜色
+            if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
+                topMessage = topMessage  + busSalesOrderMakeup.getColor();
+            }
+            if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
+                topMessage = topMessage + busSalesOrderMakeup.getTopName();
+            }
             //板材厚度
             String ssMessage = "";
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())) {
-                ssMessage = "板材厚度" + busSalesOrderMakeup.getThicknessBottom() + "mm";
+                ssMessage = "底" + busSalesOrderMakeup.getThicknessBottom() + "mm";
             }
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())) {
-                ssMessage = ssMessage + "*" + busSalesOrderMakeup.getThicknessEdge() + "mm";
+                ssMessage = ssMessage + "边" + busSalesOrderMakeup.getThicknessEdge() + "mm";
             }
             if (StringUtils.isNotBlank(ssMessage)) {
-                topMessage = topMessage + " " + ssMessage;
+                topMessage = topMessage + "、" + ssMessage;
             }
             if (StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())) {
-                topMessage = topMessage + " " + busSalesOrderMakeup.getPlateMaterial();
+                topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
+            }
+            //篷布滑道
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide())&& !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())){
+                topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
+            }
+            //冷藏冷机
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())){
+                topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
+            }
+            //自卸液压盖板
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl())&& !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())){
+                topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
+            }
+            //底板加热
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating())&& !"-".equals(busSalesOrderMakeup.getFloorHeating())){
+                topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
+            }
+            //更多配置
+            if(StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig())&& !"-".equals(busSalesOrderMakeup.getMoreConfig())){
+                topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
             }
-            //公告型号
-            //其他配置
-            /*if(StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig())){
-                topMessage = topMessage+busSalesOrderMakeup.getMoreConfig();
-            }*/
             vo.setTopMessage(topMessage);
         }
         /***************************主车优惠***************************************/
@@ -3720,7 +3731,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
         ResultBean resultBean = complete(bv);
         if (resultBean.getSuccess()) {
-            if(BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType())){
+            if (BusSalesOrderConstantUtils.TypeEnum.PRODUCTION_SCHEDULING.getCode().equals(busSalesOrder.getType())) {
                 //更新销售订单的采购系统
                 //根据销售订单sid更新采购系统sid和采购系统名称
                 String purchaseSystemName = orderFlowableQuery.getPurchaseSystemName();