问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java

@@ -29,4 +29,7 @@ public class BaseManufacturerListVo implements Vo {
 
     @ApiModelProperty("厂家销售通路sid")
     private String actualPaySid;
+
+    @ApiModelProperty("账户名称")
+    private String accountName;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsFeign.java

@@ -1,6 +1,14 @@
 package com.yxt.anrui.base.api.basevehicleactualdetails;
 
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
 
 /**
  * @Author dimengzhe
@@ -13,4 +21,9 @@ import org.springframework.cloud.openfeign.FeignClient;
         path = "v1/basevehicleactualdetails",
         fallback = BaseVehicleActualDetailsFeignFallback.class)
 public interface BaseVehicleActualDetailsFeign {
+
+    @ApiOperation("根据主表sid查询主表对应的车辆列表")
+    @GetMapping("/fetchByMainSid/{sid}")
+    @ResponseBody
+    ResultBean<List<BaseVehicleActualDetails>> fetchByMainSid(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java

@@ -1,11 +1,12 @@
 package com.yxt.anrui.base.api.basevehicleactualpay;
 
-import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeignFallback;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/9/19 11:57
@@ -22,4 +23,9 @@ public interface BaseVehicleActualPayFeign {
     @GetMapping("/fetchBySid/{sid}")
     @ResponseBody
     ResultBean<BaseVehicleActualPay> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据主表sid查询")
+    @GetMapping("/fetchByMainSid/{sid}")
+    @ResponseBody
+    ResultBean<List<BaseVehicleActualPay>> fetchByMainSid(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java

@@ -11,8 +11,9 @@ import lombok.Data;
  */
 @Data
 public class BaseVehicleActualPayVo implements Vo {
-    private static final long serialVersionUID = 7103772117018168626L;
 
+    @ApiModelProperty(value = "账户名称")
+    private String accountName;
     @ApiModelProperty(value = "付款方式")
     private String paymentType;
     @ApiModelProperty(value = "付款方式key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java

@@ -12,6 +12,8 @@ import lombok.Data;
 @Data
 public class BaseVehicleActualSales extends BaseEntity {
     private static final long serialVersionUID = -8236776276492093631L;
+    @ApiModelProperty(value = "账户名称")
+    private String accountName;
     @ApiModelProperty(value = "申请编号")
     private String billNo;
     @ApiModelProperty(value = "申请人")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java

@@ -19,6 +19,8 @@ public class BaseVehicleActualSalesDetailsVo implements Vo {
     private static final long serialVersionUID = -3110309934818922020L;
     @ApiModelProperty(value = "未售买断sid")
     private String sid;
+    @ApiModelProperty(value = "账户名称")
+    private String accountName;
     @ApiModelProperty(value = "申请编号")
     private String billNo;
     @ApiModelProperty(value = "申请人")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -23,6 +23,8 @@ public class BaseVehicleActualSalesDto implements Dto {
 
     @ApiModelProperty(value = "sid")
     private String sid;
+    @ApiModelProperty(value = "账户名称")
+    private String accountName;
     @ApiModelProperty(value = "申请编号")
     private String billNo;
     @ApiModelProperty(value = "申请人sid")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -189,6 +189,7 @@
                bmb.actualPay,
                bmb.depositBank,
                bmb.bankAccount,
+               bmb.accountName,
                bmb.sid          actualPaySid
         from base_manufacturer_bank bmb
                      left join base_manufacturer bm on bm.sid = bmb.manufacturerSid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualdetails/BaseVehicleActualDetailsRest.java

@@ -1,10 +1,17 @@
 package com.yxt.anrui.base.biz.basevehicleactualdetails;
 
+import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeign;
+import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesFeign;
+import com.yxt.anrui.base.biz.basevehicleactualsales.BaseVehicleActualSalesService;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/4/8 18:09
@@ -14,4 +21,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("v1/scmvehicleactualsales")
 @Controller
 public class BaseVehicleActualDetailsRest implements BaseVehicleActualDetailsFeign {
+
+    @Autowired
+    private BaseVehicleActualDetailsService baseVehicleActualDetailsService;
+
+    @Override
+    public ResultBean<List<BaseVehicleActualDetails>> fetchByMainSid(String sid) {
+        ResultBean rb = new ResultBean();
+        List<BaseVehicleActualDetails> baseVehicleActualDetails = baseVehicleActualDetailsService.selectBySaleSid(sid);
+        return rb.success().setData(baseVehicleActualDetails);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/9/19 11:54
@@ -27,4 +29,11 @@ public class BaseVehicleActualPayRest implements BaseVehicleActualPayFeign {
         BaseVehicleActualPay baseVehicleActualPay = baseVehicleActualPayService.fetchBySid(sid);
         return rb.success().setData(baseVehicleActualPay);
     }
+
+    @Override
+    public ResultBean<List<BaseVehicleActualPay>> fetchByMainSid(String sid) {
+        ResultBean rb = new ResultBean();
+        List<BaseVehicleActualPay> baseVehicleActualPays = baseVehicleActualPayService.selectBySaleSid(sid);
+        return rb.success().setData(baseVehicleActualPays);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -559,7 +559,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                         finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.MD_TYPE.getRemarks());
                         finPaymentrecordDto.setReceiveBank(v.getBank());
                         finPaymentrecordDto.setReceiveBankAccount(v.getReceivingAccount());
-                        finPaymentrecordDto.setReceiveCompany(v.getActualPay());
+                        finPaymentrecordDto.setReceiveCompany(v.getAccountName());
                         finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }

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

@@ -35,6 +35,8 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicat
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails;
+import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeign;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayFeign;
 import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesDetailsVo;
@@ -133,6 +135,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     @Autowired
     private BaseVehicleActualPayFeign baseVehicleActualPayFeign;
     @Autowired
+    private BaseVehicleActualDetailsFeign baseVehicleActualDetailsFeign;
+    @Autowired
     private MessageListFeign messageListFeign;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
@@ -613,7 +617,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             }
         }
         if (baseVehicleActualSalesDetailsVo != null) {
-            dataMap.put("applyCode", "");
+            dataMap.put("applyCode", baseVehicleActualSalesDetailsVo.getBillNo());
             //获取审批记录
             List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeign.flowRecordAndComment(baseVehicleActualSalesDetailsVo.getProcInstId(), "1").getData();
             List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
@@ -662,14 +666,40 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         dataMap.put("createByName", createByName);
         dataMap.put("createByDeptName", deptName);
         dataMap.put("createOrgName", createOrgName);
-        dataMap.put("remarks", finPaymentrecord.getRemarks());
+        if(baseVehicleActualSalesDetailsVo != null){
+            dataMap.put("remarks", "买断：" + baseVehicleActualSalesDetailsVo.getReason());
+            //车架号拼接
+            List<BaseVehicleActualDetails> baseVehicleActualDetails = baseVehicleActualDetailsFeign.fetchByMainSid(baseVehicleActualSalesDetailsVo.getSid()).getData();
+            String vinRemark = "";
+            String vinNo = "";
+            String remark = "";
+            for (BaseVehicleActualDetails baseVehicleActualDetail : baseVehicleActualDetails) {
+                vinNo = vinNo + baseVehicleActualDetail.getVinNo() + "(" + baseVehicleActualDetail.getActualMoney().toString() + ")" + "、";
+            }
+            vinNo = vinNo.substring(0,vinNo.lastIndexOf("、"));
+            //付款备注拼接
+            List<BaseVehicleActualPay> baseVehicleActualPays = baseVehicleActualPayFeign.fetchByMainSid(baseVehicleActualSalesDetailsVo.getSid()).getData();
+            if (baseVehicleActualPays.size() > 0){
+                for (BaseVehicleActualPay vehicleActualPay : baseVehicleActualPays) {
+                    remark = remark + "(" + vehicleActualPay.getActualPay() + ")" + vehicleActualPay.getPayRemark() + " ";
+                }
+            }
+            if (StringUtils.isNotBlank(remark)){
+                vinRemark = vinNo + "；" + remark;
+            }else {
+                vinRemark = vinNo;
+            }
+            dataMap.put("payRemark", vinRemark);
+        }else {
+            dataMap.put("remarks", finPaymentrecord.getRemarks());
+            dataMap.put("payRemark", finPaymentrecord.getPayRemark());
+        }
         dataMap.put("receiveCompany", finPaymentrecord.getReceiveCompany());
         dataMap.put("receiveBank", finPaymentrecord.getReceiveBank());
         dataMap.put("receiveBankAccount", finPaymentrecord.getReceiveBankAccount());
         Double aDouble = Double.valueOf(finPaymentrecord.getAccountsReceive());
         String s = upperCase2(aDouble);
         dataMap.put("cost", finPaymentrecord.getAccountsReceive() + " " + "(" + s + ")");
-        dataMap.put("payRemark", finPaymentrecord.getPayRemark());
         //获取图片路径
         List<String> photoList = new ArrayList<>();
         dataMap.put("photoPath64", photoList);