Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -142,4 +142,8 @@ public interface BaseTrailerFeign {
     @ApiOperation("根据挂车车架号和车辆sid获取一条记录")
     @PostMapping("/fetchByGcVinNoAndVehSid")
     ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(@RequestParam("gcVinNo") String gcVinNo,@RequestParam("vehSid") String vehSid);
+
+    @ApiOperation("付款申请选择挂车")
+    @PostMapping("/payApply")
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(@RequestBody PagerQuery<PayApplyTrailerQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java

@@ -108,4 +108,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basetrailer;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PayApplyTrailerQuery implements Query {
+
+	@ApiModelProperty("挂车名称")
+	private String trailerTypeValue;
+	@ApiModelProperty("车架号")
+	private String vinNo;
+	@ApiModelProperty("主车车架号")
+	private String zcVinNo;
+	@ApiModelProperty("客户名称")
+	private String customerName;
+
+	private String useOrgSid;
+	private List<String> sids;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basetrailer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayApplyTrailerVo implements Vo {
+
+	@ApiModelProperty("挂车名称")
+	private String trailerTypeValue; // 挂车名称
+	@ApiModelProperty("外观尺寸")
+	private String size; // 外观尺寸
+	@ApiModelProperty("车架号")
+	private String vinNo; // 车架号
+	@ApiModelProperty("挂车sid")
+	private String trailerSid; // 挂车sid
+	@ApiModelProperty("箱体颜色")
+	private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+	private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+	private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+	private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+	private String zcVinNo; // 主车车架号
+	@ApiModelProperty("合同编号")
+	private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+	private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+	private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+	private String payType; // 销售类型
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basevehinstall;
 
+import com.yxt.anrui.base.api.basetrailer.PayApplyTrailerQuery;
+import com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,6 +35,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(上装配置管理) <br/>
  * File: BaseVehinstallFeign.java <br/>
@@ -68,12 +72,12 @@ public interface BaseVehinstallFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody BaseVehinstallDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
@@ -82,7 +86,7 @@ public interface BaseVehinstallFeign {
     @ApiOperation("获取车辆的上装信息")
     @GetMapping("/selectOne")
     @ResponseBody
-    ResultBean<BaseVehinstall> selectOne(@RequestParam("vinNo")String vinNo,@RequestParam("useOrgSid")String useOrgSid);
+    ResultBean<BaseVehinstall> selectOne(@RequestParam("vinNo") String vinNo, @RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("上装出库")
     @PostMapping("/vehinstallOut/{sid}")
@@ -91,4 +95,8 @@ public interface BaseVehinstallFeign {
     @ApiOperation("上装单独出库(新)")
     @PostMapping("/vehinstallOutNew/{sid}")
     ResultBean vehinstallOutNew(@PathVariable("sid") String sid);
+
+    @ApiOperation("付款申请选择上装")
+    @PostMapping("/payApply")
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(@RequestBody PagerQuery<PayApplyTopQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java

@@ -89,4 +89,9 @@ public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
 	public ResultBean vehinstallOutNew(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java

@@ -0,0 +1,46 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PayApplyTopQuery implements Query {
+
+	@ApiModelProperty("上装名称")
+	private String installNameValue;
+	@ApiModelProperty("车架号")
+	private String vinNo;
+	@ApiModelProperty("客户名称")
+	private String customerName;
+
+	private String useOrgSid;
+	private List<String> sids;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehinstall;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PayApplyTopVo implements Vo {
+
+	@ApiModelProperty("付款申请sid")
+	private String applySid;
+	@ApiModelProperty("上装名称")
+	private String installNameValue;
+	@ApiModelProperty("货箱内部尺寸")
+	private String size;
+	@ApiModelProperty("车架号")
+	private String vinNo;
+	@ApiModelProperty("上装sid")
+	private String topSid;
+	@ApiModelProperty("箱体颜色")
+	private String color;
+	@ApiModelProperty("厂家结算价")
+	private BigDecimal costPrice;
+	@ApiModelProperty("品牌名称")
+	private String brandName;
+	@ApiModelProperty("车型别名")
+	private String vehModel;
+	@ApiModelProperty("合同编号")
+	private String contractNo;
+	@ApiModelProperty("销售订单号")
+	private String saleOrderNo;
+	@ApiModelProperty("客户名称")
+	private String customerName;
+	@ApiModelProperty("销售类型")
+	private String payType;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -106,7 +106,9 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
     List<BaseTrailer> getByVehSid(@Param("vehSid") String vehSid);
 
     @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid} order by id desc limit 1")
-    BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
+    BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo, @Param("vehSid") String vehSid);
 
     List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
+
+    IPage<PayApplyTrailerVo> payApply(IPage<BaseTrailer> page, @Param(Constants.WRAPPER) Wrapper<BaseTrailer> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml

@@ -8,7 +8,7 @@
         btm.*
         FROM base_trailer bt
         LEFT JOIN base_trailer_model btm
-        ON bt.`trailerModelSid` = btm.`sid`
+        ON bt.trailerModelSid = btm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -59,7 +59,7 @@
         from base_vehicle_out_apply
         where billNo LIKE concat(#{billNo}, '%')
         order by billNo desc
-                limit 1
+            limit 1
     </select>
 
     <select id="selectNumGCRK" resultType="int">
@@ -95,7 +95,7 @@
                btm.boxColor,
                btm.moreConfig
         from base_trailer bt
-                     left join base_trailer_model btm on btm.sid = bt.trailerModelSid
+                 left join base_trailer_model btm on btm.sid = bt.trailerModelSid
         where bt.vehSid = #{vinSid}
     </select>
 
@@ -103,8 +103,52 @@
         SELECT btm.trailerTypeValue,
                btm.manufacturerName
         FROM base_trailer bt
-                     LEFT JOIN base_trailer_model btm
+                 LEFT JOIN base_trailer_model btm
-                ON bt.`trailerModelSid` = btm.`sid`
+                           ON bt.trailerModelSid = btm.sid
         WHERE bt.vehSid = #{materialSid}
     </select>
+
+    <select id="payApply" resultType="com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo">
+        SELECT btm.trailerTypeValue,
+        CONCAT(
+        '长',
+        btm.appearanceSizeLong,
+        'mm，',
+        '宽',
+        btm.appearanceSizeWide,
+        'mm，',
+        '高',
+        btm.appearanceSizeHigh,
+        'mm，',
+        '总高',
+        btm.appearanceSizeTotalHigh,
+        'mm'
+        ) AS size,
+        bt.vinNo,
+        bt.sid AS trailerSid,
+        btm.boxColor AS color,
+        bt.settlementPrice AS costPrice,
+        btm.brandName,
+        btm.carModelName AS vehModel,
+        bt.zcvinNo AS zcVinNo,
+        bso.contractNo,
+        bso.billNo AS saleOrderNo,
+        bso.customerName,
+        bso.payType
+        FROM
+        base_trailer bt
+        LEFT JOIN base_trailer_model btm
+        ON bt.trailerModelSid = btm.sid
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsov
+        ON bt.vehSid = bsov.linkSid
+        LEFT JOIN anrui_buscenter.bus_sales_order bso
+        ON bsov.salesOrderSid = bso.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        AND bt.sid NOT IN (
+        SELECT ft.trailerSid
+        FROM anrui_fin.fin_paymentapply_trailer ft
+        )
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -52,88 +52,93 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "挂车 base_trailer")
-@RestController("com.yxt.anrui.base.biz.basetrailer.BaseTrailerRest")
+@RestController
 @RequestMapping("v1/basetrailer")
 public class BaseTrailerRest implements BaseTrailerFeign {
 
-	@Autowired
+    @Autowired
-	private BaseTrailerService baseTrailerService;
+    private BaseTrailerService baseTrailerService;
-
+
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseTrailerVo>> listPage(@RequestBody PagerQuery<BaseTrailerQuery> pq){
+    public ResultBean<PagerVo<BaseTrailerVo>> listPage(@RequestBody PagerQuery<BaseTrailerQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseTrailerVo> pv = baseTrailerService.listPageVo(pq);
+        PagerVo<BaseTrailerVo> pv = baseTrailerService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("新增保存")
+    @ApiOperation("新增保存")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody BaseTrailerDto dto){
+    public ResultBean save(@RequestBody BaseTrailerDto dto) {
-		return baseTrailerService.saveTrailer(dto);
+        return baseTrailerService.saveTrailer(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("修改保存")
+    @ApiOperation("修改保存")
-	@PostMapping("/update/{sid}")
+    @PostMapping("/update/{sid}")
-	public ResultBean update(@RequestBody BaseTrailerDto dto, @PathVariable("sid") String sid){
+    public ResultBean update(@RequestBody BaseTrailerDto dto, @PathVariable("sid") String sid) {
-		return baseTrailerService.updateTrailer(dto,sid);
+        return baseTrailerService.updateTrailer(dto, sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		baseTrailerService.delBySids(sids);
+        baseTrailerService.delBySids(sids);
-		return rb.success();
+        return rb.success();
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
-	@GetMapping("/fetchBySid/{sid}")
+    @GetMapping("/fetchBySid/{sid}")
-	public ResultBean<BaseTrailerDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
+    public ResultBean<BaseTrailerDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
-		return baseTrailerService.fetchDetailsBySid(sid);
+        return baseTrailerService.fetchDetailsBySid(sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<BaseTrailer>> getByVehSid(String vehSid) {
+    public ResultBean<List<BaseTrailer>> getByVehSid(String vehSid) {
-		return baseTrailerService.getByVehSid(vehSid);
+        return baseTrailerService.getByVehSid(vehSid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(PagerQuery<BaseTrailerSearchQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(PagerQuery<BaseTrailerSearchQuery> pagerQuery) {
-		ResultBean<PagerVo<BaseTrailerSearchVo>> rb = ResultBean.fireFail();
+        ResultBean<PagerVo<BaseTrailerSearchVo>> rb = ResultBean.fireFail();
-		IPage<BaseTrailerSearchVo> page = baseTrailerService.searchPage(pagerQuery);
+        IPage<BaseTrailerSearchVo> page = baseTrailerService.searchPage(pagerQuery);
-		PagerVo<BaseTrailerSearchVo> pv = new PagerVo<>();
+        PagerVo<BaseTrailerSearchVo> pv = new PagerVo<>();
-		PagerVo<BaseTrailerSearchVo> pv1 = PagerUtil.pageToVo(page, pv);
+        PagerVo<BaseTrailerSearchVo> pv1 = PagerUtil.pageToVo(page, pv);
-		return rb.success().setData(pv1);
+        return rb.success().setData(pv1);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean trailerOut(String sid) {
+    public ResultBean trailerOut(String sid) {
-		return baseTrailerService.trailerOut(sid);
+        return baseTrailerService.trailerOut(sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean trailerOutNew(String sid) {
+    public ResultBean trailerOutNew(String sid) {
-		return baseTrailerService.trailerOutNew(sid);
+        return baseTrailerService.trailerOutNew(sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
+    public ResultBean<TraliveredVo> trailerList(String vinSid, String contractNo) {
-		return baseTrailerService.trailerList(vinSid,contractNo);
+        return baseTrailerService.trailerList(vinSid, contractNo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNo(String gcVinNo) {
-		return baseTrailerService.fetchByGcVinNo(gcVinNo);
+        return baseTrailerService.fetchByGcVinNo(gcVinNo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
+    public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
-		return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+        return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo, vehSid);
-	}
+    }
+
+    @Override
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> query) {
+        return baseTrailerService.payApply(query);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -302,17 +302,17 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         String trailerTypeKey = baseTrailerModelDetailsVo.getTrailerTypeKey();
         BigDecimal appearanceSizeLong = new BigDecimal(baseTrailerModelDetailsVo.getAppearanceSizeLong()).divide(new BigDecimal("1000"));
         String orderSid = busSalesOrderVehicleFeign.selectOneByVehSidAndNotStop(vehSid).getData();
-        if (StringUtils.isNotBlank(orderSid)){
+        if (StringUtils.isNotBlank(orderSid)) {
             List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData();
-            if (data != null && data.size() > 0){
+            if (data != null && data.size() > 0) {
                 Boolean tg = false;
                 for (BusSalesOrderTrailerDetailsVo datum : data) {
-                    if (datum.getAppearanceSizeLong().compareTo(appearanceSizeLong) == 0 && datum.getTrailerTypeKey().equals(trailerTypeKey)){
+                    if (datum.getAppearanceSizeLong().compareTo(appearanceSizeLong) == 0 && datum.getTrailerTypeKey().equals(trailerTypeKey)) {
                         tg = true;
                         break;
                     }
                 }
-                if (!tg){
+                if (!tg) {
                     return rb.setMsg("该挂车类型和外廓长与绑定的主车销售订单中挂车类型和外廓长不一致，无法入库");
                 }
             }
@@ -928,7 +928,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         baseTrailer.setIssueDate(DateUtil.formatDate(new Date()));
         saveOrUpdate(baseTrailer);
         Integer count = finBillTrailerFeign.fetchByGcVinNo(baseTrailer.getVinNo(), finBillApplicationDetailsVo.getSid()).getData();
-        if (count == 0){
+        if (count == 0) {
             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
             finVehicleInvoiceDto.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
             finVehicleInvoiceDto.setContractNo(finBillApplicationDetailsVo.getContractNo());
@@ -976,11 +976,37 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
 
     public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
         ResultBean rb = ResultBean.fireFail();
-        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo, vehSid);
         return rb.success().setData(baseTrailerDetailsVo);
     }
 
     public List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String vehSid) {
         return baseMapper.fetchTypeAndMan(vehSid);
     }
+
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PayApplyTrailerQuery query = pq.getParams();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("bt.useOrgSid", query.getUseOrgSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bt.vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getZcVinNo())) {
+            qw.eq("bt.zcvinNo", query.getZcVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.eq("bso.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getTrailerTypeValue())) {
+            qw.like("btm.trailerTypeValue", query.getTrailerTypeValue());
+        }
+        if (query.getSids().size() > 0) {
+            qw.notIn("bt.sid", query.getSids());
+        }
+        IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
+        IPage<PayApplyTrailerVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTrailerVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -26,10 +26,12 @@
 package com.yxt.anrui.base.biz.basevehinstall;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
+import com.yxt.anrui.base.api.basevehinstall.PayApplyTopVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -54,24 +56,26 @@ import java.util.List;
 @Mapper
 public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 
-	//@Update("update base_vehinstall set name=#{msg} where id=#{id}")
+    //@Update("update base_vehinstall set name=#{msg} where id=#{id}")
-	//IPage<BaseVehinstallVo> voPage(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehinstall> qw);
+    //IPage<BaseVehinstallVo> voPage(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehinstall> qw);
-	
+
-	IPage<BaseVehinstallVo> selectPageVo(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
+    IPage<BaseVehinstallVo> selectPageVo(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
-	
+
-	List<BaseVehinstallVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
+    List<BaseVehinstallVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
-	
+
-	@Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}")
+    @Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}")
-	List<String> selectListVo(String createOrgSid);
+    List<String> selectListVo(String createOrgSid);
 
     List<BaseVehinstall> selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin);
 
-	@Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
+    @Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
-    BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
+    BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("createOrgSid") String createOrgSid);
 
     BaseVehinstall seletByVinAndUseOrg(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
 
     int selectNumGCRK(String bill);
 
     String selectNum(String billNo);
+
+    IPage<PayApplyTopVo> payApply(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -65,4 +65,44 @@
         order by billNo desc
                 limit 1
     </select>
+
+    <select id="payApply" resultType="com.yxt.anrui.base.api.basevehinstall.PayApplyTopVo">
+        SELECT bvm.installNameValue,
+        CONCAT(
+        '长',
+        bvm.wk_long,
+        'mm，',
+        '宽',
+        bvm.wk_wide,
+        'mm，',
+        '高',
+        bvm.wk_high,
+        'mm'
+        ) AS size,
+        bv.vinNo,
+        bv.sid AS topSid,
+        bvm.colorValue AS color,
+        bv.costPrice,
+        bv.brandName,
+        bv.vehModel,
+        bso.contractNo,
+        bso.billNo AS saleOrderNo,
+        bso.customerName,
+        bso.payType
+        FROM
+        base_vehinstall bv
+        LEFT JOIN base_vehinstallmodel bvm
+        ON bv.mainSid = bvm.sid
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsov
+        ON RIGHT(bv.vinNo,8) = RIGHT(bsov.linkNo,8)
+        LEFT JOIN anrui_buscenter.bus_sales_order bso
+        ON bsov.salesOrderSid = bso.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        AND bv.sid NOT IN (
+        SELECT ft.topSid
+        FROM anrui_fin.fin_paymentapply_top ft
+        )
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -79,7 +79,7 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "上装表")
-@RestController("com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallRest")
+@RestController
 @RequestMapping("v1/basevehinstall")
 public class BaseVehinstallRest implements BaseVehinstallFeign {
 
@@ -297,4 +297,9 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     public ResultBean vehinstallOutNew(String sid) {
         return baseVehinstallService.vehinstallOutNew(sid);
     }
+
+    @Override
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> query) {
+        return baseVehinstallService.payApply(query);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -31,11 +31,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
+import com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo;
 import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
+import com.yxt.anrui.base.api.basevehinstall.*;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
 import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
@@ -57,12 +59,6 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallQuery;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto;
-import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -524,4 +520,27 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         }
         return rb.success();
     }
+
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PayApplyTopQuery query = pq.getParams();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("bv.useOrgSid", query.getUseOrgSid());
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("bv.vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.eq("bso.customerName", query.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(query.getInstallNameValue())) {
+            qw.like("bvm.installNameValue", query.getInstallNameValue());
+        }
+        if (query.getSids().size() > 0) {
+            qw.notIn("bv.sid", query.getSids());
+        }
+        IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
+        IPage<PayApplyTopVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTopVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
 }

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js

@@ -10,12 +10,30 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  // 查询分页列表
+  // 查询分页列表 -- 选择主车车辆
-  pageList: function(params) {
+  pageList: function(data) {
     return request({
       url: '/base/v1/basevehicle/selectPayVehicleList',
       method: 'post',
-      data: params,
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 查询分页列表 -- 选择挂车
+  trailerApply: function(data) {
+    return request({
+      url: '/base/v1/basetrailer/payApply',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 查询分页列表 -- 选择上装
+  topApply: function(data) {
+    return request({
+      url: '/base/v1/basevehinstall/payApply',
+      method: 'post',
+      data: data,
       headers: { 'Content-Type': 'application/json' }
     })
   },

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -130,7 +130,7 @@ const codemenu = [
     component: Layout,
     redirect: '/anruifinmanagement',
     meta: {
-      title: '款项结转申请'
+      title: '付款信息管理'
     },
     children: [{
       path: '/anruifinmanagement/paymentInformation',

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -54,7 +54,7 @@
             <el-col :span="6">
               <div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
               <el-form-item prop="isVeh">
-                <el-radio-group class="addinputInfo" v-model="formobj.isVeh">
+                <el-radio-group :disabled="formobj.costTypeKey !== '001' && formobj.costTypeKey !== ''" class="addinputInfo" v-model="formobj.isVeh">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
                 </el-radio-group>
@@ -204,12 +204,67 @@
               </el-table-column>
             </el-table>
           </div>
+          <div v-show="formobj.costTypeKey == '002'"><!-- 款项类别为挂车采购时显示 -->
+            <div class="title titleOne">
+              <div>挂车列表</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="trailerSelect()">选择</el-button>
+            </div>
+            <el-table :key="trailerKey" :data="formobj.trailerList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="trailerDelete(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="外观尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column prop="zcVinNo" label="主车车架号" align="center" width="120" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
+          <div v-show="formobj.costTypeKey == '003'"><!-- 款项类别为上装采购时显示 -->
+            <div class="title titleOne">
+              <div>上装列表</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="topSelect()">选择</el-button>
+            </div>
+            <el-table :key="topKey" :data="formobj.topList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="topDelete(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="installNameValue" label="上装/上装配置名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="货箱内部尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
         </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
-    <!-- 主车车辆列表选择车辆 -->
-    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="resetState"/>
     <!-- 付款明细表新增关联付款信息 -->
     <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
       <el-form class="formaddcopy02">
@@ -244,6 +299,12 @@
         <el-button size="small" @click="paymentClose">关闭</el-button>
       </div>
     </el-dialog>
+    <!-- 主车车辆列表选择车辆 -->
+    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="resetState" />
+    <!-- 挂车列表选择车辆 -->
+    <trailerCar v-show="viewState == 6" ref="divTrailer" @backData="backTrailer" @doback="resetState" />
+    <!-- 上装列表选择车辆 -->
+    <top v-show="viewState == 7" ref="divTop" @backData="backTop" @doback="resetState" />
     <!-- 关联付款信息新增 -->
     <paymentInformationAdd v-show="viewState == 3" ref="divPaymentInformation" @backInformation="backInformation" @doback="resetStateByInformation" />
     <!-- 关联付款信息详情 -->
@@ -257,6 +318,8 @@
 import req from '@/api/anruifinmanagement/payment'
 import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
+import trailerCar from './relation/trailerCar'
+import top from './relation/top'
 import paymentInformationAdd from './relation/paymentInformationAdd'
 import paymentInformationInfo from './relation/paymentInformationInfo'
 import tops from '@/components/publicPage/tops'
@@ -265,6 +328,8 @@ export default {
   name: 'PaymentAdd',
   components: {
     vehcile,
+    trailerCar,
+    top,
     paymentInformationAdd,
     paymentInformationInfo,
     tops
@@ -277,6 +342,8 @@ export default {
       tableKey: 0,
       vehicleKey: 1,
       paymentKey: 2,
+      trailerKey: 3,
+      topKey: 4,
       index: 0,
       carBrand_list: [],
       costRange_list: [],
@@ -312,8 +379,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       },
       rules: {
         carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
@@ -452,8 +521,12 @@ export default {
       const choose = this.costType_list.filter((item) => item.dictValue === value)
       if (choose.length > 0 && choose !== null) {
         this.formobj.costTypeKey = choose[0].dictKey
+        if (this.formobj.costTypeKey !== '001') {
+          this.formobj.isVeh = '0'
+        }
       } else {
         this.formobj.costTypeKey = ''
+        this.formobj.isVeh = ''
       }
     },
     changePayCompany(value) {
@@ -489,6 +562,35 @@ export default {
     handleDelete(index) {
       this.formobj.detailsList.splice(index, 1)
     },
+    changeCostTitle(value, row) {
+      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.costTitleKey = choose[0].dictKey
+      } else {
+        row.costTitleKey = ''
+      }
+    },
+    changePaymentType(value, row) {
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.paymentTypeKey = choose[0].dictKey
+      } else {
+        row.paymentTypeKey = ''
+      }
+    },
+    changeActualPay(value, row) {
+      const choose = this.actualPay_list.filter((item) => item.actualPay === value)
+      if (choose.length > 0 && choose !== null) {
+        row.actualPay = choose[0].actualPay
+        row.receiveCompany = choose[0].accountName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.actualPay = ''
+        row.bank = ''
+        row.receivingAccount = ''
+      }
+    },
     handleAddPayment(row, index) {
       if (row.paymentType === '') {
         this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
@@ -620,33 +722,64 @@ export default {
       this.viewState = 5
       this.$refs['divTops'].showInfo({ sid: row.topSid })
     },
-    changeCostTitle(value, row) {
+    trailerSelect() {
-      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      this.viewState = 6
-      if (choose.length > 0 && choose !== null) {
+      this.$refs['divTrailer'].showData(this.formobj.trailerList, this.formobj.useOrgSid)
-        row.costTitleKey = choose[0].dictKey
-      } else {
-        row.costTitleKey = ''
-      }
     },
-    changePaymentType(value, row) {
+    trailerDelete(index) {
-      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      this.formobj.trailerList.splice(index, 1)
-      if (choose.length > 0 && choose !== null) {
+    },
-        row.paymentTypeKey = choose[0].dictKey
+    backTrailer(value) {
-      } else {
+      this.viewState = 1
-        row.paymentTypeKey = ''
+      value = JSON.parse(JSON.stringify(value))
+      if (value.length > 0) {
+        value.forEach((e) => {
+          this.formobj.trailerList.push({
+            trailerTypeValue: e.trailerTypeValue, // 挂车名称
+            size: e.size, // 外观尺寸
+            vinNo: e.vinNo, // 挂车车架号
+            trailerSid: e.trailerSid, // 挂车sid
+            color: e.color, // 箱体颜色
+            costPrice: e.costPrice, // 厂家结算价
+            brandName: e.brandName, // 品牌名称
+            vehModel: e.vehModel, // 车型别名
+            zcVinNo: e.zcVinNo, // 主车车架号
+            contractNo: e.contractNo, // 合同编号
+            saleOrderNo: e.saleOrderNo, // 销售订单号
+            customerName: e.customerName, // 客户名称
+            payType: e.payType // 销售类型
+          })
+        })
       }
     },
-    changeActualPay(value, row) {
+    topSelect() {
-      const choose = this.actualPay_list.filter((item) => item.actualPay === value)
+      this.viewState = 7
-      if (choose.length > 0 && choose !== null) {
+      this.$refs['divTop'].showData(this.formobj.topList, this.formobj.useOrgSid)
-        row.actualPay = choose[0].actualPay
+    },
-        row.receiveCompany = choose[0].accountName
+    topDelete(index) {
-        row.bank = choose[0].depositBank
+      this.formobj.topList.splice(index, 1)
-        row.receivingAccount = choose[0].bankAccount
+    },
-      } else {
+    backTop(value) {
-        row.actualPay = ''
+      this.viewState = 1
-        row.bank = ''
+      value = JSON.parse(JSON.stringify(value))
-        row.receivingAccount = ''
+      if (value.length > 0) {
+        value.forEach((e) => {
+          this.formobj.topList.push({
+            installNameValue: e.installNameValue, // 上装名称
+            topSid: e.topSid, // 上装sid
+            size: e.size, // 外观尺寸
+            vinNo: e.vinNo, // 车架号
+            vehiSid: e.vehiSid, // 车辆sid
+            color: e.color, // 箱体颜色
+            costPrice: e.costPrice, // 厂家结算价
+            brandName: e.brandName, // 品牌名称
+            vehModel: e.vehModel, // 车型别名
+            contractNo: e.contractNo, // 合同编号
+            saleOrderNo: e.saleOrderNo, // 销售订单号
+            customerName: e.customerName, // 客户名称
+            payType: e.payType // 销售类型
+          })
+        })
       }
     },
     saveOrUpdate() {
@@ -745,6 +878,16 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.carTotal = sums[index] += ''
+        } else if (column.property === 'costPrice') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
         }
       })
       return sums
@@ -781,8 +924,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       }
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@@ -121,6 +121,47 @@
               </el-table-column>
             </el-table>
           </div>
+          <div v-show="formobj.costTypeKey == '002'"><!-- 款项类别为挂车采购时显示 -->
+            <div class="title">挂车列表</div>
+            <el-table :key="trailerKey" :data="formobj.trailerList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="外观尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column prop="zcVinNo" label="主车车架号" align="center" width="120" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
+          <div v-show="formobj.costTypeKey == '003'"><!-- 款项类别为上装采购时显示 -->
+            <div class="title">上装列表</div>
+            <el-table :key="topKey" :data="formobj.topList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="installNameValue" label="上装/上装配置名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="货箱内部尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
         </el-form>
       </div>
     </div>
@@ -179,6 +220,8 @@ export default {
       tableKey: 0,
       vehicleKey: 1,
       paymentKey: 2,
+      trailerKey: 3,
+      topKey: 4,
       index: 0,
       formobj: {
         billNo: '', // 申请编号
@@ -207,8 +250,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       },
       rules: {},
       paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
@@ -300,6 +345,16 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.carTotal = sums[index] += ''
+        } else if (column.property === 'costPrice') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
         }
       })
       return sums
@@ -335,8 +390,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/top.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择上装页面</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+          <el-button type="info" size="small" @click="handleColse()">关闭</el-button>
+        </div>
+      </div>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="上装名称">
+                <el-input v-model="listQuery.params.installNameValue" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">上装列表</div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50" type="selection" align="center"/>
+            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="installNameValue" label="上装名称" align="center" />
+            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="brandName" label="主车品牌" align="center" />
+            <el-table-column prop="customerName" label="客户名称" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/anruifinmanagement/payment'
+
+export default {
+  name: 'Top',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      multipleSelection: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          installNameValue: '',
+          useOrgSid: '',
+          vinNo: '',
+          customerName: '',
+          sids: []
+        },
+        total: 0
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      this.multipleSelection = row
+    },
+    showData(value, useOrgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].topSid)
+        }
+        this.listQuery.params.sids = aa
+      } else {
+        this.listQuery.params.sids = []
+      }
+      this.listQuery.params.useOrgSid = useOrgSid
+      this.handleReset()
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.topApply(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        } else {
+          this.listQuery.total = 0
+          this.list = []
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.installNameValue = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.customerName = ''
+      this.getList()
+    },
+    // 添加修改返回
+    handleConfirm() {
+      if (this.multipleSelection.length > 0) {
+        this.listQuery.params.useOrgSid = ''
+        this.listQuery.params.sids = []
+        this.$emit('backData', this.multipleSelection)
+      } else {
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
+      }
+    },
+    // 返回
+    handleColse() {
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.sids = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/trailerCar.vue

@@ -0,0 +1,174 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择挂车页面</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+          <el-button type="info" size="small" @click="handleColse()">关闭</el-button>
+        </div>
+      </div>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="挂车名称">
+                <el-input v-model="listQuery.params.trailerTypeValue" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="挂车车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="主车车架号">
+                <el-input v-model="listQuery.params.zcVinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">挂车列表</div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50" type="selection" align="center"/>
+            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" />
+            <el-table-column prop="vinNo" label="挂车车架号" align="center" />
+            <el-table-column prop="brandName" label="主车品牌" align="center" />
+            <el-table-column prop="zcVinNo" label="主车车架号" align="center" />
+            <el-table-column prop="customerName" label="客户名称" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/anruifinmanagement/payment'
+
+export default {
+  name: 'TrailerCar',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      multipleSelection: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          trailerTypeValue: '',
+          useOrgSid: '',
+          vinNo: '',
+          zcVinNo: '',
+          customerName: '',
+          sids: []
+        },
+        total: 0
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      this.multipleSelection = row
+    },
+    showData(value, useOrgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].trailerSid)
+        }
+        this.listQuery.params.sids = aa
+      } else {
+        this.listQuery.params.sids = []
+      }
+      this.listQuery.params.useOrgSid = useOrgSid
+      this.handleReset()
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.trailerApply(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        } else {
+          this.listQuery.total = 0
+          this.list = []
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.trailerTypeValue = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.zcVinNo = ''
+      this.listQuery.params.customerName = ''
+      this.getList()
+    },
+    // 添加修改返回
+    handleConfirm() {
+      if (this.multipleSelection.length > 0) {
+        this.listQuery.params.useOrgSid = ''
+        this.listQuery.params.sids = []
+        this.$emit('backData', this.multipleSelection)
+      } else {
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
+      }
+    },
+    // 返回
+    handleColse() {
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.sids = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@@ -123,6 +123,47 @@
               </el-table-column>
             </el-table>
           </div>
+          <div v-show="formobj.costTypeKey == '002'"><!-- 款项类别为挂车采购时显示 -->
+            <div class="title">挂车列表</div>
+            <el-table :key="trailerKey" :data="formobj.trailerList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="外观尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column prop="zcVinNo" label="主车车架号" align="center" width="120" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
+          <div v-show="formobj.costTypeKey == '003'"><!-- 款项类别为上装采购时显示 -->
+            <div class="title">上装列表</div>
+            <el-table :key="topKey" :data="formobj.topList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="installNameValue" label="上装/上装配置名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="货箱内部尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
         </el-form>
       </div>
     </div>
@@ -203,6 +244,8 @@ export default {
       tableKey: 0,
       vehicleKey: 1,
       paymentKey: 2,
+      trailerKey: 3,
+      topKey: 4,
       index: 0,
       formobj: {
         billNo: '', // 申请编号
@@ -231,8 +274,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       },
       rules: {},
       paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
@@ -377,6 +422,16 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.carTotal = sums[index] += ''
+        } else if (column.property === 'costPrice') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
         }
       })
       return sums
@@ -389,7 +444,7 @@ export default {
       this.operation = val
       this.currentLink = true
       this.dialogList.comment = '同意'
-      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKe, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -53,7 +53,7 @@
             <el-col :span="6">
               <div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
               <el-form-item prop="isVeh">
-                <el-radio-group class="addinputInfo" v-model="formobj.isVeh">
+                <el-radio-group :disabled="formobj.costTypeKey !== '001' && formobj.costTypeKey !== ''" class="addinputInfo" v-model="formobj.isVeh">
                   <el-radio label="1">是</el-radio>
                   <el-radio label="0">否</el-radio>
                 </el-radio-group>
@@ -203,12 +203,67 @@
               </el-table-column>
             </el-table>
           </div>
+          <div v-show="formobj.costTypeKey == '002'"><!-- 款项类别为挂车采购时显示 -->
+            <div class="title titleOne">
+              <div>挂车列表</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="trailerSelect()">选择</el-button>
+            </div>
+            <el-table :key="trailerKey" :data="formobj.trailerList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="trailerDelete(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="外观尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column prop="zcVinNo" label="主车车架号" align="center" width="120" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
+          <div v-show="formobj.costTypeKey == '003'"><!-- 款项类别为上装采购时显示 -->
+            <div class="title titleOne">
+              <div>上装列表</div>
+              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="topSelect()">选择</el-button>
+            </div>
+            <el-table :key="topKey" :data="formobj.topList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="topDelete(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="installNameValue" label="上装/上装配置名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="货箱内部尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
         </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
-    <!-- 主车车辆列表选择车辆 -->
-    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="resetState"/>
     <!-- 付款明细表新增关联付款信息 -->
     <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
       <el-form class="formaddcopy02">
@@ -243,6 +298,12 @@
         <el-button size="small" @click="paymentClose">关闭</el-button>
       </div>
     </el-dialog>
+    <!-- 主车车辆列表选择车辆 -->
+    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="resetState"/>
+    <!-- 挂车列表选择车辆 -->
+    <trailerCar v-show="viewState == 6" ref="divTrailer" @backData="backTrailer" @doback="resetState" />
+    <!-- 上装列表选择车辆 -->
+    <top v-show="viewState == 7" ref="divTop" @backData="backTop" @doback="resetState" />
     <!-- 关联付款信息新增 -->
     <paymentInformationAdd v-show="viewState == 3" ref="divPaymentInformation" @backInformation="backInformation" @doback="resetStateByInformation" />
     <!-- 关联付款信息详情 -->
@@ -256,6 +317,8 @@
 import req from '@/api/anruifinmanagement/payment'
 import { typeValues, brandDown, selectNameByOrg, getInvoicingList, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
+import trailerCar from './relation/trailerCar'
+import top from './relation/top'
 import paymentInformationAdd from './relation/paymentInformationAdd'
 import paymentInformationInfo from './relation/paymentInformationInfo'
 import tops from '@/views/workFlow/publicPage/tops'
@@ -264,6 +327,8 @@ export default {
   name: 'FuKuanEdit',
   components: {
     vehcile,
+    trailerCar,
+    top,
     paymentInformationAdd,
     paymentInformationInfo,
     tops
@@ -276,6 +341,8 @@ export default {
       tableKey: 0,
       vehicleKey: 1,
       paymentKey: 2,
+      trailerKey: 3,
+      topKey: 4,
       index: 0,
       carBrand_list: [],
       costRange_list: [],
@@ -311,8 +378,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       },
       rules: {
         carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
@@ -443,8 +512,12 @@ export default {
       const choose = this.costType_list.filter((item) => item.dictValue === value)
       if (choose.length > 0 && choose !== null) {
         this.formobj.costTypeKey = choose[0].dictKey
+        if (this.formobj.costTypeKey !== '001') {
+          this.formobj.isVeh = '0'
+        }
       } else {
         this.formobj.costTypeKey = ''
+        this.formobj.isVeh = ''
       }
     },
     changePayCompany(value) {
@@ -480,6 +553,35 @@ export default {
     handleDelete(index) {
       this.formobj.detailsList.splice(index, 1)
     },
+    changeCostTitle(value, row) {
+      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.costTitleKey = choose[0].dictKey
+      } else {
+        row.costTitleKey = ''
+      }
+    },
+    changePaymentType(value, row) {
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.paymentTypeKey = choose[0].dictKey
+      } else {
+        row.paymentTypeKey = ''
+      }
+    },
+    changeActualPay(value, row) {
+      const choose = this.actualPay_list.filter((item) => item.actualPay === value)
+      if (choose.length > 0 && choose !== null) {
+        row.actualPay = choose[0].actualPay
+        row.receiveCompany = choose[0].accountName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.actualPay = ''
+        row.bank = ''
+        row.receivingAccount = ''
+      }
+    },
     handleAddPayment(row, index) {
       if (row.paymentType === '') {
         this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
@@ -611,33 +713,64 @@ export default {
       this.viewState = 5
       this.$refs['divTops'].showInfo({ sid: row.topSid })
     },
-    changeCostTitle(value, row) {
+    trailerSelect() {
-      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      this.viewState = 6
-      if (choose.length > 0 && choose !== null) {
+      this.$refs['divTrailer'].showData(this.formobj.trailerList, this.formobj.useOrgSid)
-        row.costTitleKey = choose[0].dictKey
-      } else {
-        row.costTitleKey = ''
-      }
     },
-    changePaymentType(value, row) {
+    trailerDelete(index) {
-      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      this.formobj.trailerList.splice(index, 1)
-      if (choose.length > 0 && choose !== null) {
+    },
-        row.paymentTypeKey = choose[0].dictKey
+    backTrailer(value) {
-      } else {
+      this.viewState = 1
-        row.paymentTypeKey = ''
+      value = JSON.parse(JSON.stringify(value))
+      if (value.length > 0) {
+        value.forEach((e) => {
+          this.formobj.trailerList.push({
+            trailerTypeValue: e.trailerTypeValue, // 挂车名称
+            size: e.size, // 外观尺寸
+            vinNo: e.vinNo, // 挂车车架号
+            trailerSid: e.trailerSid, // 挂车sid
+            color: e.color, // 箱体颜色
+            costPrice: e.costPrice, // 厂家结算价
+            brandName: e.brandName, // 品牌名称
+            vehModel: e.vehModel, // 车型别名
+            zcVinNo: e.zcVinNo, // 主车车架号
+            contractNo: e.contractNo, // 合同编号
+            saleOrderNo: e.saleOrderNo, // 销售订单号
+            customerName: e.customerName, // 客户名称
+            payType: e.payType // 销售类型
+          })
+        })
       }
     },
-    changeActualPay(value, row) {
+    topSelect() {
-      const choose = this.actualPay_list.filter((item) => item.actualPay === value)
+      this.viewState = 7
-      if (choose.length > 0 && choose !== null) {
+      this.$refs['divTop'].showData(this.formobj.topList, this.formobj.useOrgSid)
-        row.actualPay = choose[0].actualPay
+    },
-        row.receiveCompany = choose[0].accountName
+    topDelete(index) {
-        row.bank = choose[0].depositBank
+      this.formobj.topList.splice(index, 1)
-        row.receivingAccount = choose[0].bankAccount
+    },
-      } else {
+    backTop(value) {
-        row.actualPay = ''
+      this.viewState = 1
-        row.bank = ''
+      value = JSON.parse(JSON.stringify(value))
-        row.receivingAccount = ''
+      if (value.length > 0) {
+        value.forEach((e) => {
+          this.formobj.topList.push({
+            installNameValue: e.installNameValue, // 上装名称
+            topSid: e.topSid, // 上装sid
+            size: e.size, // 外观尺寸
+            vinNo: e.vinNo, // 车架号
+            vehiSid: e.vehiSid, // 车辆sid
+            color: e.color, // 箱体颜色
+            costPrice: e.costPrice, // 厂家结算价
+            brandName: e.brandName, // 品牌名称
+            vehModel: e.vehModel, // 车型别名
+            contractNo: e.contractNo, // 合同编号
+            saleOrderNo: e.saleOrderNo, // 销售订单号
+            customerName: e.customerName, // 客户名称
+            payType: e.payType // 销售类型
+          })
+        })
       }
     },
     saveOrUpdate() {
@@ -750,6 +883,16 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.carTotal = sums[index] += ''
+        } else if (column.property === 'costPrice') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
         }
       })
       return sums

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@@ -121,6 +121,47 @@
               </el-table-column>
             </el-table>
           </div>
+          <div v-show="formobj.costTypeKey == '002'"><!-- 款项类别为挂车采购时显示 -->
+            <div class="title">挂车列表</div>
+            <el-table :key="trailerKey" :data="formobj.trailerList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="外观尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column prop="zcVinNo" label="主车车架号" align="center" width="120" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
+          <div v-show="formobj.costTypeKey == '003'"><!-- 款项类别为上装采购时显示 -->
+            <div class="title">上装列表</div>
+            <el-table :key="topKey" :data="formobj.topList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="installNameValue" label="上装/上装配置名称" align="center" min-width="180" />
+              <el-table-column prop="size" label="货箱内部尺寸" align="center" width="160" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+              <el-table-column prop="color" label="箱体颜色" align="center" width="100" />
+              <el-table-column prop="costPrice" label="厂家结算价" align="center" width="130" />
+              <el-table-column prop="brandName" label="主车品牌" align="center" width="110" />
+              <el-table-column prop="vehModel" label="主车车型" align="center" width="100" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleOrderNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="payType" label="销售类型" align="center" width="150" />
+            </el-table>
+          </div>
         </el-form>
       </div>
     </div>
@@ -178,6 +219,8 @@ export default {
       tableKey: 0,
       vehicleKey: 1,
       paymentKey: 2,
+      trailerKey: 3,
+      topKey: 4,
       index: 0,
       formobj: {
         billNo: '', // 申请编号
@@ -206,8 +249,10 @@ export default {
         carBrandSid: '', // 品牌sid
         carBrandName: '', // 品牌名称
         orgSidPath: '',
-        detailsList: [],
+        detailsList: [], // 付款信息列表
-        vehicleList: []
+        vehicleList: [], // 主车车辆列表
+        trailerList: [], // 挂车列表
+        topList: [] // 上装列表
       },
       rules: {},
       paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
@@ -335,6 +380,16 @@ export default {
           }, 0)
           sums[index] += ''
           this.formobj.carTotal = sums[index] += ''
+        } else if (column.property === 'costPrice') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
         }
       })
       return sums

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/top.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择上装页面</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+          <el-button type="info" size="small" @click="handleColse()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="上装名称">
+                <el-input v-model="listQuery.params.installNameValue" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">上装列表</div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50" type="selection" align="center"/>
+            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="installNameValue" label="上装名称" align="center" />
+            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="brandName" label="主车品牌" align="center" />
+            <el-table-column prop="customerName" label="客户名称" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/anruifinmanagement/payment'
+
+export default {
+  name: 'Top',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      multipleSelection: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          installNameValue: '',
+          useOrgSid: '',
+          vinNo: '',
+          customerName: '',
+          sids: []
+        },
+        total: 0
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      this.multipleSelection = row
+    },
+    showData(value, useOrgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].topSid)
+        }
+        this.listQuery.params.sids = aa
+      } else {
+        this.listQuery.params.sids = []
+      }
+      this.listQuery.params.useOrgSid = useOrgSid
+      this.handleReset()
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.topApply(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        } else {
+          this.listQuery.total = 0
+          this.list = []
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.installNameValue = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.customerName = ''
+      this.getList()
+    },
+    // 添加修改返回
+    handleConfirm() {
+      if (this.multipleSelection.length > 0) {
+        this.listQuery.params.useOrgSid = ''
+        this.listQuery.params.sids = []
+        this.$emit('backData', this.multipleSelection)
+      } else {
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
+      }
+    },
+    // 返回
+    handleColse() {
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.sids = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/trailerCar.vue

@@ -0,0 +1,174 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择挂车页面</div>
+        <div>
+          <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+          <el-button type="info" size="small" @click="handleColse()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="挂车名称">
+                <el-input v-model="listQuery.params.trailerTypeValue" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="挂车车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="主车车架号">
+                <el-input v-model="listQuery.params.zcVinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">挂车列表</div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50" type="selection" align="center"/>
+            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="trailerTypeValue" label="挂车名称" align="center" />
+            <el-table-column prop="vinNo" label="挂车车架号" align="center" />
+            <el-table-column prop="brandName" label="主车品牌" align="center" />
+            <el-table-column prop="zcVinNo" label="主车车架号" align="center" />
+            <el-table-column prop="customerName" label="客户名称" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/anruifinmanagement/payment'
+
+export default {
+  name: 'TrailerCar',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      multipleSelection: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          trailerTypeValue: '',
+          useOrgSid: '',
+          vinNo: '',
+          zcVinNo: '',
+          customerName: '',
+          sids: []
+        },
+        total: 0
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      this.multipleSelection = row
+    },
+    showData(value, useOrgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push(value[i].trailerSid)
+        }
+        this.listQuery.params.sids = aa
+      } else {
+        this.listQuery.params.sids = []
+      }
+      this.listQuery.params.useOrgSid = useOrgSid
+      this.handleReset()
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.trailerApply(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        } else {
+          this.listQuery.total = 0
+          this.list = []
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 5
+      this.listQuery.total = 0
+      this.listQuery.params.trailerTypeValue = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.zcVinNo = ''
+      this.listQuery.params.customerName = ''
+      this.getList()
+    },
+    // 添加修改返回
+    handleConfirm() {
+      if (this.multipleSelection.length > 0) {
+        this.listQuery.params.useOrgSid = ''
+        this.listQuery.params.sids = []
+        this.$emit('backData', this.multipleSelection)
+      } else {
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
+      }
+    },
+    // 返回
+    handleColse() {
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.sids = []
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -83,6 +87,10 @@ public class FinPaymentapplyDetailsVo implements Vo {
     private List<FinPaymentapplyDetailVo> detailsList = new ArrayList<>();
 
     private List<FinPaymentapplyVehicleVo> vehicleList = new ArrayList<>();
+
+    private List<FinPaymentapplyTrailerDetailsVo> trailerList;
+    private List<FinPaymentapplyTopDetailsVo> topList;
+
     private String isVeh;
 
     @ApiModelProperty(value = "品牌sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -78,6 +80,10 @@ public class FinPaymentapplyDto implements Dto {
     private List<FinPaymentapplyDetailDto> detailsList;
 
     private List<FinPaymentapplyVehicleDto> vehicleList;
+
+    private List<FinPaymentapplyTrailerDto> trailerList;
+    private List<FinPaymentapplyTopDto> topList;
+
     @ApiModelProperty("是否涉及车辆，1是，0否")
     @NotBlank(message = "请选择是否涉及车辆")
     private String isVeh;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTop.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTop.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop <br/>
+ * Description: 付款申请上装. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请上装", description = "付款申请上装")
+@TableName("fin_paymentapply_top")
+public class FinPaymentapplyTop extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("上装名称")
+    private String installNameValue; // 上装名称
+    @ApiModelProperty("货箱内部尺寸")
+    private String size; // 货箱内部尺寸
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("上装sid")
+    private String topSid; // 上装sid
+    @ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDetailsVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTopVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopVo <br/>
+ * Description: 付款申请上装 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请上装 视图数据详情", description = "付款申请上装 视图数据详情")
+public class FinPaymentapplyTopDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("上装名称")
+    private String installNameValue; // 上装名称
+	@ApiModelProperty("货箱内部尺寸")
+    private String size; // 货箱内部尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("上装sid")
+    private String topSid; // 上装sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopDto.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTopDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto <br/>
+ * Description: 付款申请上装 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请上装 数据传输对象", description = "付款申请上装 数据传输对象")
+public class FinPaymentapplyTopDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("上装名称")
+    private String installNameValue; // 上装名称
+    @ApiModelProperty("货箱内部尺寸")
+    private String size; // 货箱内部尺寸
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("上装sid")
+    private String topSid; // 上装sid
+    @ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytop/FinPaymentapplyTopFeign.java

@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytop;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@Api(tags = "付款申请上装")
+@FeignClient(
+        contextId = "anrui-fin-FinPaymentapplyTop",
+        name = "anrui-fin",
+        path = "v1/finpaymentapplytop")
+public interface FinPaymentapplyTopFeign {
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailer.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailer.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer <br/>
+ * Description: 付款申请挂车. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请挂车", description = "付款申请挂车")
+@TableName("fin_paymentapply_trailer")
+public class FinPaymentapplyTrailer extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("挂车名称")
+    private String trailerTypeValue; // 挂车名称
+	@ApiModelProperty("外观尺寸")
+    private String size; // 外观尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("挂车sid")
+    private String trailerSid; // 挂车sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String zcVinNo; // 主车车架号
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDetailsVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailerVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerVo <br/>
+ * Description: 付款申请挂车 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请挂车 视图数据详情", description = "付款申请挂车 视图数据详情")
+public class FinPaymentapplyTrailerDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+	@ApiModelProperty("挂车名称")
+    private String trailerTypeValue; // 挂车名称
+	@ApiModelProperty("外观尺寸")
+    private String size; // 外观尺寸
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("挂车sid")
+    private String trailerSid; // 挂车sid
+	@ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+	@ApiModelProperty("主车车架号")
+    private String zcVinNo; // 主车车架号
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerDto.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto <br/>
+ * Description: 付款申请挂车 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款申请挂车 数据传输对象", description = "付款申请挂车 数据传输对象")
+public class FinPaymentapplyTrailerDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("付款申请sid")
+    private String applySid; // 付款申请sid
+    @ApiModelProperty("挂车名称")
+    private String trailerTypeValue; // 挂车名称
+    @ApiModelProperty("外观尺寸")
+    private String size; // 外观尺寸
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("挂车sid")
+    private String trailerSid; // 挂车sid
+    @ApiModelProperty("箱体颜色")
+    private String color; // 箱体颜色
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice; // 厂家结算价
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("车型别名")
+    private String vehModel; // 车型别名
+    @ApiModelProperty("主车车架号")
+    private String zcVinNo; // 主车车架号
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("销售订单号")
+    private String saleOrderNo; // 销售订单号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+    @ApiModelProperty("销售类型")
+    private String payType; // 销售类型
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplytrailer/FinPaymentapplyTrailerFeign.java

@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finpaymentapplytrailer;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@Api(tags = "付款申请挂车")
+@FeignClient(
+        contextId = "anrui-fin-FinPaymentapplyTrailer",
+        name = "anrui-fin",
+        path = "v1/finpaymentapplytrailer")
+public interface FinPaymentapplyTrailerFeign {
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java

@@ -56,5 +56,7 @@ public class GeneralVoucher {
         public String material;
         @ApiModelProperty("备注")
         public String remarks;
+        @ApiModelProperty("采购系统sid")
+        public String purchaseSystemSid;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -48,6 +48,10 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
@@ -57,6 +61,8 @@ import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
+import com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopService;
+import com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerService;
 import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
 import com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -128,10 +134,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     @Autowired
     private FinPaymentrecordService finPaymentrecordService;
     @Autowired
-    private SysStaffPostFeign sysStaffPostFeign;
+    private FinPaymentapplyTopService finPaymentapplyTopService;
     @Autowired
-    private SysParameterFeign sysParameterFeign;
+    private FinPaymentapplyTrailerService finPaymentapplyTrailerService;
-
     @Autowired
     private FinPaymentapplyDetailsService finPaymentapplyDetailsService;
     @Autowired
@@ -144,10 +149,6 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     private FinCompanyInvoicingService finCompanyInvoicingService;
     @Autowired
     private MessageFeign messageFeign;
-    @Autowired
-    private ScmCollectionRebateFeign scmCollectionRebateFeign;
-    @Autowired
-    private BaseVehicleFeign baseVehicleFeign;
 
     public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
         FinPaymentapplyQuery query = pq.getParams();
@@ -285,6 +286,22 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
             }
 
+            if ("002".equals(dto.getCostTypeKey())){//挂车采购
+                List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
+                for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) {
+                    finPaymentapplyTrailerDto.setApplySid(finPaymentapply.getSid());
+                    finPaymentapplyTrailerService.insertByDto(finPaymentapplyTrailerDto);
+                }
+            }
+
+            if ("003".equals(dto.getCostTypeKey())){//上装采购
+                List<FinPaymentapplyTopDto> topList = dto.getTopList();
+                for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) {
+                    finPaymentapplyTopDto.setApplySid(finPaymentapply.getSid());
+                    finPaymentapplyTopService.insertByDto(finPaymentapplyTopDto);
+                }
+            }
+
             baseMapper.insert(finPaymentapply);
             dtoSid = finPaymentapply.getSid();
         } else {
@@ -309,6 +326,26 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             } else {
                 finPaymentapplyVehicleService.deleteVehicle(dtoSid);
             }
+
+            finPaymentapplyTrailerService.delByMainSid(dtoSid);
+            finPaymentapplyTopService.delByMainSid(dtoSid);
+
+            if ("002".equals(dto.getCostTypeKey())){//挂车采购
+                List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
+                for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) {
+                    finPaymentapplyTrailerDto.setApplySid(dtoSid);
+                    finPaymentapplyTrailerService.insertByDto(finPaymentapplyTrailerDto);
+                }
+            }
+
+            if ("003".equals(dto.getCostTypeKey())){//上装采购
+                List<FinPaymentapplyTopDto> topList = dto.getTopList();
+                for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) {
+                    finPaymentapplyTopDto.setApplySid(dtoSid);
+                    finPaymentapplyTopService.insertByDto(finPaymentapplyTopDto);
+                }
+            }
+
             baseMapper.updateById(finPaymentapply);
         }
         return rb.success().setData(dtoSid);
@@ -320,7 +357,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
-        b.setBillType(BillTypeEnum.FYSQ.getBillType());
+        b.setBillType(BillTypeEnum.FKSQ.getBillType());
         String bill = Rule.getBill(b);
         String billNo = "";
         String i = baseMapper.selectNum(bill);
@@ -347,6 +384,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid);
         vo.setDetailsList(detailsList);
         vo.setVehicleList(vehicleList);
+        List<FinPaymentapplyTrailerDetailsVo> finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid);
+        List<FinPaymentapplyTopDetailsVo> finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid);
+        vo.setTrailerList(finPaymentapplyTrailerDetailsVos);
+        vo.setTopList(finPaymentapplyTopDetailsVos);
         return vo;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface FinPaymentapplyTopMapper extends BaseMapper<FinPaymentapplyTop> {
+
+    @Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+    @Select("select * from fin_paymentapply_top where applySid = #{mainSid}")
+    List<FinPaymentapplyTopDetailsVo> fetchByMainSid(String mainSid);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopRest.java

@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytop;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopFeign;
+
+@Api(tags = "付款申请上装")
+@RestController
+@RequestMapping("v1/finpaymentapplytop")
+public class FinPaymentapplyTopRest implements FinPaymentapplyTopFeign {
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytop;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTopService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplytop.FinPaymentapplyTopService <br/>
+ * Description: 付款申请上装 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinPaymentapplyTopService extends MybatisBaseService<FinPaymentapplyTopMapper, FinPaymentapplyTop> {
+	
+	public void insertByDto(FinPaymentapplyTopDto dto){
+		FinPaymentapplyTop entity = new FinPaymentapplyTop();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<FinPaymentapplyTopDetailsVo> fetchByMainSid(String mainSid) {
+		return baseMapper.fetchByMainSid(mainSid);
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java

@@ -0,0 +1,45 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface FinPaymentapplyTrailerMapper extends BaseMapper<FinPaymentapplyTrailer> {
+
+    @Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+    @Select("select * from fin_paymentapply_trailer where applySid = #{mainSid}")
+    List<FinPaymentapplyTrailerDetailsVo> fetchByMainSid(String mainSid);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerRest.java

@@ -0,0 +1,38 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerFeign;
+
+@Api(tags = "付款申请挂车")
+@RestController
+@RequestMapping("v1/finpaymentapplytrailer")
+public class FinPaymentapplyTrailerRest implements FinPaymentapplyTrailerFeign {
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(付款申请) <br/>
+ * File: FinPaymentapplyTrailerService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finpaymentapplytrailer.FinPaymentapplyTrailerService <br/>
+ * Description: 付款申请挂车 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-14 10:55:50 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinPaymentapplyTrailerService extends MybatisBaseService<FinPaymentapplyTrailerMapper, FinPaymentapplyTrailer> {
+	
+	public void insertByDto(FinPaymentapplyTrailerDto dto){
+		FinPaymentapplyTrailer entity = new FinPaymentapplyTrailer();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<FinPaymentapplyTrailerDetailsVo> fetchByMainSid(String mainSid) {
+		return baseMapper.fetchByMainSid(mainSid);
+	}
+}

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

@@ -986,7 +986,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             finPaymentrecordSourceLCVos.sort(comparing(FinPaymentrecordSourceLCVo::getSpsj));
             dataMap.put("lcList", finPaymentrecordSourceLCVos);
         }
-        dataMap.put("payCode", finPaymentrecord.getId());
+        dataMap.put("payCode", String.valueOf (finPaymentrecord.getId()));
         dataMap.put("createTime", DateUtil.format(finPaymentrecord.getCreateTime(), "yyyy-MM-dd"));
         dataMap.put("createByName", createByName);
         dataMap.put("createByDeptName", deptName);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -249,26 +249,49 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             newVoucher.setBussDate(voucher.getBussDate());
         }
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
+        BigDecimal shangnian = BigDecimal.ZERO;//上年
+        BigDecimal bennian = BigDecimal.ZERO;//本年
+        BigDecimal total = BigDecimal.ZERO;//合计
+        String deptNo = "";
+        String manufacturer = "";
+        String timeFlag = "";
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                BigDecimal amount = voucherDetail.getAmount();
-                Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
-                dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利预提预留费用");
-                dto2.setSummary(voucherDetail.getTimeFlag() + "单车返利预提预留费用");
                 if (voucherDetail.getSceneCode().equals("上年")) {
-                    dto1.setSubjectNo("1161.02.15");
+                    shangnian = shangnian.add(amount);
                 } else if (voucherDetail.getSceneCode().equals("本年")) {
-                    dto1.setSubjectNo("1161.01.15");
+                    bennian = bennian.add(amount);
                 }
-                dto2.setSubjectNo("2181.07.00");
+                total = total.add(amount);
-                dto1.setDimensionDept(voucherDetail.getDeptCode());
+                deptNo = voucherDetail.getDeptCode();
-                dto1.setManufacturer(voucherDetail.getManufacturer());
+                manufacturer = voucherDetail.getManufacturer();
-                dto2.setDimensionCustom(voucherDetail.getCustomerCode());
+                timeFlag = voucherDetail.getTimeFlag();
-                dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+            }
-                dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+            if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                dto1.setSummary(timeFlag + "单车返利预提预留费用");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(shangnian));
                 resultDetails.add(dto1);
-                resultDetails.add(dto2);
             }
+            if (bennian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                dto1.setSummary(timeFlag + "单车返利预提预留费用");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bennian));
+                resultDetails.add(dto1);
+            }
+            Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+            dto2.setSummary(timeFlag + "单车返利预提预留费用");
+            dto2.setSubjectNo("2181.07.00");
+            dto2.setDimensionCustom("DZFCJFL");
+            dto2.setCredit(String.valueOf(total));
+            resultDetails.add(dto2);
             newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
@@ -366,18 +389,26 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal cjwdx = BigDecimal.ZERO;// 单车厂家未兑现返利
+        BigDecimal shangnian = BigDecimal.ZERO;// 单车上年返利
+        BigDecimal bennian = BigDecimal.ZERO;// 单车本年返利
+        BigDecimal qtdk = BigDecimal.ZERO;// 单车应收厂家返利其他垫款
+        BigDecimal sntz = BigDecimal.ZERO;// 上年返利调整
+        BigDecimal bntz = BigDecimal.ZERO;// 本年返利调整
+        BigDecimal qttz = BigDecimal.ZERO;// 其他应付调整
+        BigDecimal cjwdxJR = BigDecimal.ZERO;// 厂家未兑现返利金融
+        String deptNo = "";
+        String manufacturer = "";
+        String timeFlag = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
+                timeFlag = voucherDetail.getTimeFlag();
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
                 if (voucherDetail.getRemarks().equals("金融贴息")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                        cjwdxJR = cjwdxJR.add(voucherDetail.getAmount());
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "金融贴息上传");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
                     }
                     if (voucherDetail.getSceneCode().equals("1161.02.19") || voucherDetail.getSceneCode().equals("1161.01.19")) {
                         Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
@@ -393,48 +424,100 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 }
                 if (voucherDetail.getRemarks().equals("返利上传")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                        cjwdx = cjwdx.add(voucherDetail.getAmount());
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
                     }
-                    if (voucherDetail.getSceneCode().equals("1161.02.15") ||
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                            voucherDetail.getSceneCode().equals("1161.01.15") ||
+                        shangnian = shangnian.add(voucherDetail.getAmount());
-                            voucherDetail.getSceneCode().equals("1161.04.00")) {
+                    }
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传");
+                        bennian = bennian.add(voucherDetail.getAmount());
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
+                    }
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
+                    if (voucherDetail.getSceneCode().equals("1161.04.00")) {
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
+                        qtdk = qtdk.add(voucherDetail.getAmount());
-                        dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
                     }
                 }
-
                 if (voucherDetail.getRemarks().equals("预留费用调整")) {
-                    if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                        sntz = sntz.add(voucherDetail.getAmount());
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "返利上传预留费用调整");
+                    }
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
+                        bntz = bntz.add(voucherDetail.getAmount());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
                     }
                     if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                        qttz = qttz.add(voucherDetail.getAmount());
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "返利上传预留费用调整");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                        dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
                     }
                 }
-
+            }
-
+            if (cjwdxJR.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "金融贴息上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjwdxJR));
+                resultDetails.add(dto1);
+            }
+            if (cjwdx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjwdx));
+                resultDetails.add(dto1);
+            }
+            if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(shangnian));
+                resultDetails.add(dto1);
+            }
+            if (bennian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(bennian));
+                resultDetails.add(dto1);
+            }
+            if (qtdk.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.04.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(qtdk));
+                resultDetails.add(dto1);
+            }
+            if (sntz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "返利上传预留费用调整");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(sntz));
+                resultDetails.add(dto1);
+            }
+            if (bntz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "返利上传预留费用调整");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bntz));
+                resultDetails.add(dto1);
+            }
+            if (qttz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "返利上传预留费用调整");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qttz));
+                resultDetails.add(dto1);
             }
             newVoucher.setResultDetails(resultDetails);
         }
@@ -454,35 +537,65 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal snfl = BigDecimal.ZERO;//上年返利
+        BigDecimal bnfl = BigDecimal.ZERO;//本年返利
+        BigDecimal cjfl = BigDecimal.ZERO;//厂家返利
+        BigDecimal qtfl = BigDecimal.ZERO;//其他应付款
+        String deptNo = "";
+        String manufacturer = "";
+        String timeFlag = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
+                deptNo = voucherDetail.getDeptCode();
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                manufacturer = voucherDetail.getManufacturer();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利预提");
+                timeFlag = voucherDetail.getTimeFlag();
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
+                if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
+                    snfl = snfl.add(voucherDetail.getAmount());
-                    dto1.setManufacturer(voucherDetail.getManufacturer());
+                }
-                    dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+                if (voucherDetail.getSceneCode().equals("1161.01.15")) {
-                    resultDetails.add(dto1);
+                    bnfl = bnfl.add(voucherDetail.getAmount());
                 }
                 if (voucherDetail.getSceneCode().equals("6401.13")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                    cjfl = cjfl.add(voucherDetail.getAmount());
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                    dto1.setDebit(voucherDetail.getAmount().negate().toString());//转负数
-                    resultDetails.add(dto1);
                 }
                 if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                    qtfl = qtfl.add(voucherDetail.getAmount());
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                    dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                    resultDetails.add(dto1);
                 }
-
+            }
+            if (snfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(snfl));
+                resultDetails.add(dto1);
+            }
+            if (bnfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bnfl));
+                resultDetails.add(dto1);
+            }
+            if (cjfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("6401.13");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(cjfl.negate().toString());//转负数
+                resultDetails.add(dto1);
+            }
+            if (qtfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qtfl));
+                resultDetails.add(dto1);
             }
             newVoucher.setResultDetails(resultDetails);
         }
@@ -502,118 +615,217 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal cjflxx = BigDecimal.ZERO;//厂家未兑现行销
+        BigDecimal qtyfxx = BigDecimal.ZERO;//其他应付行销
+        BigDecimal dkxx = BigDecimal.ZERO;//垫款行销
+        BigDecimal qtdkxx = BigDecimal.ZERO;//其他垫款行销
+        BigDecimal srlxx = BigDecimal.ZERO;//收入行销
+        BigDecimal dkxxtz = BigDecimal.ZERO;//垫款行销调整
+        BigDecimal srxxtz = BigDecimal.ZERO;//收入行销调整
+        BigDecimal cjfl = BigDecimal.ZERO;//厂家未兑现
+        BigDecimal snfl = BigDecimal.ZERO;//上年返利
+        BigDecimal bnfl = BigDecimal.ZERO;//本年返利
+        BigDecimal qtdk = BigDecimal.ZERO;//其他垫款
+        BigDecimal snfltz = BigDecimal.ZERO;//上年返利调整
+        BigDecimal bnfltz = BigDecimal.ZERO;//本年返利调整
+        BigDecimal cjfltz = BigDecimal.ZERO;//厂家返利调整
+        BigDecimal qtyftz = BigDecimal.ZERO;//其他应付调整
+        String timeFlag = "";
+        String deptNo = "";
+        String manufacturer = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
+                timeFlag = voucherDetail.getTimeFlag();
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
                 if (!voucherDetail.getType().equals("行销活动")) {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            cjfl = cjfl.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利上传");
+                        }
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
+                        if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
+                            snfl = snfl.add(voucherDetail.getAmount());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
+                        }
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+                        if (voucherDetail.getSceneCode().equals("1161.01.15")) {
-                            resultDetails.add(dto1);
+                            bnfl = bnfl.add(voucherDetail.getAmount());
                         }
-                        if (voucherDetail.getSceneCode().equals("1161.02.15") ||
+                        if (voucherDetail.getSceneCode().equals("1161.04.00")) {
-                                voucherDetail.getSceneCode().equals("1161.01.15") ||
+                            qtdk = qtdk.add(voucherDetail.getAmount());
-                                voucherDetail.getSceneCode().equals("1161.04.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
                     }
                     if (voucherDetail.getRemarks().equals("返利调整")) {
-                        if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            snfltz = snfltz.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
+                        }
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
+                        if (voucherDetail.getSceneCode().equals("1161.01.15")) {
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
+                            bnfltz = bnfltz.add(voucherDetail.getAmount());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
                         if (voucherDetail.getSceneCode().equals("6401.13")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            cjfltz = cjfltz.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setDebit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
                         }
                         if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            qtyftz = qtyftz.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
                     }
                 } else {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            cjflxx = cjflxx.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
                         if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            qtyfxx = qtyfxx.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
+                        }
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
+                        if (voucherDetail.getSceneCode().equals("1161.03.00")) {
-                            dto1.setDimensionCustom(voucherDetail.getCustomerCode());
+                            dkxx = dkxx.add(voucherDetail.getAmount());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
-                        if (voucherDetail.getSceneCode().equals("1161.03.00") ||
+                        if (voucherDetail.getSceneCode().equals("1161.04.00")) {
-                                voucherDetail.getSceneCode().equals("1161.04.00")) {
+                            qtdkxx = qtdkxx.add(voucherDetail.getAmount());
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
                         if (voucherDetail.getSceneCode().equals("6401.14")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            srlxx = srlxx.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setCredit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
                         }
                     }
                     if (voucherDetail.getRemarks().equals("返利调整")) {
                         if (voucherDetail.getSceneCode().equals("1161.03.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            dkxxtz = dkxxtz.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
                         }
                         if (voucherDetail.getSceneCode().equals("6401.14")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                            srxxtz = srxxtz.add(voucherDetail.getAmount());
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setDebit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
                         }
                     }
                 }
             }
+            if (cjfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjfl));
+                resultDetails.add(dto1);
+            }
+            if (snfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(snfl));
+                resultDetails.add(dto1);
+            }
+            if (bnfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(bnfl));
+                resultDetails.add(dto1);
+            }
+            if (qtdk.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.04.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(qtdk));
+                resultDetails.add(dto1);
+            }
+            if (snfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(snfltz));
+                resultDetails.add(dto1);
+            }
+            if (bnfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bnfltz));
+                resultDetails.add(dto1);
+            }
+            if (cjfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("6401.13");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(cjfltz.negate().toString());
+                resultDetails.add(dto1);
+            }
+            if (qtyftz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qtyftz));
+                resultDetails.add(dto1);
+            }
+            if (cjflxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjflxx));
+                resultDetails.add(dto1);
+            }
+            if (qtyfxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qtyfxx));
+                resultDetails.add(dto1);
+            }
+            if (dkxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("1161.03.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(dkxx));
+                resultDetails.add(dto1);
+            }
+            if (qtdkxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("1161.04.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(qtdkxx));
+                resultDetails.add(dto1);
+            }
+            if (srlxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("6401.14");
+                dto1.setDimensionDept(deptNo);
+                dto1.setCredit(srlxx.negate().toString());
+                resultDetails.add(dto1);
+            }
+            if (dkxxtz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("1161.03.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(dkxxtz));
+                resultDetails.add(dto1);
+            }
+            if (srxxtz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("6401.14");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(srxxtz.negate().toString());
+                resultDetails.add(dto1);
+            }
             newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
@@ -632,27 +844,54 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal sn = BigDecimal.ZERO; //上年返利
+        BigDecimal bn = BigDecimal.ZERO;//本年返利
+        BigDecimal cd = BigDecimal.ZERO;//承兑贴息
+        String timeFlag = "";
+        String deptNo = "";
+        String manufacturer = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
+                timeFlag = voucherDetail.getTimeFlag();
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                deptNo = voucherDetail.getDeptCode();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利预提");
+                manufacturer = voucherDetail.getManufacturer();
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
+                if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
+                    sn = sn.add(voucherDetail.getAmount());
-                    dto1.setManufacturer(voucherDetail.getManufacturer());
+                }
-                    dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+                if (voucherDetail.getSceneCode().equals("1161.01.15")) {
-                    resultDetails.add(dto1);
+                    bn = bn.add(voucherDetail.getAmount());
                 }
                 if (voucherDetail.getSceneCode().equals("2191.03")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                    cd = cd.add(voucherDetail.getAmount());
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                    dto1.setCredit(voucherDetail.getAmount().toString());
-                    resultDetails.add(dto1);
                 }
             }
+            if (sn.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利预提");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(sn));
+                resultDetails.add(dto1);
+            }
+            if (bn.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利预提");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bn));
+                resultDetails.add(dto1);
+            }
+            if (cd.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利预提");
+                dto1.setSubjectNo("2191.03");
+                dto1.setDimensionDept(deptNo);
+                dto1.setCredit(cd.toString());
+                resultDetails.add(dto1);
+            }
             newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
@@ -671,59 +910,110 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal cjfl = BigDecimal.ZERO;//厂家未兑现
+        BigDecimal snfl = BigDecimal.ZERO;//上年返利
+        BigDecimal bnfl = BigDecimal.ZERO;//本年返利
+        BigDecimal cjfltz = BigDecimal.ZERO;//厂家返利调整
+        BigDecimal snfltz = BigDecimal.ZERO;//上年返利调整
+        BigDecimal bnfltz = BigDecimal.ZERO;//本年返利调整
+        BigDecimal ndsy = BigDecimal.ZERO;//以前年度损益
+        String timeFlag = "";
+        String deptNo = "";
+        String manufacturer = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                    if (voucherDetail.getRemarks().equals("返利上传")) {
+                timeFlag = voucherDetail.getTimeFlag();
-                        if (voucherDetail.getSceneCode().equals("1161.01.16")) {
+                deptNo = voucherDetail.getDeptCode();
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                manufacturer = voucherDetail.getManufacturer();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传");
+                BigDecimal amount = voucherDetail.getAmount();
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
+                if (voucherDetail.getRemarks().equals("返利上传")) {
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
+                    if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
+                        cjfl = cjfl.add(amount);
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
-                        if (voucherDetail.getSceneCode().equals("1161.02.15") ||
-                                voucherDetail.getSceneCode().equals("1161.01.15")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
                     }
-                    if (voucherDetail.getRemarks().equals("返利调整")) {
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
-                        if (voucherDetail.getSceneCode().equals("6401.13")) {
+                        snfl = snfl.add(amount);
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setDebit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
-                        }
-                        if (voucherDetail.getSceneCode().equals("1161.01.15") || voucherDetail.getSceneCode().equals("1161.02.15")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
-                        if (voucherDetail.getSceneCode().equals("6801")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
                     }
-
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        bnfl = bnfl.add(amount);
+                    }
+                }
+                if (voucherDetail.getRemarks().equals("返利调整")) {
+                    if (voucherDetail.getSceneCode().equals("6401.13")) {
+                        cjfltz = cjfltz.add(amount);
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        bnfltz = bnfltz.add(amount);
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                        snfltz = snfltz.add(amount);
+                    }
+                    if (voucherDetail.getSceneCode().equals("6801")) {
+                        ndsy = ndsy.add(amount);
+                    }
+                }
+            }
+            if (cjfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjfl));
+                resultDetails.add(dto1);
+            }
+            if (snfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(snfl));
+                resultDetails.add(dto1);
+            }
+            if (bnfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(bnfl));
+                resultDetails.add(dto1);
+            }
+            if (cjfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("6401.13");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(cjfltz.negate().toString());
+                resultDetails.add(dto1);
+            }
+            if (bnfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bnfltz));
+                resultDetails.add(dto1);
+            }
+            if (snfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(snfltz));
+                resultDetails.add(dto1);
+                newVoucher.setResultDetails(resultDetails);
+            }
+            if (ndsy.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("6801");
+                dto1.setCredit(String.valueOf(ndsy));
+                resultDetails.add(dto1);
             }
-            newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
         return voucherService.saveVoucher(newVoucher);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_model.json

@@ -18,10 +18,6 @@
   "FACCTPOLICYID": {
     "FNumber": "KJZC01_SYS"
   },
-  "FCurrencyID": {
-    "FNumber": ""
-  },
-  "FAdjustmentReason": "",
   "FAcctgId": "0",
   "FDocumentStatus": "Z",
   "FCreateDate": "@KD_FDATE",

anrui-fin/anrui-fin-biz/src/main/resources/ftl/prePaymentApply.ftl

@@ -118,57 +118,35 @@
                     </w:p>
                     <w:tbl>
                         <w:tblPr>
-                            <w:tblStyle w:val="10"/>
                             <w:tblW w:w="4778" w:type="pct"/>
                             <w:tblInd w:w="0" w:type="dxa"/>
                             <w:tblBorders>
-                                <w:top w:val="single" w:color="auto" w:sz="4" w:space="0"/>
+                                <w:top w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-                                <w:left w:val="single" w:color="auto" w:sz="4" w:space="0"/>
+                                <w:left w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-                                <w:bottom w:val="single" w:color="auto" w:sz="4" w:space="0"/>
+                                <w:bottom w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-                                <w:right w:val="single" w:color="auto" w:sz="4" w:space="0"/>
+                                <w:right w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-                                <w:insideH w:val="single" w:color="auto" w:sz="4" w:space="0"/>
+                                <w:insideH w:val="single" w:sz="4" w:space="0" w:color="auto"/>
-                                <w:insideV w:val="single" w:color="auto" w:sz="4" w:space="0"/>
+                                <w:insideV w:val="single" w:sz="4" w:space="0" w:color="auto"/>
                             </w:tblBorders>
-                            <w:tblLayout w:type="autofit"/>
+                            <w:tblLook w:val="0000" w:firstRow="0" w:lastRow="0" w:firstColumn="0" w:lastColumn="0"
-                            <w:tblCellMar>
+                                       w:noHBand="0" w:noVBand="0"/>
-                                <w:top w:w="0" w:type="dxa"/>
-                                <w:left w:w="108" w:type="dxa"/>
-                                <w:bottom w:w="0" w:type="dxa"/>
-                                <w:right w:w="108" w:type="dxa"/>
-                            </w:tblCellMar>
                         </w:tblPr>
                         <w:tblGrid>
-                            <w:gridCol w:w="1743"/>
+                            <w:gridCol w:w="1744"/>
-                            <w:gridCol w:w="4031"/>
+                            <w:gridCol w:w="4030"/>
                             <w:gridCol w:w="2370"/>
                         </w:tblGrid>
-                        <w:tr>
+                        <w:tr w:rsidR="008C0868" w14:paraId="1CBBE111" w14:textId="77777777" w:rsidTr="008C0868">
-                            <w:tblPrEx>
-                                <w:tblBorders>
-                                    <w:top w:val="single" w:color="auto" w:sz="4" w:space="0"/>
-                                    <w:left w:val="single" w:color="auto" w:sz="4" w:space="0"/>
-                                    <w:bottom w:val="single" w:color="auto" w:sz="4" w:space="0"/>
-                                    <w:right w:val="single" w:color="auto" w:sz="4" w:space="0"/>
-                                    <w:insideH w:val="single" w:color="auto" w:sz="4" w:space="0"/>
-                                    <w:insideV w:val="single" w:color="auto" w:sz="4" w:space="0"/>
-                                </w:tblBorders>
-                                <w:tblCellMar>
-                                    <w:top w:w="0" w:type="dxa"/>
-                                    <w:left w:w="108" w:type="dxa"/>
-                                    <w:bottom w:w="0" w:type="dxa"/>
-                                    <w:right w:w="108" w:type="dxa"/>
-                                </w:tblCellMar>
-                            </w:tblPrEx>
                             <w:trPr>
-                                <w:trHeight w:val="454" w:hRule="atLeast"/>
+                                <w:trHeight w:val="454"/>
                             </w:trPr>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="1070" w:type="pct"/>
+                                    <w:tcW w:w="1071" w:type="pct"/>
-                                    <w:noWrap w:val="0"/>
                                     <w:vAlign w:val="center"/>
                                 </w:tcPr>
-                                <w:p>
+                                <w:p w14:paraId="68D20918" w14:textId="77777777" w:rsidR="008C0868"
+                                     w:rsidRDefault="008C0868">
                                     <w:r>
                                         <w:rPr>
                                             <w:rFonts w:hint="eastAsia"/>
@@ -181,26 +159,38 @@
                                 <w:tcPr>
                                     <w:tcW w:w="3929" w:type="pct"/>
                                     <w:gridSpan w:val="2"/>
-                                    <w:noWrap w:val="0"/>
                                     <w:vAlign w:val="center"/>
                                 </w:tcPr>
-                                <w:p>
+                                <w:p w14:paraId="22F7EFEB" w14:textId="68B0905B" w:rsidR="008C0868"
+                                     w:rsidRDefault="008C0868">
+                                    <w:bookmarkStart w:id="0" w:name="OLE_LINK1"/>
                                     <w:r>
                                         <w:rPr>
                                             <w:rFonts w:hint="eastAsia"/>
                                         </w:rPr>
                                         <w:t>${applyCode!}</w:t>
                                     </w:r>
+                                    <w:bookmarkEnd w:id="0"/>
                                 </w:p>
                             </w:tc>
+                        </w:tr>
+                        <w:tr w:rsidR="008C0868" w14:paraId="73A61FA1" w14:textId="77777777" w:rsidTr="008C0868">
+                            <w:trPr>
+                                <w:trHeight w:val="454"/>
+                            </w:trPr>
                             <w:tc>
                                 <w:tcPr>
-                                    <w:tcW w:w="1070" w:type="pct"/>
+                                    <w:tcW w:w="1071" w:type="pct"/>
-                                    <w:noWrap w:val="0"/>
                                     <w:vAlign w:val="center"/>
                                 </w:tcPr>
-                                <w:p>
+                                <w:p w14:paraId="57E58C73" w14:textId="5566BE96" w:rsidR="008C0868"
-                                    <w:r>
+                                     w:rsidRDefault="008C0868" w:rsidP="008C0868">
+                                    <w:pPr>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia"/>
+                                        </w:rPr>
+                                    </w:pPr>
+                                    <w:r w:rsidRPr="00E91B16">
                                         <w:rPr>
                                             <w:rFonts w:hint="eastAsia"/>
                                         </w:rPr>
@@ -212,10 +202,15 @@
                                 <w:tcPr>
                                     <w:tcW w:w="3929" w:type="pct"/>
                                     <w:gridSpan w:val="2"/>
-                                    <w:noWrap w:val="0"/>
                                     <w:vAlign w:val="center"/>
                                 </w:tcPr>
-                                <w:p>
+                                <w:p w14:paraId="60A6A21D" w14:textId="37393563" w:rsidR="008C0868"
+                                     w:rsidRDefault="008C0868" w:rsidP="008C0868">
+                                    <w:pPr>
+                                        <w:rPr>
+                                            <w:rFonts w:hint="eastAsia"/>
+                                        </w:rPr>
+                                    </w:pPr>
                                     <w:r>
                                         <w:rPr>
                                             <w:rFonts w:hint="eastAsia"/>
@@ -919,39 +914,6 @@
                         </#if>
                         </#list>
                     </w:tbl>
-                    <w:p w14:paraId="6A1990AF" w14:textId="77777777" w:rsidR="00B027D8" w:rsidRDefault="0096218C"
-                         w:rsidP="00BF0455">
-                        <w:pPr>
-                            <w:pStyle w:val="a3"/>
-                            <w:rPr>
-                                <w:rFonts w:hint="eastAsia"/>
-                            </w:rPr>
-                        </w:pPr>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:hint="eastAsia"/>
-                            </w:rPr>
-                            <w:t>下载人：</w:t>
-                        </w:r>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:hint="eastAsia"/>
-                            </w:rPr>
-                            <w:t>${downName!}                                     </w:t>
-                        </w:r>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:hint="eastAsia"/>
-                            </w:rPr>
-                            <w:t>下载时间：</w:t>
-                        </w:r>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:hint="eastAsia"/>
-                            </w:rPr>
-                            <w:t>${downTime!}</w:t>
-                        </w:r>
-                    </w:p>
                     <w:p/>
                     <w:p/>
                     <w:p>
@@ -1046,6 +1008,46 @@
                         </w:tr>
                         </#list>
                     </w:tbl>
+                    <w:p w14:paraId="3CADE75E" w14:textId="77777777" w:rsidR="00B027D8" w:rsidRDefault="0096218C"
+                         w:rsidP="00BF0455">
+                        <w:pPr>
+                            <w:pStyle w:val="a3"/>
+                            <w:rPr>
+                                <w:rFonts w:hint="eastAsia"/>
+                            </w:rPr>
+                        </w:pPr>
+                        <w:r>
+                            <w:rPr>
+                                <w:rFonts w:hint="eastAsia"/>
+                            </w:rPr>
+                            <w:t>下载人：</w:t>
+                        </w:r>
+                        <w:r>
+                            <w:rPr>
+                                <w:rFonts w:hint="eastAsia"/>
+                            </w:rPr>
+                            <w:t>${downName!}</w:t>
+                        </w:r>
+                        <w:r>
+                            <w:rPr>
+                                <w:rFonts w:hint="eastAsia"/>
+                                <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
+                            </w:rPr>
+                            <w:t xml:space="preserve">                         </w:t>
+                        </w:r>
+                        <w:r>
+                            <w:rPr>
+                                <w:rFonts w:hint="eastAsia"/>
+                            </w:rPr>
+                            <w:t>下载时间：</w:t>
+                        </w:r>
+                        <w:r>
+                            <w:rPr>
+                                <w:rFonts w:hint="eastAsia"/>
+                            </w:rPr>
+                            <w:t>${downTime!}</w:t>
+                        </w:r>
+                    </w:p>
                     <w:p>
                         <w:pPr>
                             <w:rPr>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -522,7 +522,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         List<LoanBeCollectionVehDto> loanBeCollectionVehDetails = dto.getLoanBeCollectionVehDetails();
         if (collMeasures.contains("远程控制")) {
             for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) {
-                int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
+                int i = loanBeCollectionVehService.selKzStateBySaleVehSid(loanBeCollectionVehDetail.getSaleVehSid(),dto.getSid());
                 if (i > 0) {
                     return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "已存在审批中(待控制/控制成功)，不可再次勾选远程控制措施。");
                 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java

@@ -73,7 +73,7 @@ public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVe
 
     int selBjBySaleVehSid(String saleVehSid);
 
-	int selKzStateBySaleVehSid(String saleVehSid);
+	int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid,@Param("mainSid") String mainSid);
 
 	String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid,@Param("c") String c);
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml

@@ -21,17 +21,18 @@
         SELECT COUNT(*)
         FROM loan_be_collection_veh lv
                      LEFT JOIN loan_be_collection_apply la
-                ON lv.`mainSid` = la.`sid`
+                ON lv.mainSid = la.sid
-        WHERE lv.`saleVehSid` = #{saleVehSid}
+        WHERE lv.saleVehSid = #{saleVehSid}
-          AND la.`nodeState` = '已办结'
+          AND la.nodeState = '已办结'
-          AND la.`collMeasure` LIKE CONCAT('%远程控制%')
+          AND la.collMeasure LIKE CONCAT('%远程控制%')
     </select>
 
     <select id="selKzStateBySaleVehSid" resultType="int">
         SELECT COUNT(*)
         FROM loan_be_collection_veh lv
-        WHERE lv.`saleVehSid` = #{saleVehSid}
+        WHERE lv.saleVehSid = #{saleVehSid}
-          AND (lv.lockCarState = '' OR lv.lockCarState IS NULL OR lv.lockCarState = '0' OR lv.lockCarState = '1')
+          AND (lv.lockCarState = '0' OR lv.lockCarState = '1')
+          AND lv.mainSid != #{mainSid}
     </select>
 
     <select id="selSidBySaleVehSidAndLockState" resultType="java.lang.String">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java

@@ -259,8 +259,8 @@ public class LoanBeCollectionVehService extends MybatisBaseService<LoanBeCollect
         return baseMapper.selBjBySaleVehSid(saleVehSid);
     }
 
-    public int selKzStateBySaleVehSid(String saleVehSid) {
+    public int selKzStateBySaleVehSid(String saleVehSid,String mainSid) {
-        return baseMapper.selKzStateBySaleVehSid(saleVehSid);
+        return baseMapper.selKzStateBySaleVehSid(saleVehSid,mainSid);
     }
 
     public String selSidBySaleVehSidAndLockState(String saleVehSid, String c) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java

@@ -51,19 +51,21 @@ import java.util.List;
 @ApiModel(value = "单车返利表 查询条件", description = "单车返利表 查询条件")
 public class ScmVehRebateQuery implements Query {
 
-	@ApiModelProperty("品牌")
+    @ApiModelProperty("品牌")
     private String brandName;
-	@ApiModelProperty("车型名称")
+    @ApiModelProperty("车型名称")
     private String vehModelName;
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("创建开始日期")
     private String createStartTime;
     @ApiModelProperty("创建结束日期")
     private String createEndTime;
-	@ApiModelProperty("返利类型key")
+    @ApiModelProperty("返利类型key")
     private String rebateTypeKey;
-	@ApiModelProperty("返利名称")
+    @ApiModelProperty("返利类型value")
+    private String rebateTypeValue;
+    @ApiModelProperty("返利名称")
     private String rebateName;
     @ApiModelProperty("状态")
     private String state;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml

@@ -63,10 +63,10 @@
 		d.vinNo,
 		r.estimateRebate,
 		r.uploadMoney,
-		r.adjustmentMoney,
+		(0 - r.adjustmentMoney) adjustmentMoney,
 		(	SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
 		WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '待提交' AND fa.nodeState != '终止') as alreadyMoney,
-		(r.adjustmentMoney - 	(	SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
+		((0 - r.adjustmentMoney) - 	(	SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
 		WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '待提交' AND fa.nodeState != '终止') ) as nowDiffAmount,
 		(SELECT o.sid orderSid FROM anrui_buscenter.bus_sales_order_vehicle bv LEFT JOIN anrui_buscenter.bus_sales_order as o ON bv.salesOrderSid = o.sid WHERE bv.linkSid = d.vehSid AND o.nodeState = '已办结' ORDER BY o.createTime DESC LIMIT 1) as orderSid
 		FROM
@@ -102,10 +102,10 @@
 		d.vinNo,
 		r.estimateRebate,
 		r.uploadMoney,
-		r.adjustmentMoney,
+		(0 - r.adjustmentMoney) adjustmentMoney,
 		(	SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
 		WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '待提交' AND fa.nodeState != '终止') as alreadyMoney,
-		(r.adjustmentMoney - 	(	SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
+		((0 - r.adjustmentMoney) - 	(	SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
 		WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '待提交' AND fa.nodeState != '终止') ) as nowDiffAmount,
 		(SELECT o.sid orderSid FROM anrui_buscenter.bus_sales_order_vehicle bv LEFT JOIN anrui_buscenter.bus_sales_order as o ON bv.salesOrderSid = o.sid WHERE bv.linkSid = d.vehSid AND o.nodeState = '已办结' ORDER BY o.createTime DESC LIMIT 1) as orderSid
 		FROM

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -268,8 +268,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("vinNo", query.getVinNo());
         }
-        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+        if (StringUtils.isNotBlank(query.getRebateTypeValue())) {
-            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+            qw.eq("rebateTypeValue", query.getRebateTypeValue());
         }
         if (StringUtils.isNotBlank(query.getRebateName())) {
             qw.like("rebateName", query.getRebateName());
@@ -670,8 +670,22 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     BigDecimal rule = new BigDecimal(info.getCalculationStandard());
                     if (calculationModeValue.equals("比例")) {
                         scmVehRebate.setCalculationModeKey("001");
-                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());
+                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());// 入库价
-                        BigDecimal m = rule.multiply(costPrice).divide(new BigDecimal("100"));
+                        BigDecimal freight = BigDecimal.ZERO; //运费
+                        BigDecimal topAmount = BigDecimal.ZERO; //上装金额
+                        BigDecimal money = BigDecimal.ZERO; //基数
+                        if (StringUtils.isNotBlank(baseVehicleRebateVo.getFreight())) {
+                            freight = new BigDecimal(baseVehicleRebateVo.getFreight());
+                        }
+                        if (StringUtils.isNotBlank(baseVehicleRebateVo.getTopAmount())) {
+                            topAmount = new BigDecimal(baseVehicleRebateVo.getTopAmount());
+                        }
+                        if (topAmount.compareTo(BigDecimal.ZERO) > 0 && baseVehicleRebateVo.getBrandName().contains("陕汽")) {
+                            money = costPrice.subtract(freight).subtract(topAmount);
+                        } else {
+                            money = costPrice.subtract(freight);
+                        }
+                        BigDecimal m = rule.multiply(money).divide(new BigDecimal("100"));
                         scmVehRebate.setEstimateRebate(m.toString());
                     } else {
                         scmVehRebate.setCalculationModeKey("002");
@@ -709,8 +723,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             }
             ScmVehRebateExcelInfo importVo = new ScmVehRebateExcelInfo();
             int physicalNumberOfCells = row.getPhysicalNumberOfCells();
-            if (physicalNumberOfCells < 8) {
+            if (physicalNumberOfCells < 10) {
-                physicalNumberOfCells = 8;
+                physicalNumberOfCells = 10;
             }
             for (int i = 0; i < physicalNumberOfCells; i++) {
                 String trim = new String();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@@ -149,6 +149,7 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
             ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo();
             BeanUtil.copyProperties(scmVehRebate, scmVehRebateDetailsVo);
             scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString());
+            scmVehRebateDetailsVo.setVehRebateSid(scmVehRebate.getSid());
             scmVehRebateDetailsVos.add(scmVehRebateDetailsVo);
         }
         return rb.success().setData(scmVehRebateDetailsVos);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -38,7 +38,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill;
@@ -61,7 +60,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
-import com.yxt.anrui.scm.api.scmvehrebatewith.*;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.*;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
@@ -499,8 +501,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
             String finalSummaryTag = summaryTag;
             String[] split = finalSummaryTag.split("年");
             String y1 = split[0]; //预提申请标题年份
-            map.forEach((k, v) -> {
+            // 方法一：在日常开发中使用比较多的，一般在键值对都需要使用
-                List<ScmVehRebate> rebates = v;
+            for (Map.Entry<String, List<ScmVehRebate>> entry : map.entrySet()) {
+                List<ScmVehRebate> v = entry.getValue();
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 generalVoucher.setBussDate(format);
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@@ -611,7 +614,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                                 BigDecimal esRebate = new BigDecimal(rebate.getEstimateRebate());
                                 if (esRebate.compareTo(BigDecimal.ZERO) != 0) {
                                     voucherDetail.setAmount(esRebate);
-                                    voucherDetails.add(voucherDetail);
+                                    voucherDetailsJR.add(voucherDetail);
                                 }
                             }
 
@@ -621,16 +624,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                         generalVoucher.setVoucherDetails(voucherDetails);
                         finKingDeeFeign.saveRebatePrepareVoucher(generalVoucher);
                     }
-                    if (!voucherDetailsJR.isEmpty()) {
+//                    if (!voucherDetailsJR.isEmpty()) {
-                        generalVoucher.setVoucherDetails(voucherDetailsJR);
+//                        generalVoucher.setVoucherDetails(voucherDetailsJR);
-                        finKingDeeFeign.saveJRRebatePrepareVoucher(generalVoucher);
+//                        finKingDeeFeign.saveJRRebatePrepareVoucher(generalVoucher);
-                    }
+//                    }
                     if (!resultDetails.isEmpty()) {
                         costAdjustmentsBill.setResultDetails(resultDetails);
                         finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
                     }
                 }
-            });
+            }
         }
     }
 

anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue

@@ -313,7 +313,7 @@ export default {
           loading.close()
           if (resp.success) {
             this.$message({ type: 'success', message: resp.msg, showClose: true })
-            this.loadList()
+            this.getList()
           }
         }).catch((e) => {
           loading.close()

anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue

@@ -367,6 +367,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -388,6 +394,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue

@@ -49,6 +49,7 @@
             <el-table-column prop="customerName" label="客户名称" align="center" width="140" />
             <el-table-column prop="contractNo" label="合同编号" align="center" width="120" />
             <el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
             <el-table-column prop="adjustmentMoney" label="差额" align="center" width="150" />
             <el-table-column prop="alreadyMoney" label="已调整" align="center" width="150" />
             <el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="100" />

anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue

@@ -53,7 +53,8 @@
             <el-table-column prop="customerName" label="客户名称" align="center" width="140" />
             <el-table-column prop="contractNo" label="合同编号" align="center" width="180" />
             <el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
-            <el-table-column prop="uploadMoney" label="差额" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
+            <el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
             <el-table-column prop="alreadyMoney" label="已调整" align="center" width="120" />
             <el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
           </el-table>

anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue

@@ -349,6 +349,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -377,6 +383,12 @@ export default {
       if (this.formobj.list.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
         return
+      } else {
+        this.formobj.list.forEach((e) => {
+          if (e.nowAdjustmentMoney === '' || Number(e.nowAdjustmentMoney) === 0) {
+            this.$message({ showClose: true, type: 'error', message: '列表中本次调整金额不能为空且不能为零' })
+          }
+        })
       }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue

@@ -49,6 +49,7 @@
             <el-table-column prop="customerName" label="客户名称" align="center" width="140" />
             <el-table-column prop="contractNo" label="合同编号" align="center" width="120" />
             <el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
+            <el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
             <el-table-column prop="adjustmentMoney" label="差额" align="center" width="150" />
             <el-table-column prop="alreadyMoney" label="已调整" align="center" width="150" />
             <el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="100" />