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<List<PayApplyTrailerVo>> payApply(@RequestParam("useOrgSid") String useOrgSid);
 }

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-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -109,4 +109,6 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
     BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
 
     List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
+
+    List<PayApplyTrailerVo> payApply(String useOrgSid);
 }

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>
@@ -104,7 +104,40 @@
                btm.manufacturerName
         FROM base_trailer bt
                  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,
+                       btm.appearanceSizeWide,
+                       btm.appearanceSizeHigh
+                   ) 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 bt.useOrgSid = #{useOrgSid}
+          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,7 +52,7 @@ 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 {
 
@@ -62,7 +62,7 @@ public class BaseTrailerRest implements BaseTrailerFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseTrailerVo>> listPage(@RequestBody PagerQuery<BaseTrailerQuery> pq){
+    public ResultBean<PagerVo<BaseTrailerVo>> listPage(@RequestBody PagerQuery<BaseTrailerQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BaseTrailerVo> pv = baseTrailerService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -71,21 +71,21 @@ public class BaseTrailerRest implements BaseTrailerFeign {
     @Override
     @ApiOperation("新增保存")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody BaseTrailerDto dto){
+    public ResultBean save(@RequestBody BaseTrailerDto dto) {
         return baseTrailerService.saveTrailer(dto);
     }
 
     @Override
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
-	public ResultBean update(@RequestBody BaseTrailerDto dto, @PathVariable("sid") String sid){
-		return baseTrailerService.updateTrailer(dto,sid);
+    public ResultBean update(@RequestBody BaseTrailerDto dto, @PathVariable("sid") String sid) {
+        return baseTrailerService.updateTrailer(dto, sid);
     }
 
     @Override
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         baseTrailerService.delBySids(sids);
         return rb.success();
@@ -123,8 +123,8 @@ public class BaseTrailerRest implements BaseTrailerFeign {
     }
 
     @Override
-	public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
-		return baseTrailerService.trailerList(vinSid,contractNo);
+    public ResultBean<TraliveredVo> trailerList(String vinSid, String contractNo) {
+        return baseTrailerService.trailerList(vinSid, contractNo);
     }
 
     @Override
@@ -134,6 +134,11 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 
     @Override
     public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
-		return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+        return baseTrailerService.fetchByGcVinNoAndVehSid(gcVinNo, vehSid);
+    }
+
+    @Override
+    public ResultBean<List<PayApplyTrailerVo>> payApply(String useOrgSid) {
+        return baseTrailerService.payApply(useOrgSid);
     }
 }

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

@@ -983,4 +983,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     public List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String vehSid) {
         return baseMapper.fetchTypeAndMan(vehSid);
     }
+
+    public ResultBean<List<PayApplyTrailerVo>> payApply(String useOrgSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<PayApplyTrailerVo> payApplyTrailerVoList = baseMapper.payApply(useOrgSid);
+        return rb.success().setData(payApplyTrailerVoList);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentQuery.java

@@ -49,20 +49,15 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 查询条件", description = "付款信息管理 查询条件")
 public class FinPaymentQuery implements Query {
 
-	@ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
     @ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
-	@ApiModelProperty("开户行")
-    private String bank; // 开户行
+    private String companyName;
     @ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
-	@ApiModelProperty("业务类型key")
-    private String businessTypeKey; // 业务类型key
+    private String receivingAccount;
     @ApiModelProperty("业务类型value")
-    private String businessTypeValue; // 业务类型value
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
+    private String businessTypeValue;
+
+    private String userSid;
+    private String orgPath;
+    private String menuUrl;
+    private String menuSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpayment/FinPaymentVo.java

@@ -49,22 +49,18 @@ import lombok.Data;
 @ApiModel(value = "付款信息管理 视图数据对象", description = "付款信息管理 视图数据对象")
 public class FinPaymentVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
     @ApiModelProperty("单位编码")
-    private String companyCode; // 单位编码
+    private String companyCode;
     @ApiModelProperty("单位名称")
-    private String companyName; // 单位名称
+    private String companyName;
     @ApiModelProperty("开户行")
-    private String bank; // 开户行
+    private String bank;
     @ApiModelProperty("收款银行账号")
-    private String receivingAccount; // 收款银行账号
-	@ApiModelProperty("业务类型key")
-    private String businessTypeKey; // 业务类型key
+    private String receivingAccount;
     @ApiModelProperty("业务类型value")
-    private String businessTypeValue; // 业务类型value
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
+    private String businessTypeValue;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

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-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.java

@@ -54,16 +54,12 @@ import java.util.List;
 @Mapper
 public interface FinPaymentMapper extends BaseMapper<FinPayment> {
 
-	//@Update("update fin_payment set name=#{msg} where id=#{id}")
-	//IPage<FinPaymentVo> voPage(IPage<FinPayment> page, @Param(Constants.WRAPPER) QueryWrapper<FinPayment> qw);
-	
     IPage<FinPaymentVo> selectPageVo(IPage<FinPayment> page, @Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
 
-	List<FinPaymentVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinPayment> qw);
-	
-	@Select("select * from fin_payment")
-	List<FinPaymentVo> selectListVo();
-
     @Select("select * from fin_payment where useOrgSid = #{useOrgSid}")
     List<FinPaymentDetailsVo> selectByUseOrgSid(String useOrgSid);
+
+    int checkSave(@Param("useOrgSid") String useOrgSid,@Param("companyCode") String companyCode);
+
+    int checkUpdate(@Param("useOrgSid") String useOrgSid,@Param("companyCode") String companyCode, @Param("sid") String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentMapper.xml

@@ -4,10 +4,27 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
-		SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
+		SELECT * FROM fin_payment fp
+		LEFT JOIN anrui_portal.sys_organization as u ON fp.useOrgSid = u.sid
+		<where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finpayment.FinPaymentVo">
-		SELECT * FROM fin_payment <where> ${ew.sqlSegment} </where>
+	<select id="checkSave" resultType="int">
+		SELECT
+			COUNT(*)
+		FROM
+			fin_payment
+		WHERE companyCode = #{companyCode}
+		  AND useOrgSid = #{useOrgSid}
+	</select>
+
+	<select id="checkUpdate" resultType="int">
+		SELECT
+			COUNT(*)
+		FROM
+			fin_payment
+		WHERE companyCode = #{companyCode}
+		  AND useOrgSid = #{useOrgSid}
+		  AND sid != #{sid}
 	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentRest.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.fin.api.finpayment.FinPayment;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentQuery;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentVo;
@@ -55,7 +56,7 @@ import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
  * @since 1.0
  */
 @Api(tags = "付款信息管理")
-@RestController("com.yxt.anrui.fin.biz.finpayment.FinPaymentRest")
+@RestController
 @RequestMapping("v1/finpayment")
 public class FinPaymentRest implements FinPaymentFeign {
 
@@ -65,7 +66,7 @@ public class FinPaymentRest implements FinPaymentFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<FinPaymentVo>> listPage(@RequestBody PagerQuery<FinPaymentQuery> pq){
+    public ResultBean<PagerVo<FinPaymentVo>> listPage(@RequestBody PagerQuery<FinPaymentQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<FinPaymentVo> pv = finPaymentService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -74,16 +75,14 @@ public class FinPaymentRest implements FinPaymentFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody FinPaymentDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		finPaymentService.saveOrUpdateDto(dto);
-		return rb.success();
+    public ResultBean save(@RequestBody FinPaymentDto dto) {
+        return finPaymentService.saveOrUpdateDto(dto);
     }
 
     @Override
     @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         finPaymentService.delBySids(sids);
         return rb.success();
@@ -92,7 +91,7 @@ public class FinPaymentRest implements FinPaymentFeign {
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<FinPaymentDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<FinPaymentDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         FinPaymentDetailsVo vo = finPaymentService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpayment/FinPaymentService.java

@@ -28,6 +28,9 @@ package com.yxt.anrui.fin.biz.finpayment;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapplyVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +44,7 @@ import com.yxt.anrui.fin.api.finpayment.FinPaymentDetailsVo;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentDto;
 import com.yxt.anrui.fin.api.finpayment.FinPaymentFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -60,29 +64,84 @@ import java.util.List;
  */
 @Service
 public class FinPaymentService extends MybatisBaseService<FinPaymentMapper, FinPayment> {
-    private QueryWrapper<FinPayment> createQueryWrapper(FinPaymentQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<FinPayment> qw = new QueryWrapper<>();
-        return qw;
-    }
+
+    @Autowired
+    private SysUserFeign sysUserFeign;
 
     public PagerVo<FinPaymentVo> listPageVo(PagerQuery<FinPaymentQuery> pq) {
         FinPaymentQuery query = pq.getParams();
-        QueryWrapper<FinPayment> qw = createQueryWrapper(query);
+        QueryWrapper<FinPayment> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("u.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("fp.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<FinPaymentVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<FinPaymentVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getCompanyName())) {
+            qw.like("fp.companyName", query.getCompanyName());
+        }
+        if (StringUtils.isNotBlank(query.getReceivingAccount())) {
+            qw.like("fp.receivingAccount", query.getReceivingAccount());
+        }
+        if (StringUtils.isNotBlank(query.getBusinessTypeValue())) {
+            qw.like("fp.businessTypeValue", query.getBusinessTypeValue());
+        }
         IPage<FinPayment> page = PagerUtil.queryToPage(pq);
         IPage<FinPaymentVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinPaymentVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public void saveOrUpdateDto(FinPaymentDto dto) {
+    public ResultBean saveOrUpdateDto(FinPaymentDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
+            int count = baseMapper.checkSave(dto.getUseOrgSid(), dto.getCompanyCode());
+            if (count > 0) {
+                return rb.setMsg("该分公司下单位编码已存在");
+            }
             this.insertByDto(dto);
-            return;
+            return rb.success();
+        }
+        int count = baseMapper.checkUpdate(dto.getUseOrgSid(), dto.getCompanyCode(), dtoSid);
+        if (count > 0) {
+            return rb.setMsg("该分公司下单位编码已存在");
         }
         this.updateByDto(dto);
+        return rb.success();
     }
 
     public void insertByDto(FinPaymentDto dto) {

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

@@ -48,6 +48,8 @@ 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.FinPaymentapplyTopDto;
+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 +59,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 +132,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 +147,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 +284,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 +324,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);

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

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

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,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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;
+
+/**
+ * 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);
+	}
+}

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

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

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,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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;
+
+/**
+ * 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);
+	}
+}

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

@@ -60,7 +60,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyF
  * @since 1.0
  */
 @Api(tags = "逾期催收申请")
-@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyRest")
+@RestController
 @RequestMapping("v1/loanbecollectionapply")
 public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
 
@@ -70,7 +70,7 @@ public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanBeCollectionApplyVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionApplyQuery> pq){
+    public ResultBean<PagerVo<LoanBeCollectionApplyVo>> listPage(@RequestBody PagerQuery<LoanBeCollectionApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<LoanBeCollectionApplyVo> pv = loanBeCollectionApplyService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -79,7 +79,7 @@ public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto){
+    public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         loanBeCollectionApplyService.saveOrUpdateDto(dto);
         return rb.success();
@@ -88,21 +88,21 @@ public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
     @Override
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return loanBeCollectionApplyService.delAllBySids(sids);
     }
 
     @Override
     public ResultBean<LoanBeCollectionApplyDetailsVo> init(String saleVehSid, String orgPath, String userSid) {
         ResultBean rb = ResultBean.fireFail();
-		LoanBeCollectionApplyDetailsVo loanBeCollectionApplyDetailsVo = loanBeCollectionApplyService.init(saleVehSid,orgPath,userSid);
+        LoanBeCollectionApplyDetailsVo loanBeCollectionApplyDetailsVo = loanBeCollectionApplyService.init(saleVehSid, orgPath, userSid);
         return rb.success().setData(loanBeCollectionApplyDetailsVo);
     }
 
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanBeCollectionApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<LoanBeCollectionApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanBeCollectionApplyDetailsVo vo = loanBeCollectionApplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
@@ -111,7 +111,7 @@ public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
     @Override
     public ResultBean saveLockCarState(String applySid, String saleVehSid, String lockCarState) {
         ResultBean rb = ResultBean.fireFail();
-		loanBeCollectionApplyService.saveLockCarState(applySid,saleVehSid,lockCarState);
+        loanBeCollectionApplyService.saveLockCarState(applySid, saleVehSid, lockCarState);
         return rb.success();
     }
 

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`
-        WHERE lv.`saleVehSid` = #{saleVehSid}
-          AND la.`nodeState` = '已办结'
-          AND la.`collMeasure` LIKE CONCAT('%远程控制%')
+                ON lv.mainSid = la.sid
+        WHERE lv.saleVehSid = #{saleVehSid}
+          AND la.nodeState = '已办结'
+          AND la.collMeasure LIKE CONCAT('%远程控制%')
     </select>
 
     <select id="selKzStateBySaleVehSid" resultType="int">
         SELECT COUNT(*)
         FROM loan_be_collection_veh lv
-        WHERE lv.`saleVehSid` = #{saleVehSid}
-          AND (lv.lockCarState = '' OR lv.lockCarState IS NULL OR lv.lockCarState = '0' OR lv.lockCarState = '1')
+        WHERE lv.saleVehSid = #{saleVehSid}
+          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) {
-        return baseMapper.selKzStateBySaleVehSid(saleVehSid);
+    public int selKzStateBySaleVehSid(String saleVehSid,String mainSid) {
+        return baseMapper.selKzStateBySaleVehSid(saleVehSid,mainSid);
     }
 
     public String selSidBySaleVehSidAndLockState(String saleVehSid, String c) {

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

@@ -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 m = rule.multiply(costPrice).divide(new BigDecimal("100"));
+                        BigDecimal costPrice = new BigDecimal(baseVehicleRebateVo.getCostPrice());// 入库价
+                        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");

yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java

@@ -95,7 +95,7 @@ public class OaMendApplyRest {
 
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
-    public ResultBean submit(@RequestBody @Valid SubmitOaMendApplyDto dto) {
+    public ResultBean submit(@RequestBody @Valid OaMendApplyDto dto) {
         return oaMendApplyService.submit(dto);
     }
 

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java

@@ -12,7 +12,8 @@ import java.util.Date;
  * @date: 2025/1/7
  **/
 @Data
-public class OaFormDto {
+public class OaFormDto implements Dto {
+    //保存时赋值
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("组织机构全路径")
@@ -21,4 +22,8 @@ public class OaFormDto {
     private String billNo;
     @ApiModelProperty("sid")
     private String sid;
+
+    //流程提交时赋值
+    @ApiModelProperty("任务id")
+    private String taskId;
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oamendapply;
 
 
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
 import com.yxt.common.core.dto.Dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -53,12 +54,9 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
-public class OaMendApplyDto implements Dto {
+public class OaMendApplyDto extends OaFormDto {
 
     private static final long serialVersionUID = -4536006302677264298L;
-    private String sid;
-    private String createBySid;
-    private String orgSidPath;
     @ApiModelProperty("补卡原因")
     private String remarks;
     @ApiModelProperty("补卡时间")
@@ -67,31 +65,4 @@ public class OaMendApplyDto implements Dto {
     private String linkFormSids;
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
-
-    /* @ApiModelProperty("单据编号")
-    private String billNo; // 单据编号
-    @ApiModelProperty("申请人")
-    private String createByName;
-    @ApiModelProperty("申请部门sid")
-    private String deptSid;
-    @ApiModelProperty("申请部门名称")
-    private String deptName;
-
-      @ApiModelProperty("分公司sid")
-    private String useOrgSid;
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty("办结日期")
-    private Date finishTime;
-    @ApiModelProperty("实例id")
-    private String procInstId;
-    @ApiModelProperty("流程定义id")
-    private String procDefId;
-    @ApiModelProperty("任务id")
-    private String taskId;
-    @ApiModelProperty("环节id")
-    private String nodeId;
-    @ApiModelProperty("流程状态")
-    private String nodeState;*/
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

@@ -142,11 +142,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
             OaMendApply entity = new OaMendApply();
             BeanUtil.copyProperties(dto, entity, "sid");
 
-            OaFormDto oaFormDto = new OaFormDto();
-            BeanUtil.copyProperties(dto, oaFormDto);
-            oaFormDto.setBillNo("BKSQ");
-            oaFormDto.setSid(entity.getSid());
-            ResultBean<String> resultBean = oaFormService.saveOaForm(oaFormDto);
+            /*OaFormDto oaFormDto = new OaFormDto();
+            BeanUtil.copyProperties(dto, oaFormDto);*/
+            dto.setBillNo("BKSQ");
+            dto.setSid(entity.getSid());
+            ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
 
             if (!resultBean.getSuccess()) {
                 return rb;
@@ -198,7 +198,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
      * @param dto
      * @return
      */
-    public ResultBean submit(SubmitOaMendApplyDto dto) {
+    public ResultBean submit(OaMendApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
         if (!stringResultBean.getSuccess()) {
@@ -264,6 +264,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
 
     /**
      * 提交时获取下一环节
+     *
      * @param query
      * @return
      */
@@ -281,6 +282,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
 
     /**
      * 驳回时获取上一环节
+     *
      * @param query
      * @return
      */

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/SubmitOaMendApplyDto.java

@@ -1,26 +0,0 @@
-package com.yxt.anrui.oa.biz.oamendapply;
-
-import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyDto;
-import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author liuguohui
- * @version 1.0
- * @description
- * @date 2022/04/13
- */
-@ApiModel("提交")
-@Data
-public class SubmitOaMendApplyDto extends OaMendApplyDto {
-
-    private static final long serialVersionUID = 8607710587497609779L;
-    /*    @ApiModelProperty("意见")
-        private String comment;
-        @ApiModelProperty("流程实例id")
-        private String instanceId;*/
-    @ApiModelProperty("任务id")
-    private String taskId;
-}