Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java

@@ -53,6 +53,10 @@ public interface BusVehicleApplyDetailFeign {
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<BusVehicleApplyDetailVo> fetchSid(@PathVariable("sid") String sid);
 
+    @ApiOperation("根据厂家采购sid、车型sid、配置sid查询车辆型号")
+    @GetMapping("/fetchVehNoByMMCSid/{mainSid}/{modelSid}/{configSid}")
+    public ResultBean<String> fetchVehNoByMMCSid(@PathVariable("mainSid") String mainSid,@PathVariable("modelSid") String modelSid,@PathVariable("configSid") String configSid);
+
     @ApiOperation("查询车型sid")
     @GetMapping("/selModel/{sid}")
     public ResultBean<BusVehicleApplyDetailVo> selModel(@PathVariable("sid") String sid);

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java

@@ -50,6 +50,11 @@ public class BusVehicleApplyDetailFeignFallback implements BusVehicleApplyDetail
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<BusVehicleApplyDetailVo> selModel(String sid) {
 		return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -685,6 +685,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
         finPaymentrecordDto.setApplySid(bv.getBusinessSid());
         finPaymentrecordDto.setCreateBySid(booad.getCreateBySid());
+        finPaymentrecordDto.setUpdateBySid(booad.getCreateBySid());
         //付款单位sid
         finPaymentrecordDto.setPayCompanySid(booad.getUseOrgSid());
         //"付款类别，1付款/2退款"
@@ -704,12 +705,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             finPaymentrecordDto.setReceiveBankAccount(booad.getBankAccount());
             finPaymentrecordDto.setReceiveBank(booad.getDepositBankName());
             finPaymentrecordDto.setReceiveCompany(booad.getPurchasingUnitName());
-            finPaymentrecordDto.setRemarks("外采车款");
+            finPaymentrecordDto.setRemarks(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks() + costTitleValue);
         } else if (costTitleKey.equals(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode())) {
             finPaymentrecordDto.setReceiveBankAccount(booad.getModelBankAccount());
             finPaymentrecordDto.setReceiveBank(booad.getModelBankName());
             finPaymentrecordDto.setReceiveCompany(booad.getModelAccountName());
-            finPaymentrecordDto.setRemarks("外采订金");
+            finPaymentrecordDto.setRemarks(ManPurOrderType.ManOrderType.WC_ORDER.getRemarks() + costTitleValue);
         }
         //金额
         if (costTitleKey.equals(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2677,6 +2677,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getSupplierName())) {
             baseVehicle.setSupplierName(dto.getSupplierName());
         }
+        if (StringUtils.isNotBlank(dto.getVehMark())) {
+            baseVehicle.setVehMark(dto.getVehMark());
+        }
     }
 
     public void copyBeanToBean(BaseVehicle dto, BaseVehicle baseVehicle) {
@@ -2842,6 +2845,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getSupplierName())) {
             baseVehicle.setSupplierName(dto.getSupplierName());
         }
+        if (StringUtils.isNotBlank(dto.getVehMark())) {
+            baseVehicle.setVehMark(dto.getVehMark());
+        }
     }
 
     /**

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java

@@ -86,4 +86,6 @@ public interface BusVehicleApplyDetailMapper extends BaseMapper<BusVehicleApplyD
      * @return
      */
     List<AppVehicleApplyListVo> getVehicleApply(String sid);
+
+    List<String> fetchVehNoByMMCSid(@Param("mainSid") String mainSid,@Param("modelSid") String modelSid,@Param("configSid") String configSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@@ -5,16 +5,16 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo">
         SELECT bvad.applySid,
-               bvad.vehicleSid,
-               bvad.vehicleName,
-               bvad.configSid,
-               bvad.actualQuantity
-                ,
-               bvad.state,
-               bvad.saleGuPrice,
-               bva.brand
+        bvad.vehicleSid,
+        bvad.vehicleName,
+        bvad.configSid,
+        bvad.actualQuantity
+        ,
+        bvad.state,
+        bvad.saleGuPrice,
+        bva.brand
         FROM bus_vehicle_apply_detail bvad
-                 left join bus_vehicle_apply bva on bvad.applySid = bva.sid
+        left join bus_vehicle_apply bva on bvad.applySid = bva.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -36,27 +36,29 @@
     <select id="applyPage" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo">
         select bo.sid linkSid, bo.orderNo linkNo, bo.orderDate linkText, bo.platformNo, bo.lockingNum
         from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply bv on bd.applySid = bv.sid
-                 left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
-            ${ew.customSqlSegment}
+                     left join bus_vehicle_apply bv on bd.applySid = bv.sid
+                     left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+                ${ew.customSqlSegment}
     </select>
 
     <select id="selectOrderCount" resultType="com.yxt.anrui.base.api.busvehicleorder.OrderListVo">
         select bo.platformNo, bo.lockingNum
         from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply bv on bd.applySid = bv.sid
-                 left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
-            ${ew.customSqlSegment}
+                     left join bus_vehicle_apply bv on bd.applySid = bv.sid
+                     left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+                ${ew.customSqlSegment}
     </select>
 
     <select id="getAppApplyList" resultType="com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo">
         select bo.sid, bo.orderNo orderId, bo.orderDate date, bo.platformNo as totalNum, bo.lockingNum
         from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply bv on bd.applySid = bv.sid
-                 left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+                left join bus_vehicle_apply bv
+        on bd.applySid = bv.sid
+                left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
         where bd.vehicleSid = #{modelSid}
           and bd.configSid = #{configSid}
-          and length(bo.platformNo) > 0
+          and length (bo.platformNo)
+            > 0
     </select>
 
     <select id="getVehicleApply" resultType="com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo">
@@ -72,7 +74,15 @@
                bsz.sid topSid,
                bd.actualPay
         from bus_vehicle_apply_detail bd
-                 left join bus_vehicle_apply_sz bsz on bsz.detailsSid = bd.sid
+                     left join bus_vehicle_apply_sz bsz on bsz.detailsSid = bd.sid
         where bd.applySid = #{sid}
     </select>
+
+    <select id="fetchVehNoByMMCSid" resultType="java.lang.String">
+        SELECT vehicleNo
+        FROM bus_vehicle_apply_detail
+        WHERE applySid = #{mainSid}
+          AND vehicleSid = #{modelSid}
+          AND configSid = #{configSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java

@@ -76,6 +76,11 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<String> fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) {
+        return busVehicleApplyDetailService.fetchVehNoByMMCSid(mainSid,modelSid,configSid);
+    }
+
     @Override
     public ResultBean<BusVehicleApplyDetailVo> selModel(String sid) {
         BusVehicleApplyDetailVo vo = busVehicleApplyDetailService.selModel(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -274,4 +274,11 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
     public List<AppVehicleApplyListVo> getVehicleApply(String sid) {
         return baseMapper.getVehicleApply(sid);
     }
+
+    public ResultBean<String> fetchVehNoByMMCSid(String mainSid, String modelSid, String configSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.fetchVehNoByMMCSid(mainSid, modelSid, configSid);
+        String vehicleNo = stringList.get(0);
+        return rb.success().setData(vehicleNo);
+    }
 }

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

@@ -757,27 +757,27 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         if ("现车".equals(appOrderDetailsVo.getOrderType())) {
             //获取模板
 //            file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles.ftl").getFile());
-            ftl = "existingvehicles.ftl";
+            ftl = "existingvehicles";
         } else {
             //获取模板
-            ftl = "orderacar.ftl";
+            ftl = "orderacar";
 //            file = new File(getClass().getClassLoader().getResource("ftl/orderacar.ftl").getFile());
         }
-        InputStream inputStream  = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl);
+        InputStream inputStream  = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl+".ftl");
 //        String dir = getClassLoader().getResource("ftl").getPath();
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + ftl);
+        File file = new File(targetPath + ftl+seconds+".ftl");
         File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
         WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        String pdfName = "合同_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -824,28 +824,28 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             // 现车
             if ("现车".equals(appOrderDetailsVo.getOrderType())) {
                 //获取模板
-                ftl = "existingvehicles_black.ftl";
+                ftl = "existingvehicles_black";
 //                file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles_black.ftl").getFile());
             } else {
                 // 订车获取模板
-                ftl = "orderacar_black.ftl";
+                ftl = "orderacar_black";
 //                file = new File(getClass().getClassLoader().getResource("ftl/orderacar_black.ftl").getFile());
             }
 //            String dir = getClassLoader().getResource("ftl").getPath();
-            InputStream inputStream  = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl);
+            InputStream inputStream  = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl+".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();
             String typeName = dateStr + seconds + ".doc";
-            File file = new File(targetPath + ftl);
+            File file = new File(targetPath + ftl+seconds+".ftl");
             File dir = new File(targetPath);
             WordConvertUtils.inputStreamToFile(inputStream, file);
             WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
             //新生成的word路径
             String wordPath = targetPath + typeName;
             //生成合同文件名
-            String pdfName = dateStr + seconds + ".pdf";
+            String pdfName = "空白合同_"+dateStr + seconds + ".pdf";
             WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
             url = pdfName;
         }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderQuery.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class AppBusMainDepositOrderQuery implements Query {
     private static final long serialVersionUID = 635103059073828392L;
     @ApiModelProperty(value = "虚拟订单编号/客户名称/电话")
-    private String name;
+    private String names;
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -300,14 +300,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "receiveCar.ftl");
+        File file = new File(targetPath + "receiveCar"+seconds+".ftl");
         File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
         WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        String pdfName = "接收车辆确认书_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -344,14 +344,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "entrust.ftl");
+        File file = new File(targetPath + "entrust"+seconds+".ftl");
         File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
         WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
-        //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        //生成文件名
+        String pdfName = "委托提车授权书_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -378,14 +378,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "entrustConfirm.ftl");
+        File file = new File(targetPath + "entrustConfirm"+seconds+".ftl");
         File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
         WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
-        //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        //生成文件名
+        String pdfName = "交车资料确认单_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -423,14 +423,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "outdoor.ftl");
+        File file = new File(targetPath + "outdoor"+seconds+".ftl");
         File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
         WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        String pdfName = "出门证_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1685,7 +1685,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         AppBusMainDepositOrderQuery query = pagerQuery.getParams();
         QueryWrapper<BusMainDeposit> qw = createOrderAppPageWrapper(query);
         IPage<BusMainDeposit> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppBusMainDepositOrderVo> pagging = baseMapper.pageAppList(page, qw, query.getName());
+        IPage<AppBusMainDepositOrderVo> pagging = baseMapper.pageAppList(page, qw, query.getNames());
         List<AppBusMainDepositOrderVo> list = pagging.getRecords();
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
@@ -2185,7 +2185,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getStaffSid())) {
+                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
                             messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                         } else {
                             messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@@ -2197,7 +2197,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                         String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                         List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getStaffSid())) {
+                        if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
                             //更新已选择的车架号的状态为未锁定
                             AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
                             List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
@@ -2240,7 +2240,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())) {
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
                     //更新已选择的车架号的状态为未锁定
                     AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
                     List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -150,13 +150,18 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             bigDecimal = bigDecimal.add(new BigDecimal(dto.getTopPrice()));
             bigDecimal1 = bigDecimal1.add(new BigDecimal(dto.getTopPrice()));
         }
-        //查询是否有销售订单的价格信息。若有则更新销售指导价、销售成交价
+        //查询是否有销售订单的价格信息。若有则更新销售指导价、销售成交价、车价合计
         BusSalesOrderPrice price = busSalesOrderPriceService.selectBySalesOrderSid(salesOrderSid);
         if (price != null) {
             if (!"0".equals(bigDecimal.toString())) {
                 if (!"0".equals(bigDecimal1.toString())) {
                     price.setSingleFinalPrice(bigDecimal1);
                     price.setSingleGuildPrice(bigDecimal);
+                    if(price.getQuantity() == null){
+                        price.setPriceSum(bigDecimal1);
+                    }else{
+                        price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
+                    }
                     busSalesOrderPriceService.updateById(price);
                 } else {
                     price.setSingleGuildPrice(bigDecimal);
@@ -165,6 +170,11 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             } else {
                 if (!"0".equals(bigDecimal1.toString())) {
                     price.setSingleFinalPrice(bigDecimal1);
+                    if(price.getQuantity() == null){
+                        price.setPriceSum(bigDecimal1);
+                    }else{
+                        price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
+                    }
                     busSalesOrderPriceService.updateById(price);
                 }
             }
@@ -175,6 +185,11 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
                 if (!"0".equals(bigDecimal1.toString())) {
                     price.setSingleFinalPrice(bigDecimal1);
                     price.setSingleGuildPrice(bigDecimal);
+                    if(price.getQuantity() == null){
+                        price.setPriceSum(bigDecimal1);
+                    }else{
+                        price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
+                    }
                     busSalesOrderPriceService.save(price);
                 } else {
                     price.setSingleGuildPrice(bigDecimal);
@@ -183,6 +198,11 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             } else {
                 if (!"0".equals(bigDecimal1.toString())) {
                     price.setSingleFinalPrice(bigDecimal1);
+                    if(price.getQuantity() == null){
+                        price.setPriceSum(bigDecimal1);
+                    }else{
+                        price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
+                    }
                     busSalesOrderPriceService.save(price);
                 }
             }

anrui-buscenter/anrui-buscenter-biz/src/main/resources/template_word/交车资料确认单.docx

@@ -0,0 +1,12 @@
+                             交车资料确认单
+                                                                合同编号：
+${contractNo}
+客户名称：
+${customerName}
+                                    序号
+                                   车架号
+                                 交车资料
+${sortNo}
+${vinNo}
+${item}
+

anrui-buscenter/anrui-buscenter-biz/src/main/resources/template_word/接收车辆委托书.docx

@@ -0,0 +1,13 @@
+                             接收车辆委托书
+                                       
+    ${orgName}                  （公司）：
+委托人：   ${customerName}  身份证号码： ${idNo}           
+受委托人姓名：     ${name}  身份证号码：  ${idNumber}                                               
+  委托人与贵司签订了编号为  ${contractNo} 的《车辆买卖合同》，现因委托人无法亲自到场办理提车手续及提取车架号：   ${vinNo}                                的车辆。兹授权受委托人代替本委托人到贵司指定地点现场办理该车的提车手续，签订《接收车辆确认书》等相关提车文件。由此产生的相关法律后果均由本委托人承担。
+
+
+                      委托人签字或盖章：                   
+  
+
+
+授权期限：        年   月   日至       年   月   日

anrui-buscenter/anrui-buscenter-biz/src/main/resources/template_word/接收车辆确认书.docx

@@ -0,0 +1,42 @@
+                             接收车辆确认书
+
+                                  交 付 人
+${useOrgName}
+                                  经 办 人
+${staffName}
+                                 合同编号
+${contractNo}
+                                  购 买 人
+${customerName}
+                                 身份证号
+${idNo}
+                                  接 收 人
+${name}
+                                 身份证号
+${idNumber}
+                                 接收时间
+${date}
+                                 接收地点
+${address}
+                            接 收 车 辆 信 息
+                                  品    牌 
+${brandName}
+                                  名    称
+${model}
+                                 车辆型号
+${config}
+                                   颜   色
+${color}
+                                    序号
+                                  车 架 号
+                                 发动机号
+                                   ${sortNo}
+                                   ${vinNo}
+                                  ${engineNo}
+
+经验收，随车工具齐全，车辆状况良好，已接收车辆。
+
+                           接收人签字（手印）或盖章：             
+                                   联系电话：                 
+                                            _____  年____  月___ 日
+

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@@ -85,6 +85,8 @@ public class FinPaymentrecordDto implements Dto {
     private String payCode;
     @ApiModelProperty("创建人sid")
     private String createBySid;
+    @ApiModelProperty("修改人sid")
+    private String updateBySid;
     @ApiModelProperty("备注信息")
     private String remarks;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -25,9 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpaymentrecord;
 
-import java.awt.*;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.codec.Base64;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -69,15 +67,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.misc.BASE64Encoder;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.List;
@@ -434,9 +425,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         dataMap.put("cost", finPaymentrecord.getCost() + " " + "(" + s + ")");
         dataMap.put("payRemark", finPaymentrecord.getPayRemark());
         //获取图片路径
-        String photoPath = "D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
+        /*String photoPath = "D:/anrui/upload/20211227/kbjl_20211227143750186948.jpg";
         String photoPath64 = image2Base64(photoPath);
-        dataMap.put("photoPath64", photoPath64);
+        dataMap.put("photoPath64", photoPath64);*/
         //获取模板
         // 模板路径
         String sourcePath = "D:\\anrui\\upload\\template\\";
@@ -489,7 +480,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         section.getDocument().setWatermark(txtWatermark);
     }*/
 
-    public static String image2Base64(String imgUrl) {
+    /*public static String image2Base64(String imgUrl) {
         byte[] data = null;
         // 读取图片字节数组
         try {
@@ -505,52 +496,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         BASE64Encoder encoder = new BASE64Encoder();
         String base64Str = encoder.encode(data);
         return base64Str;
-    }
-    /*public static String image2Base64(String imgUrl) {
-        URL url = null;
-        InputStream is = null;
-        ByteArrayOutputStream outStream = null;
-        HttpURLConnection httpUrl = null;
-        try {
-            url = new URL(null, imgUrl, new sun.net.www.protocol.https.Handler());
-            httpUrl = (HttpURLConnection) url.openConnection();
-            httpUrl.connect();
-            httpUrl.getInputStream();
-            is = httpUrl.getInputStream();
-            outStream = new ByteArrayOutputStream();
-            //创建一个Buffer字符串
-            byte[] buffer = new byte[1024];
-            //每次读取的字符串长度，如果为-1，代表全部读取完毕
-            int len = 0;
-            //使用一个输入流从buffer里把数据读取出来
-            while ((len = is.read(buffer)) != -1) {
-                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
-                outStream.write(buffer, 0, len);
-            }
-            // 对字节数组Base64编码
-            return Base64.encode(outStream.toByteArray());
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (outStream != null) {
-                try {
-                    outStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (httpUrl != null) {
-                httpUrl.disconnect();
-            }
-        }
-        return imgUrl;
     }*/
 
     public static String upperCase2(double money) {

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

@@ -18,6 +18,10 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
+import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
+import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -41,7 +45,6 @@ import com.yxt.anrui.scm.api.scmapplyinbound.*;
 import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
-import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleQuery;
 import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
@@ -121,6 +124,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private BaseManufacturerBankFeign baseManufacturerBankFeign;
+    @Autowired
+    private BusVehicleApplyDetailFeign busVehicleApplyDetailFeign;
 
     public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
         ScmApplyInboundQuery query = pq.getParams();
@@ -528,13 +533,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (!actualAndOrgDept.getSuccess() || aaodd == null) {
             return;
         }
-
-
+        String vehicleOrderSid = booad.getVehicleOrderSid();
+        String vehicleNo = busVehicleApplyDetailFeign.fetchVehNoByMMCSid(vehicleOrderSid, booad.getModelSid(), booad.getConfigSid()).getData();
         for (ScmApplyInboundVehicleDto s : scmApplyInboundVehicleDtos) {
             //车辆台账推送数据
             BaseVehicleDto baseVehicleDto = new BaseVehicleDto();
-
-            // //采购系统（部门）sid
+            //车辆型号
+            baseVehicleDto.setVehMark(vehicleNo);
+            //采购系统（部门）sid
             baseVehicleDto.setPurchaseSystemSid(aaodd.getOrgDeptSid());
             //采购系统（部门）
             baseVehicleDto.setPurchaseSystemName(aaodd.getOrgDeptName());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -418,6 +418,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                         if (StringUtils.isNotBlank(applicationDetailsVo.getPurchasePrice())) {
                             baseVehicleDto.setCostPrice(Integer.valueOf(applicationDetailsVo.getPurchasePrice()));// 厂家结算价
                         }
+                        //车辆类型
+                        baseVehicleDto.setVehMark(applicationDetailsVo.getVehMark());
                         baseVehicleDto.setOrderingNo(applicationDetailsVo.getApplicationCode()); // 采购编号 厂家订单编号
                         baseVehicleDto.setInsideCode(applicationDetailsVo.getInsideCode());
                         //添加品牌sid、品牌名称、厂商sid、供应商sid、采购系统及sid、回款通路及sid

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -1380,7 +1380,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath + "outdoor.ftl");
+        File file = new File(targetPath + "outdoor"+seconds+".ftl");
         File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
         WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +15,7 @@ public class DepositListQuery implements Query {
 
     private static final long serialVersionUID = -2214864083626340077L;
     @ApiModelProperty(value = "虚拟订单编号/客户名称/电话/车型名称")
-    private String name;
+    private String names;
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;