Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderVehicle.java <br/>
@@ -85,9 +87,11 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String reaRepaymentPhone;
     @ApiModelProperty("回购状态")
     private Integer repoState;
-    @ApiModelProperty("结清状态")
+    @ApiModelProperty("结清状态(默认0，结清申请提交2，终止或不通过重新设置0，客户确认结清设置3，认款所有应收=0设置1)")
     private Integer settleState;
     @ApiModelProperty("车牌号")
     private String vehMark;
+    @ApiModelProperty("结清申请提交时间")
+    private Date settleApplyDate;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@@ -91,9 +91,9 @@ public interface FinSelectedReceivablesDetailedFeign {
 
     @ApiOperation("保存推送的实收")
     @PostMapping("/saveAll")
-    ResultBean saveAll(List<FinSelectedReceivablesDetailed> list);
+    ResultBean saveAll(@RequestBody List<FinSelectedReceivablesDetailed> list);
 
     @ApiOperation("根据维修工单sid查询待审核和已审核的认款金额之和")
     @GetMapping("/selRkByBillSid")
     ResultBean<BigDecimal> selRkByBillSid(@RequestParam("billSid") String billSid);
-}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -74,7 +74,7 @@ public interface FinUncollectedReceivablesDetailedJRFeign {
 
     @ApiOperation("应收添加")
     @PostMapping("/saveAll")
-    public ResultBean saveAll(List<FinUncollectedReceivablesDetailedJR> list);
+    public ResultBean saveAll(@RequestBody List<FinUncollectedReceivablesDetailedJR> list);
 
     @ApiOperation("导入数据批量添加")
     @PostMapping("/saveList")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanfinbank;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,4 +59,7 @@ public class LoanFinBankDto implements Dto {
     private String orgSidPath;
     private List<String> finBankFiles = new ArrayList<>();
     private String reAdvances;
+
+    @ApiModelProperty("资方开户行信息")
+    private List<LoanFinOpenBankDto> loanFinOpenBankList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java

@@ -1,6 +1,8 @@
 package com.yxt.anrui.riskcenter.api.loanfinbank;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -47,4 +49,7 @@ public class LoanFinBankInitVo implements Vo {
 //    @ApiModelProperty("使用组织全路径")
 //    private String orgSidPath;
     private String reAdvances;
+
+    @ApiModelProperty("资方开户行信息")
+    private List<LoanFinOpenBankDetailsVo> loanFinOpenBankList;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBank.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+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;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBank.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank <br/>
+ * Description: 资方开户行信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "资方开户行信息", description = "资方开户行信息")
+@TableName("loan_fin_open_bank")
+public class LoanFinOpenBank extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("资方sid")
+    private String bankSid; // 资方sid
+	@ApiModelProperty("国家")
+    private String country; // 国家
+	@ApiModelProperty("开户银行")
+    private String depositBank; // 开户银行
+	@ApiModelProperty("银行账号")
+    private String bankAccount; // 银行账号
+	@ApiModelProperty("账户名称")
+    private String accountName; // 账户名称
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey; // 账户类型key
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue; // 账户类型value
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets; // 银行网点
+	@ApiModelProperty("开户行地址")
+    private String bankAddress; // 开户行地址
+	@ApiModelProperty("联行号")
+    private String paymentLines; // 联行号
+	@ApiModelProperty("银行代码")
+    private String swiftCode; // 银行代码
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo <br/>
+ * Description: 资方开户行信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "资方开户行信息 视图数据详情", description = "资方开户行信息 视图数据详情")
+public class LoanFinOpenBankDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("资方sid")
+    private String bankSid; // 资方sid
+	@ApiModelProperty("国家")
+    private String country; // 国家
+	@ApiModelProperty("开户银行")
+    private String depositBank; // 开户银行
+	@ApiModelProperty("银行账号")
+    private String bankAccount; // 银行账号
+	@ApiModelProperty("账户名称")
+    private String accountName; // 账户名称
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey; // 账户类型key
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue; // 账户类型value
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets; // 银行网点
+	@ApiModelProperty("开户行地址")
+    private String bankAddress; // 开户行地址
+	@ApiModelProperty("联行号")
+    private String paymentLines; // 联行号
+	@ApiModelProperty("银行代码")
+    private String swiftCode; // 银行代码
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankDto.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankDto.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto <br/>
+ * Description: 资方开户行信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "资方开户行信息 数据传输对象", description = "资方开户行信息 数据传输对象")
+public class LoanFinOpenBankDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("资方sid")
+    private String bankSid; // 资方sid
+	@ApiModelProperty("国家")
+    private String country; // 国家
+	@ApiModelProperty("开户银行")
+    private String depositBank; // 开户银行
+	@ApiModelProperty("银行账号")
+    private String bankAccount; // 银行账号
+	@ApiModelProperty("账户名称")
+    private String accountName; // 账户名称
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey; // 账户类型key
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue; // 账户类型value
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets; // 银行网点
+	@ApiModelProperty("开户行地址")
+    private String bankAddress; // 开户行地址
+	@ApiModelProperty("联行号")
+    private String paymentLines; // 联行号
+	@ApiModelProperty("银行代码")
+    private String swiftCode; // 银行代码
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeign.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankFeign.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign <br/>
+ * Description: 资方开户行信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "资方开户行信息")
+@FeignClient(
+        contextId = "anrui-risk-LoanFinOpenBank",
+        name = "anrui-risk",
+        path = "v1/loanfinopenbank",
+        fallback = LoanFinOpenBankFeignFallback.class)
+public interface LoanFinOpenBankFeign {
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankFeignFallback.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeignFallback <br/>
+ * Description: 资方开户行信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LoanFinOpenBankFeignFallback implements LoanFinOpenBankFeign {
+
+	@Override
+	public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-risk/loanfinopenbank/fetchDetailsBySid无法访问");
+	}
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankQuery.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankQuery.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery <br/>
+ * Description: 资方开户行信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "资方开户行信息 查询条件", description = "资方开户行信息 查询条件")
+public class LoanFinOpenBankQuery implements Query {
+
+	@ApiModelProperty("资方sid")
+    private String bankSid; // 资方sid
+	@ApiModelProperty("国家")
+    private String country; // 国家
+	@ApiModelProperty("开户银行")
+    private String depositBank; // 开户银行
+	@ApiModelProperty("银行账号")
+    private String bankAccount; // 银行账号
+	@ApiModelProperty("账户名称")
+    private String accountName; // 账户名称
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey; // 账户类型key
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue; // 账户类型value
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets; // 银行网点
+	@ApiModelProperty("开户行地址")
+    private String bankAddress; // 开户行地址
+	@ApiModelProperty("联行号")
+    private String paymentLines; // 联行号
+	@ApiModelProperty("银行代码")
+    private String swiftCode; // 银行代码
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinopenbank/LoanFinOpenBankVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanfinopenbank;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankVo.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo <br/>
+ * Description: 资方开户行信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "资方开户行信息 视图数据对象", description = "资方开户行信息 视图数据对象")
+public class LoanFinOpenBankVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("资方sid")
+    private String bankSid; // 资方sid
+	@ApiModelProperty("国家")
+    private String country; // 国家
+	@ApiModelProperty("开户银行")
+    private String depositBank; // 开户银行
+	@ApiModelProperty("银行账号")
+    private String bankAccount; // 银行账号
+	@ApiModelProperty("账户名称")
+    private String accountName; // 账户名称
+	@ApiModelProperty("账户类型key")
+    private String dueBankKey; // 账户类型key
+	@ApiModelProperty("账户类型value")
+    private String dueBankValue; // 账户类型value
+	@ApiModelProperty("银行网点")
+    private String bankingOutlets; // 银行网点
+	@ApiModelProperty("开户行地址")
+    private String bankAddress; // 开户行地址
+	@ApiModelProperty("联行号")
+    private String paymentLines; // 联行号
+	@ApiModelProperty("银行代码")
+    private String swiftCode; // 银行代码
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentSchedule.java

@@ -102,4 +102,6 @@ public class LoanRepaymentSchedule extends BaseEntity {
     private String bankSid;
     @ApiModelProperty("其他融资方sid")
     private String otherBankSid;
+    @ApiModelProperty("贷款保证金")
+    private BigDecimal bondAmounts;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java

@@ -76,6 +76,12 @@ public interface LoanSettleApplyFeign {
     @PostMapping(value = "/delegate")
     public ResultBean delegate(@RequestBody LoanSettleApplyDelegateQuery query);
 
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody LoanSettleApplyDelegateQuery query);
+
+
     @ApiOperation(value = "移动端详情")
     @PostMapping(value = "/getAppDetails")
     ResultBean<SettleApplyAppVo> getAppDetails(@RequestParam("sid") String sid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyListQuery.java

@@ -19,6 +19,8 @@ public class SettleApplyListQuery implements Query {
     private String borrowerName;
     @ApiModelProperty("车牌号")
     private String vehMark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
     @ApiModelProperty("机构全路径")
     private String orgPath;
     private String type;//1代表查询回购

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java

@@ -1,9 +1,16 @@
 package com.yxt.anrui.riskcenter.biz.loanfinbank;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
+import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfinbank.*;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankService;
 import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -22,6 +29,7 @@ import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -49,6 +57,8 @@ public class LoanFinBankRest implements LoanFinBankFeign {
     private LoanFinPolicyService loanFinPolicyService;
     @Autowired
     private LoanFileService loanFileService;
+    @Autowired
+    private LoanFinOpenBankService loanFinOpenBankService;
 
     @Override
     public ResultBean<PagerVo<LoanFinBankVo>> listPage(PagerQuery<LoanFinBankQuery> pq) {
@@ -62,6 +72,7 @@ public class LoanFinBankRest implements LoanFinBankFeign {
     public ResultBean save(LoanFinBankDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String manageName = dto.getBankName();
+        List<LoanFinOpenBankDto> loanFinOpenBankDtoList = dto.getLoanFinOpenBankList();
         if (StringUtils.isNotBlank(dto.getSid())) {
             String sid = dto.getSid();
             LoanFinBank baseFinBank = loanFinBankService.fetchBySid(sid);
@@ -76,6 +87,26 @@ public class LoanFinBankRest implements LoanFinBankFeign {
             if (i == 0) {
                 return ResultBean.fireFail().setMessage("修改失败");
             }
+            //修改资方开户行信息
+            List<String> stringList = loanFinOpenBankDtoList.stream().map(v->v.getSid()).collect(Collectors.toList());
+            List<LoanFinOpenBankDetailsVo> loanFinOpenBankDetailsVos = loanFinOpenBankService.selectByManSid(sid);
+            if (loanFinOpenBankDtoList.size() > 0) {
+                for (LoanFinOpenBankDto finOpenBankDto : loanFinOpenBankDtoList) {
+                    ResultBean resultBean1 = saveLoanFinOpenBankDto(finOpenBankDto, sid);
+                    if (!resultBean1.getCode().equals("200")) {
+                        return resultBean1;
+                    }
+                }
+            }
+            if(!loanFinOpenBankDetailsVos.isEmpty()){
+                List<String> stringList1 = loanFinOpenBankDetailsVos.stream().map(v->v.getSid()).collect(Collectors.toList());
+                stringList.removeAll(Collections.singleton(null));
+                for (int j = 0; j < stringList1.size(); j++) {
+                    if(!stringList.contains(stringList1.get(j))){
+                        loanFinOpenBankService.updateBySidIsDeletes(stringList1.get(j));
+                    }
+                }
+            }
             //删除附件表中关于该linkSid的文件
             loanFileService.deleteByLinkSid(sid);
             List<String> finBankFiles = dto.getFinBankFiles();
@@ -89,11 +120,37 @@ public class LoanFinBankRest implements LoanFinBankFeign {
             if (count > 0) {
                 return ResultBean.fireFail().setMsg("添加失败，资方名称已存在");
             }
-            loanFinBankService.saveOrUpdateDto(dto);
+            String sid = loanFinBankService.saveOrUpdateDto(dto);
+            //保存资方开户行信息
+            if (loanFinOpenBankDtoList.size() > 0) {
+                for (LoanFinOpenBankDto finOpenBankDto : loanFinOpenBankDtoList) {
+                    ResultBean resultBean1 = saveLoanFinOpenBankDto(finOpenBankDto, sid);
+                    if (!resultBean1.getCode().equals("200")) {
+                        return resultBean1;
+                    }
+                }
+            }
             return rb.success().setMessage("添加成功");
         }
     }
 
+    private ResultBean saveLoanFinOpenBankDto(LoanFinOpenBankDto dto, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String openBankSid = dto.getSid();
+        if(StringUtils.isNotBlank(openBankSid)){
+            LoanFinOpenBank loanFinOpenBank = loanFinOpenBankService.fetchBySid(openBankSid);
+            BeanUtil.copyProperties(dto,loanFinOpenBank,"sid");
+            loanFinOpenBank.setBankSid(sid);
+            loanFinOpenBankService.updateById(loanFinOpenBank);
+        }else{
+            LoanFinOpenBank loanFinOpenBank = new LoanFinOpenBank();
+            BeanUtil.copyProperties(dto,loanFinOpenBank,"sid");
+            loanFinOpenBank.setBankSid(sid);
+            loanFinOpenBankService.insert(loanFinOpenBank);
+        }
+        return rb.success().setMsg("保存成功");
+    }
+
     @Override
     public ResultBean update(LoanFinBankDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java

@@ -11,10 +11,12 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanfinbank.*;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformation;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationQuery;
 import com.yxt.anrui.riskcenter.api.loanwarrantinformation.LoanWarrantInformationVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -59,6 +61,8 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
     private LoanFileService loanFileService;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanFinOpenBankService loanFinOpenBankService;
 
     public PagerVo<LoanFinBank> listPage(PagerQuery<LoanFinBankQuery> pq) {
         LoanFinBankQuery query = pq.getParams();
@@ -152,7 +156,7 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
         return p;
     }
 
-    public void saveOrUpdateDto(LoanFinBankDto dto) {
+    public String saveOrUpdateDto(LoanFinBankDto dto) {
         LoanFinBank entity = new LoanFinBank();
         if (StringUtils.isNotBlank(dto.getCreateOrgSid())) {
             String useOrgSid = dto.getCreateOrgSid();
@@ -176,6 +180,7 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
         if (!finBankFiles.isEmpty()) {
             loanFileService.saveAll(entity.getSid(), finBankFiles, LoanFileEnum.FIN_BANK.getAttachType());
         }
+        return entity.getSid();
     }
 
     public LoanFinBankVo fetchByIdVo(String id) {
@@ -304,6 +309,8 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
                     collect(Collectors.toList());
             vo.setFinBankFiles(finBankFiles);
         }
+        List<LoanFinOpenBankDetailsVo> loanFinOpenBankDetailsVos = loanFinOpenBankService.selectByManSid(sid);
+        vo.setLoanFinOpenBankList(loanFinOpenBankDetailsVos);
         return rb.success().setData(vo);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankMapper.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankMapper <br/>
+ * Description: 资方开户行信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface LoanFinOpenBankMapper extends BaseMapper<LoanFinOpenBank> {
+
+    @Select("select * from loan_fin_open_bank where bankSid = #{sid} AND isDelete = 0")
+    List<LoanFinOpenBankDetailsVo> selectByManSid(String sid);
+
+    void updateBySidIsDeletes(String s);
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankMapper.xml

@@ -0,0 +1,10 @@
+<?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.riskcenter.biz.loanfinopenbank.LoanFinOpenBankMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <update id="updateBySidIsDeletes">
+        UPDATE loan_fin_open_bank
+        SET isDelete = 1 where sid = #{s}
+    </update>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankRest.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankFeignFallback.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankRest <br/>
+ * Description: 资方开户行信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "资方开户行信息")
+@RestController("com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankRest")
+@RequestMapping("v1/loanfinopenbank")
+public class LoanFinOpenBankRest implements LoanFinOpenBankFeign {
+
+	@Autowired
+	private LoanFinOpenBankService loanFinOpenBankService;
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<LoanFinOpenBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		LoanFinOpenBankDetailsVo vo = loanFinOpenBankService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinopenbank/LoanFinOpenBankService.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanfinopenbank;
+
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBank;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankQuery;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankDto;
+import com.yxt.anrui.riskcenter.api.loanfinopenbank.LoanFinOpenBankFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-risk(资方开户行) <br/>
+ * File: LoanFinOpenBankService.java <br/>
+ * Class: com.yxt.anrui.riskcenter.biz.loanfinopenbank.LoanFinOpenBankService <br/>
+ * Description: 资方开户行信息 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-08-20 09:19:22 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class LoanFinOpenBankService extends MybatisBaseService<LoanFinOpenBankMapper, LoanFinOpenBank> {
+	
+	public void insertByDto(LoanFinOpenBankDto dto){
+		LoanFinOpenBank entity = new LoanFinOpenBank();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public LoanFinOpenBankDetailsVo fetchDetailsVoBySid(String sid){
+		LoanFinOpenBank entity = fetchBySid(sid);
+		LoanFinOpenBankDetailsVo vo = new LoanFinOpenBankDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public List<LoanFinOpenBankDetailsVo> selectByManSid(String sid) {
+		return baseMapper.selectByManSid(sid);
+	}
+
+	public void updateBySidIsDeletes(String s) {
+		baseMapper.updateBySidIsDeletes(s);
+	}
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleMapper.xml

@@ -6,7 +6,7 @@
         vehCount,vinNo,loanContractSid,loanContractNo,bankContractNo,bankName,policyName,mainPeriod,mainRepayDate,
         mainLastDate,mainFirstRepay,mainMidRepay,mainLastRepay,otherPeriod,otherBankNo,otherRepayDate,otherFirstRepay,
         otherMidRepay,otherLastRepay,isOtherPolicy,sameBank,cwDeptNo,isDifferent,importTiredMoney,importPaymentMoney,
-        importInterest,importFund,orgSidPath,bankSid,otherBankSid)
+        importInterest,importFund,orgSidPath,bankSid,otherBankSid,bondAmounts)
         values
         <foreach collection="list" item="item" index="index" separator=",">
             (#{item.createBySid},#{item.sid},#{item.createTime},#{item.isEnable},#{item.salesOrderSid},#{item.borrowerSid},#{item.borrowerName},
@@ -14,7 +14,7 @@
             #{item.policyName},#{item.mainPeriod},#{item.mainRepayDate},#{item.mainLastDate},#{item.mainFirstRepay},#{item.mainMidRepay},
             #{item.mainLastRepay},#{item.otherPeriod},#{item.otherBankNo},#{item.otherRepayDate},#{item.otherFirstRepay},#{item.otherMidRepay},
             #{item.otherLastRepay},#{item.isOtherPolicy},#{item.sameBank},#{item.cwDeptNo},#{item.isDifferent},#{item.importTiredMoney},
-            #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid}
+            #{item.importPaymentMoney},#{item.importInterest},#{item.importFund},#{item.orgSidPath},#{item.bankSid},#{item.otherBankSid},#{item.bondAmounts}
              )
         </foreach>
     </insert>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -4933,6 +4933,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<LoanRepaymentSchedule> returnList = new ArrayList<>();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         for (HistoryDataImportVo v : list) {
+            String depositMoney = ""; //贷款保证金
+            if (StringUtils.isNotBlank(v.getDepositMoney())) {
+                depositMoney = v.getDepositMoney();
+            } else {
+                depositMoney = "";
+            }
             String Q = "";
             if (StringUtils.isNotBlank(v.getTiredMoney())) {
                 Q = v.getTiredMoney(); //累欠本金
@@ -5300,6 +5306,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 scheduleDetails.setMainFirstRepay(new BigDecimal(mF));
                 scheduleDetails.setMainMidRepay(new BigDecimal(mM));
                 scheduleDetails.setMainLastRepay(new BigDecimal(mL));
+                scheduleDetails.setBondAmounts(new BigDecimal(depositMoney));
                 if (isOther.equals("1")) {
                     scheduleDetails.setOtherPeriod(oPeriod);
                     scheduleDetails.setOtherBankNo(otherBankNo);
@@ -5501,6 +5508,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 schedule.setMainFirstRepay(new BigDecimal(mF));
                 schedule.setMainMidRepay(new BigDecimal(mM));
                 schedule.setMainLastRepay(new BigDecimal(mL));
+                schedule.setBondAmounts(new BigDecimal(depositMoney));
                 if (isOther.equals("1")) {
                     schedule.setOtherPeriod(oPeriod);
                     schedule.setOtherBankNo(otherBankNo);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java

@@ -46,11 +46,13 @@ public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
 
     String selectDk(@Param("busVinSid") String busVinSid, @Param("settingDate") String settingDate);
 
-    int updateBus(String busVinSid);
+    int updateBus(@Param("busVinSid")String busVinSid,@Param("state")String state);
 
     LoanRepaymentPlanDetails selectByBusVinSidAndDesc(String busVinSid);
 
     BusSalesOrder selectByOrderSid(String saleOrderSid);
 
     FinUncollectedReceivablesDetailedJR selectByType(@Param("busSid") String sid, @Param("type") String type);
+
+    int updateBusAndSettleApplyDate(@Param("busVinSid")String busVinSid, @Param("state")String state, @Param("date")String date);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@@ -61,21 +61,24 @@
     </select>
 
     <select id="getListPage" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyListVo">
-        select ld.borrowerName,
+        SELECT
-               ld.vehMark,
+        br.borrowerName borrowName,
-               ld.customer,
+        bv.vehMark,
-               ld.loanContractNo,
+        bs.customerName customer,
-               ld.vinNo,
+        ld.loanContractNo,
-               ld.bankName,
+        SUBSTRING( bv.linkNo,- 8 ) vinNo,
-               ld.bankContractNo,
+        ld.bankName,
-               ld.busVinSid
+        ld.bankContractNo,
-        from loan_repayment_plan_details ld
+        bv.sid busVinSid,
-                 left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = ld.busVinSid
+        ld.sid
+        FROM
+        anrui_buscenter.bus_sales_order_loancontract ld
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.salesOrderSid = ld.salesOrderSid
+        LEFT JOIN anrui_buscenter.bus_sales_order_borrower as br ON br.sid = bv.borrowerSid
+        LEFT JOIN anrui_buscenter.bus_sales_order as bs ON bs.sid = ld.salesOrderSid
         <where>
             ${ew.sqlSegment}
         </where>
-        group by ld.busVinSid
-        order by ld.loanContractNo desc, ld.vinNo desc
     </select>
 
     <select id="selectByBusVinSid"
@@ -90,7 +93,9 @@
     <select id="selectDzfyqlx" resultType="java.lang.String">
         SELECT IFNULL(SUM(lbpv.`bankBeInter`), 0)
         FROM loan_be_padsincere_veh lbpv
+        LEFT JOIN loan_be_padsincere_apply as ba ON lbpv.mainSid = ba.sid
         WHERE lbpv.saleVehSid = #{busVinSid}
+          AND ba.nodeState = '已办结'
     </select>
 
     <select id="selectZjzyf" resultType="java.lang.String">
@@ -162,7 +167,12 @@
 
     <update id="updateBus">
         update anrui_buscenter.bus_sales_order_vehicle
-        set settleState = 1
+        set settleState = #{state}
+        where sid = #{busVinSid}
+    </update>
+    <update id="updateBusAndSettleApplyDate">
+        update anrui_buscenter.bus_sales_order_vehicle
+        set settleState = #{state},settleApplyDate =#{date}
         where sid = #{busVinSid}
     </update>
 
@@ -179,4 +189,4 @@
             resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
         select * from anrui_fin.fin_uncollected_receivables_detailed_jr where busSid = #{busSid} and payCostTitleValue = #{type} order by id desc limit 1
     </select>
-</mapper>
+</mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java

@@ -99,6 +99,11 @@ public class LoanSettleApplyRest implements LoanSettleApplyFeign {
         return loanSettleApplyService.delegate(query);
     }
 
+    @Override
+    public ResultBean assignTask(LoanSettleApplyDelegateQuery query) {
+        return loanSettleApplyService.assignTask(query);
+    }
+
     @Override
     public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
         return loanSettleApplyService.getAppDetails(sid);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
@@ -29,6 +30,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loansettleapply.*;
 import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
@@ -40,6 +42,7 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompany
 import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
+import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostMapper;
 import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostService;
 import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostMapper;
@@ -105,7 +108,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private LoanSolutionsDetailService loanSolutionsDetailService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
-
+    @Autowired
+    private LoanRepaymentScheduleService loanRepaymentScheduleService;
     @Autowired
     private SysParameterFeign sysParameterFeign;
     @Autowired
@@ -245,6 +249,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             sid = loanSettleApply.getSid();
             loanSettleApply.setCreateBySid(dto.getUserSid());
             loanSettleApply.setOrgSidPath(dto.getOrgPath());
+            loanSettleApply.setState(0);
             LoanSettleBankCostVo loanSettleBankCostVo = dto.getLoanSettleBankCostVo();
             if (loanSettleBankCostVo != null) {
                 loanSettleBankCostService.saveCost(sid, loanSettleBankCostVo);
@@ -394,9 +399,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     BeanUtil.copyProperties(loanSettleCompanyReduction, loanSettleCompanyReductionVo);
                 }
                 loanSettleApplyDetailsVo.setLoanSettleCompanyReductionVo(loanSettleCompanyReductionVo);
-                if (loanSettleCompanyReduction.getAmountTo().compareTo(BigDecimal.ZERO) > 0) {
+                if (StringUtils.isNotBlank(loanSettleApply.getNodeState())) {
-                    loanSettleApplyDetailsVo.setConfirmAtn(true);
+                    if (loanSettleApply.getNodeState().equals("已办结")) {
+                        if (loanSettleApply.getState().intValue() == 0) {
+                            if (loanSettleCompanyReduction.getAmountTo().compareTo(BigDecimal.ZERO) > 0) {
+                                loanSettleApplyDetailsVo.setConfirmAtn(true);
+                            }
+                        }
+                    }
                 }
+
             }
             if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
                 loanSettleApplyDetailsVo.setShowHg(true);
@@ -449,6 +461,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         SettleApplyCommonVo settleApplyCommonVo = new SettleApplyCommonVo();
         //根据busVinSid查询还款计划表中数据
         LoanRepaymentPlanDetails loanRepaymentPlanDetails = baseMapper.selectByBusVinSid(busVinSid);
+        String scheduleSid = "";
         if (loanRepaymentPlanDetails != null) {
             settleApplyCommonVo.setVinNo(loanRepaymentPlanDetails.getVinNo());
             settleApplyCommonVo.setVehMark(loanRepaymentPlanDetails.getVehMark());
@@ -460,6 +473,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             settleApplyCommonVo.setBankName(loanRepaymentPlanDetails.getBankName());
             settleApplyCommonVo.setBankContractNo(loanRepaymentPlanDetails.getBankContractNo());
             settleApplyCommonVo.setSaleOrderSid(loanRepaymentPlanDetails.getSalesOrderSid());
+            scheduleSid = loanRepaymentPlanDetails.getScheduleSid();
         }
         String putBankInterest = baseMapper.selectDzfyqlx(busVinSid);
         settleApplyCommonVo.setPutBankInterest(putBankInterest);
@@ -467,6 +481,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String funfCost = baseMapper.selectZjzyf(busVinSid, settingDate);
         String dk = baseMapper.selectDk(busVinSid, settingDate);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        //计算当日资金占用费根据垫款总额
         try {
             Date d1 = format.parse(settingDate);//毫秒ms
             Date d2 = format.parse(DateUtil.today());//毫秒ms
@@ -492,13 +507,14 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String notDuePrice = baseMapper.selectGsWdq(busVinSid, settingDate);
         settleApplyCommonVo.setNotDuePrice(notDuePrice);
         //贷款保证金
-        //根据销售订单查询金额方案
+        //根据销售订单查询还款计划主表
-        LoanSolutions loanSolutions = loanSolutionsMapper.selectBySaleOrderSid(settleApplyCommonVo.getSaleOrderSid());
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
-        if (loanSolutions != null) {
+        if (null != schedule) {
-            LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
+            BigDecimal bondAmounts = BigDecimal.ZERO;
-            if (loanSolutionsDetail != null) {
+            if (null != schedule.getBondAmounts()) {
-                settleApplyCommonVo.setLoanDeposit(loanSolutionsDetail.getBondAmounts().toString());
+                bondAmounts = schedule.getBondAmounts();
-            }
+            }
+            settleApplyCommonVo.setLoanDeposit(bondAmounts.toString());
             //贷款保证金扣罚金额
             String fc_dkbzjkcgz = sysParameterFeign.fetchByParNo("FC_DKBZJKCGZ").getData();
             if (StringUtils.isNotBlank(fc_dkbzjkcgz)) {
@@ -516,7 +532,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 int overDueCount = baseMapper.selvehOverdueCount(busVinSid);
                 if (overDueCount > i) {
                     //大于规定次数扣除全部保证金 deductionAmount
-                    settleApplyCommonVo.setDeductionAmount(loanSolutionsDetail.getBondAmounts().toString());
+                    settleApplyCommonVo.setDeductionAmount(bondAmounts.toString());
                 } else {
                     BigDecimal sum = new BigDecimal(0);
                     for (int j = 0; j < overDueCount; j++) {
@@ -566,6 +582,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
         String businessSid = resultBean.getData();
         loanSettleApply = fetchBySid(businessSid);
+        //更新车辆表结清状态
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        baseMapper.updateBusAndSettleApplyDate(loanSettleApply.getBusVinSid(), "2", sdf.format(new Date()));
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -577,8 +596,19 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         bv.setOrgSidPath(loanSettleApply.getOrgSidPath());
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getUserSid());
+        String vinNo = "";
+        String vehMark = "";
+        if (StringUtils.isNotBlank(loanSettleApply.getVinNo())) {
+            vinNo = loanSettleApply.getVinNo();
+        }
+        if (StringUtils.isNotBlank(loanSettleApply.getVehMark())) {
+            vehMark = loanSettleApply.getVehMark();
+        }
+        String append = "车架号" + "<" + vinNo + "/" + vehMark + ">";
         if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
-            variables.put("orderNames", "提前结清申请");
+            variables.put("orderNames", append + "提前结清申请");
+        } else {
+            variables.put("orderNames", append + "结清申请");
         }
         bv.setFormVariables(variables);
         List<String> orgPathList = Arrays.asList(dto.getOrgPath().split("/"));
@@ -690,12 +720,22 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleApply.setCloseDate(DateUtil.today());
                 loanSettleApply.setSettingDate(DateUtil.today());
                 baseMapper.updateById(loanSettleApply);
-                //更新车辆表结清状态
+//                //更新车辆表结清状态
-                baseMapper.updateBus(loanSettleApply.getBusVinSid());
+//                baseMapper.updateBus(loanSettleApply.getBusVinSid(),"1");
                 //推送到结清车辆台账
-                pushSettlevehicle(businessSid);
+//                pushSettlevehicle(businessSid);
-                //推送应收、结转、减免。
+                LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
-                pushUnColl(businessSid);
+                if (null != reduction) {
+                    //获取公司减免情况
+                    BigDecimal amountTo = BigDecimal.ZERO;
+                    if (null != reduction.getAmountTo()) {
+                        amountTo = reduction.getAmountTo();
+                    }
+                    if (amountTo.compareTo(BigDecimal.ZERO) <= 0) {
+                        //推送应收、结转、减免。
+                        pushUnColl(businessSid);
+                    }
+                }
             } else {
                 //极光推送
                 loanSettleApply = fetchBySid(businessSid);
@@ -1410,6 +1450,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                loanSettleApply = fetchBySid(query.getBusinessSid());
+                if (loanSettleApply.getNodeState().equals("终止")) {
+                 //修改车辆结算状态为0
+                 baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0");
+                }
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -1421,6 +1466,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    loanSettleApply = fetchBySid(query.getBusinessSid());
+                    if (loanSettleApply.getNodeState().equals("终止")) {
+                        //修改车辆结算状态为0
+                        baseMapper.updateBus(loanSettleApply.getBusVinSid(),"0");
+                    }
                     return rb.success().setData(resultBean.getData());
                 }
             }
@@ -1436,6 +1486,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         return rb.success();
     }
 
+    public ResultBean assignTask(LoanSettleApplyDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new
+                FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.assignTask(delegateQuery);
+        return rb.success();
+    }
+
     public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
         ResultBean<SettleApplyAppVo> rb = ResultBean.fireFail();
         SettleApplyAppVo settleApplyAppVo = new SettleApplyAppVo();
@@ -1541,28 +1600,33 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         if (query != null) {
             //客户名称
             if (StringUtils.isNotBlank(query.getCustomer())) {
-                qw.like("ld.customer", query.getCustomer());
+                qw.like("bs.customerName", query.getCustomer());
             }
             //贷款人
             if (StringUtils.isNotBlank(query.getBorrowerName())) {
-                qw.like("ld.borrowName", query.getBorrowerName());
+                qw.like("br.borrowerName", query.getBorrowerName());
             }
             //车牌号
             if (StringUtils.isNotBlank(query.getVehMark())) {
-                qw.like("ld.vehMark", query.getVehMark());
+                qw.like("bv.vehMark", query.getVehMark());
+            }
+            //车架号
+            if (StringUtils.isNotBlank(query.getVinNo())) {
+                qw.like("bv.linkNo", query.getVinNo());
             }
             //机构全路径
             if (StringUtils.isNotBlank(query.getOrgPath())) {
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-                qw.eq("ld.useOrgSid", useOrgSid);
+                qw.eq("bs.useOrgSid", useOrgSid);
             }
-            qw.eq("bv.settleState", 0);
+            qw.apply("bv.settleState = '0'OR (bv.settleState = '2' AND date_format (bv.settleApplyDate,'%Y-%m-%d') < CURDATE())");
             //回购状态，回购申请
             if (StringUtils.isNotBlank(query.getType())) {
                 if (query.getType().equals("1")) {
                     qw.eq("bv.repoState", 0);
                 }
             }
+            qw.orderBy(true, true, "ld.loanContractNo", "bv.linkNo");
         }
         IPage<LoanSettleApply> page = PagerUtil.queryToPage(pagerQuery);
         IPage<SettleApplyListVo> pagging = baseMapper.getListPage(page, qw);
@@ -1572,7 +1636,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
 
     public ResultBean confirmAtn(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        pushConfirm(sid);
+        LoanSettleApply loanSettleApply = fetchBySid(sid);
+        String settingDate = loanSettleApply.getSettingDate();
+        String formatDate = DateUtil.formatDate(new Date());
+        if (formatDate.compareTo(settingDate) > 0) {
+            return rb.setMsg("只能在结清申请发起当日确认客户结清，若需结清，请重新发起结清申请！");
+        } else {
+            pushConfirm(sid);
+            loanSettleApply.setState(1);
+            baseMapper.updateById(loanSettleApply);
+        }
         return rb.success();
     }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.risk.settleapply;
 
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDto;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyQuery;
@@ -57,4 +58,10 @@ public interface SettleApplyFeign {
     @PutMapping(value = "/delegate")
     @ResponseBody
     public ResultBean delegate(@RequestBody SettleApplyDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody SettleApplyDelegateQuery delegateQuery);
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.biz.risk.settleapply;
 
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.anrui.terminal.api.risk.settleapply.SettleApplyAppVos;
 import com.yxt.anrui.terminal.api.risk.settleapply.SettleApplyFeign;
 import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQuery;
@@ -59,4 +60,9 @@ public class SettleApplyRest implements SettleApplyFeign {
     public ResultBean delegate(SettleApplyDelegateQuery delegateQuery) {
         return settleApplyService.delegate(delegateQuery);
     }
+
+    @Override
+    public ResultBean assignTask(SettleApplyDelegateQuery delegateQuery) {
+        return settleApplyService.assignTask(delegateQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java

@@ -1,12 +1,14 @@
 package com.yxt.anrui.terminal.biz.risk.settleapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApply;
 import com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyFeign;
 import com.yxt.anrui.riskcenter.api.loansettleapply.SettleApplyAppVo;
 import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos;
 import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesCostAppVo;
@@ -138,4 +140,13 @@ public class SettleApplyService {
         ResultBean delegate = loanSettleApplyFeign.delegate(delegateQuery1);
         return rb.success();
     }
+
+    public ResultBean assignTask(SettleApplyDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanSettleApplyDelegateQuery delegateQuery1 = new
+                LoanSettleApplyDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        ResultBean delegate = loanSettleApplyFeign.assignTask(delegateQuery1);
+        return rb.success();
+    }
 }

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java

@@ -75,14 +75,6 @@ public class PmsPurchaseBillRest {
 		return rb.success().setData(pv);
 	}
 
-	@ApiOperation("选择原单")
-	@PostMapping("/choiceBillListPage")
-	public ResultBean<PagerVo<PmsPurchaseChoiceBillVo>> choiceBillListPage(@RequestBody PagerQuery<PmsPurchaseChoiceBillQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<PmsPurchaseChoiceBillVo> pv = pmsPurchaseBillService.choiceBillListPage(pq);
-		return rb.success().setData(pv);
-	}
-
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean<String> save(@RequestBody PmsPurchaseBillDto dto){

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackDetailRest.java

@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "采购退货单据明细")
 @RestController
-@RequestMapping("/apiadmin/pms/pmspurchasebackdetail")
+@RequestMapping("v1/pmspurchasebackdetail")
 public class PmsPurchasebackDetailRest {
 
 	@Autowired
@@ -86,4 +86,12 @@ public class PmsPurchasebackDetailRest {
 		PmsPurchasebackDetailDetailsVo vo = pmsPurchasebackDetailService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@ApiOperation("根据商品sid查询已退数量")
+	@GetMapping("/selNumByGoodSid/{sid}")
+	public ResultBean<String> selNumByGoodSid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		String num = pmsPurchasebackDetailService.selNumByGoodSid(sid);
+		return rb.success().setData(num);
+	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java

@@ -56,10 +56,6 @@ public class PmsPurchasebackBill extends BaseEntity {
 
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("来源单sid（采购单sid）")
-    private String sourceBillSid; // 来源单sid（采购单sid）
-	@ApiModelProperty("来源单编号")
-    private String sourceBillNo; // 来源单编号
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("退误差调整金额")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java

@@ -71,10 +71,6 @@ public class PmsPurchasebackBillDetailsVo implements Vo {
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("来源单sid（采购单sid）")
-    private String sourceBillSid; // 来源单sid（采购单sid）
-	@ApiModelProperty("来源单编号")
-    private String sourceBillNo; // 来源单编号
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("退误差调整金额")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java

@@ -63,10 +63,6 @@ public class PmsPurchasebackBillDto implements Dto {
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("来源单sid（采购单sid）")
-    private String sourceBillSid; // 来源单sid（采购单sid）
-	@ApiModelProperty("来源单编号")
-    private String sourceBillNo; // 来源单编号
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("退误差调整金额")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java

@@ -60,9 +60,5 @@ public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBil
 
 	int updateFlowFiled(Map<String, Object> map);
 
-    int checkNodeStateBySourceBillSid(String sourceBillSid);
-
-	BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid);
-
 	int selectBySid(String join);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml

@@ -14,17 +14,10 @@
 		ppb.`deptName`,
 		ppb.createTime,
 		ppb.`finishTime`,
-		pb.billNo AS sourceBillNo,
-		pb.`payTypeValue`,
-		pb.`purchaseReasonValue`,
-		pb.`purchaseTypeValue`,
-		pb.supplierName,
 		SUM(ppd.backAmount) AS backAmountCount,
 		ppb.receivableAmount
 		FROM
 		pms_purchaseback_bill ppb
-		LEFT JOIN pms_purchase_bill pb
-		ON ppb.`sourceBillSid` = pb.`sid`
 		LEFT JOIN pms_purchaseback_detail ppd
 		ON ppb.`sid` = ppd.`billSid`
 		LEFT JOIN anrui_portal.sys_organization as s ON ppb.deptSid = s.sid
@@ -57,23 +50,6 @@
 		WHERE sid=#{sid}
 	</update>
 
-	<select id="checkNodeStateBySourceBillSid" resultType="int">
-		SELECT COUNT(*)
-		FROM pms_purchaseback_bill
-		WHERE sourceBillSid = #{sourceBillSid}
-		  AND nodeState != '已办结'
-		  AND nodeState != '终止'
-    </select>
-
-	<select id="checkPayableAmountBySourceBillSid" resultType="java.math.BigDecimal">
-		SELECT payableAmount
-		FROM pms_purchaseback_bill
-		WHERE sourceBillSid = #{sourceBillSid}
-		  AND nodeState = '已办结'
-		ORDER BY createTime DESC
-				LIMIT 1
-	</select>
-
 	<select id="selectBySid" resultType="int">
 		SELECT COUNT(*)
 		FROM pms_purchaseback_bill

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java

@@ -67,16 +67,6 @@ public class PmsPurchasebackBillQuery implements Query {
     private String finishStartTime;
     @ApiModelProperty("办结结束日期")
     private String finishEndTime;
-    @ApiModelProperty("来源单编号")
-    private String sourceBillNo;
-    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
-    private String purchaseTypeValue;
-    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
-    private String purchaseReasonValue;
-    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
-    private String payTypeValue;
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
 
     @ApiModelProperty("组织全路径")
     private String orgPath;

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@@ -156,21 +156,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		if (StringUtils.isNotBlank(query.getBillNo())) {
 			qw.like("ppb.billNo", query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getSourceBillNo())) {
-			qw.like("pb.billNo", query.getSourceBillNo());
-		}
-		if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
-			qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue());
-		}
-		if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
-			qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue());
-		}
-		if (StringUtils.isNotBlank(query.getPayTypeValue())) {
-			qw.like("pb.payTypeValue", query.getPayTypeValue());
-		}
-		if (StringUtils.isNotBlank(query.getSupplierName())) {
-			qw.like("pb.supplierName", query.getSupplierName());
-		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -202,10 +187,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		dto.setCreateOrgSid(useOrgSid);
 		dto.setCreateOrgName(organizationVo.getName());
 		if (StringUtils.isBlank(dtoSid)) {
-			int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid());
-			if (i > 0){
-				return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请");
-			}
 			//生成单据编号
 			String billNo = "";
 			String date = DateUtil.format(DateUtil.date(), "yyyyMM");
@@ -570,8 +551,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
-
-	public BigDecimal checkPayableAmountBySourceBillSid(String sourceBillSid) {
-		return baseMapper.checkPayableAmountBySourceBillSid(sourceBillSid);
-	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java

@@ -69,16 +69,6 @@ public class PmsPurchasebackBillVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime;
-    @ApiModelProperty("来源单编号")
-    private String sourceBillNo;
-    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
-    private String purchaseTypeValue;
-    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
-    private String purchaseReasonValue;
-    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
-    private String payTypeValue;
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
     @ApiModelProperty("退货金额")
     private String backAmountCount;
     @ApiModelProperty("应收金额")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetail.java

@@ -56,6 +56,8 @@ public class PmsPurchasebackDetail extends BaseEntity {
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
 	@ApiModelProperty("商品基础信息Sid")
     private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDetailsVo.java

@@ -57,6 +57,8 @@ public class PmsPurchasebackDetailDetailsVo implements Vo {
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
 	@ApiModelProperty("商品基础信息Sid")
     private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailDto.java

@@ -57,6 +57,8 @@ public class PmsPurchasebackDetailDto implements Dto {
     private String createByName; // 制单人姓名
 	@ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
 	@ApiModelProperty("商品基础信息Sid")
     private String goodsSpuSid; // 商品基础信息Sid
 	@ApiModelProperty("商品名称")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java

@@ -61,5 +61,5 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper<PmsPurchasebackD
 	@Select("select * from pms_purchaseback_detail where billSid = #{billSid}")
 	List<PmsPurchasebackDetailDetailsVo> selByMainSid(String billSid);
 
-	BigDecimal checkReturnedCount(@Param("goodsSkuSid") String goodsSkuSid,@Param("sourceBillSid") String sourceBillSid);
+    String selNumByGoodSid(String sid);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml

@@ -7,15 +7,14 @@
 		SELECT * FROM pms_purchaseback_detail <where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="checkReturnedCount" resultType="java.math.BigDecimal">
+	<select id="selNumByGoodSid" resultType="java.lang.String">
 		SELECT
-				IFNULL(SUM(ppd.backCount), 0)
+				IFNULL(SUM(pd.backCount),0)
 		FROM
-				pms_purchaseback_detail ppd
+				pms_purchaseback_detail pd
-						LEFT JOIN pms_purchaseback_bill ppb
+						LEFT JOIN pms_purchaseback_bill pb
-						ON ppd.`billSid` = ppb.sid
+						ON pd.`billSid` = pb.`sid`
-		WHERE ppd.goodsSkuSid = #{goodsSkuSid}
+		WHERE pd.goodsSpuSid = #{sid}
-		  AND ppb.`sourceBillSid` = #{sourceBillSid}
+		  AND pb.nodeState = '已办结'
-		  AND ppb.`nodeState` = '已办结'
 	</select>
 </mapper>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java

@@ -89,7 +89,7 @@ public class PmsPurchasebackDetailService extends MybatisBaseService<PmsPurchase
 		return baseMapper.selByMainSid(billSid);
 	}
 
-	public BigDecimal checkReturnedCount(String goodsSkuSid,String sourceBillSid) {
+	public String selNumByGoodSid(String sid) {
-		return baseMapper.checkReturnedCount(goodsSkuSid,sourceBillSid);
+		return baseMapper.selNumByGoodSid(sid);
 	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java

@@ -56,8 +56,6 @@ public interface PmsPurchaseBillMapper extends BaseMapper<PmsPurchaseBill> {
 
 	IPage<PmsPurchaseBillVo> selectPageVo(IPage<PmsPurchaseBill> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchaseBill> qw);
 
-    IPage<PmsPurchaseChoiceBillVo> choiceBillListPage(IPage<PmsPurchaseBill> page, @Param(Constants.WRAPPER) QueryWrapper<PmsPurchaseBill> qw);
-
     String selectNum(String billNo);
 
     int updateFlowFiled(Map<String, Object> map);

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@@ -32,37 +32,6 @@
 		<where> ${ew.sqlSegment} </where>
 	</select>
 
-	<select id="choiceBillListPage" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseChoiceBillVo">
-		SELECT
-				ppb.`sid`,
-				ppb.`createOrgName`,
-				ppb.`deptName`,
-				ppb.`finishTime`,
-				ppb.billNo,
-				ppb.`createTime`,
-				ppb.`purchaserName`,
-				ppb.`purchaseTypeValue`,
-				ppb.`purchaseReasonValue`,
-				ppb.`payTypeValue`,
-				ppb.`supplierName`,
-				IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
-				ppbi.billType,
-				ppbi.taxRate,
-				ppb.`remarks`,
-				SUM(ppbd.`amount`) AS amountCount,
-				ppb.freight,
-				ppb.discountAmount,
-				ppb.errorAmount,
-				ppb.`payableAmount`
-		FROM
-				pms_purchase_bill ppb
-						LEFT JOIN pms_purchase_bill_invoice ppbi
-						ON ppbi.`billSid` = ppb.`sid`
-						LEFT JOIN pms_purchase_bill_detail ppbd
-						ON ppbd.`billSid` = ppb.`sid`
-		<where> ${ew.sqlSegment} </where>
-	</select>
-
 	<select id="selectNum" resultType="java.lang.String">
 		select RIGHT (billNo, 4)
 		from pms_purchase_bill

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@@ -213,67 +213,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
         return p;
     }
 
-    public PagerVo<PmsPurchaseChoiceBillVo> choiceBillListPage(PagerQuery<PmsPurchaseChoiceBillQuery> pq) {
-        PmsPurchaseChoiceBillQuery query = pq.getParams();
-        QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
-        qw.eq("ppb.createOrgSid", query.getCreateOrgSid());
-        qw.eq("ppb.nodeState", "已办结");
-        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
-            qw.like("ppb.createOrgName", query.getCreateOrgName());
-        }
-        if (StringUtils.isNotBlank(query.getDeptName())) {
-            qw.like("ppb.deptName", query.getDeptName());
-        }
-        if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.like("ppb.createByName", query.getCreateByName());
-        }
-        if (StringUtils.isNotBlank(query.getBillNo())) {
-            qw.like("ppb.billNo", query.getBillNo());
-        }
-        if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
-            qw.like("ppb.purchaseTypeValue", query.getPurchaseTypeValue());
-        }
-        if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
-            qw.like("ppb.purchaseReasonValue", query.getPurchaseReasonValue());
-        }
-        if (StringUtils.isNotBlank(query.getPayTypeValue())) {
-            qw.like("ppb.payTypeValue", query.getPayTypeValue());
-        }
-        if (StringUtils.isNotBlank(query.getSupplierName())) {
-            qw.like("ppb.supplierName", query.getSupplierName());
-        }
-        if (StringUtils.isNotBlank(query.getIsInvoicing())) {
-            qw.eq("ppbi.isInvoicing", query.getIsInvoicing());
-        }
-        String createStartTime = query.getCreateStartTime();
-        String createEndTime = query.getCreateEndTime();
-        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
-                );
-        String finishStartTime = query.getFinishStartTime();
-        String finishEndTime = query.getFinishEndTime();
-        qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
-                );
-        qw.groupBy("ppb.sid");
-        IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
-        IPage<PmsPurchaseChoiceBillVo> pagging = baseMapper.choiceBillListPage(page, qw);
-        for (PmsPurchaseChoiceBillVo record : pagging.getRecords()) {
-            BigDecimal money = pmsPurchasebackBillService.checkPayableAmountBySourceBillSid(record.getSid());
-            if (money != null) {
-                record.setPayableAmount(money);
-            }
-            List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid());
-            for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) {
-                BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(), record.getSid());
-                pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount);
-            }
-            record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
-        }
-        PagerVo<PmsPurchaseChoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
     public String saveOrUpdateDto(PmsPurchaseBillDto dto) {
         String dtoSid = dto.getSid();
         PmsPurchasePayDto purchasePay = dto.getPurchasePay();

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitoutRest.java

@@ -29,9 +29,12 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitout.*;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,7 +47,7 @@ import java.util.List;
 
 @Api(tags = "盘亏出库申请")
 @RestController
-@RequestMapping("v1/wmsinventoryprofitout")
+@RequestMapping("v1/wmsinventoryloss")
 public class WmsInventoryProfitoutRest {
 
 	@Autowired
@@ -78,6 +81,22 @@ public class WmsInventoryProfitoutRest {
 		return rb.success().setData(vo);
 	}
 
+	@ApiOperation("根据部门sid获取盘亏盘点单号")
+	@PostMapping("/getSourceBillNoBySid")
+	public ResultBean<List<InventoryBillVo>> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid){
+		ResultBean rb = ResultBean.fireFail();
+		List<InventoryBillVo> voList = wmsInventoryProfitoutService.getSourceBillNoBySid(deptSid);
+		return rb.success().setData(voList);
+	}
+
+	@ApiOperation("根据盘点单sid获取盘亏商品列表")
+	@GetMapping("/sourceBillBySid/{sid}")
+	public ResultBean<List<WmsInventoryProfitoutDetailDto>> sourceBillBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		List<WmsInventoryProfitoutDetailDto> voList = wmsInventoryProfitoutService.sourceBillBySid(sid);
+		return rb.success().setData(voList);
+	}
+
 	@ApiOperation("提交")
 	@PostMapping("/submitApply")
 	public ResultBean submitApply(@Valid @RequestBody SubmitInventoryProfitoutDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillUseOrgSidVo.java

@@ -18,7 +18,7 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
     @ApiModelProperty("商品ID")
     private String goodsID;
     @ApiModelProperty("商品基础信息sid")
-    private String goodSpuSid;
+    private String goodsSpuSid;
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
@@ -47,6 +47,8 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
+    @ApiModelProperty("采购订单sid")
+    private String manufactorBillSid;
     @ApiModelProperty("厂家订单号")
     private String manufactorBillNo;
     @ApiModelProperty("厂家sid")
@@ -57,4 +59,9 @@ public class WmsInventoryBillUseOrgSidVo implements Vo {
     private String supplierSid;
     @ApiModelProperty("供应商名称")
     private String supplierName;
+
+    @ApiModelProperty("已退数量")
+    private BigDecimal returnedCount;
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -371,10 +371,11 @@
             resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillUseOrgSidVo">
         SELECT
                 w.*,
-                p.supplierSid,
+                w.billObjSid AS supplierSid,
-                p.supplierName,
+                w.billObjName AS supplierName,
                 wa.sid AS warehouseAreaSid,
-                wa.`areaName` AS warehouseArea
+                wa.`areaName` AS warehouseArea,
+                p.sid AS manufactorBillSid
         FROM wms_inventory w
                      LEFT JOIN yxt_pms.pms_purchase_bill p
                 ON w.manufactorBillNo = p.manufacturersOrderNumber

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -20,6 +20,7 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
 import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
 import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
+import com.yxt.wms.feign.pms.PmsPurchasebackDetailFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
@@ -37,8 +38,6 @@ import java.util.*;
 @Service
 public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper, WmsInventory> {
 
-    @Autowired
-    private WmsInventoryBillService wmsInventoryBillService;
     @Resource
     private BaseGoodsSkuFeign baseGoodsSkuFeign;
     @Autowired
@@ -46,6 +45,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
+    private PmsPurchasebackDetailFeign pmsPurchasebackDetailFeign;
+    @Autowired
     private WmsWarehouseRackService wmsWarehouseRackService;
 
     public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
@@ -589,7 +590,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             qw.like("w.warehouseRackCode", query.getWarehouseRackCode());
         }
         if (StringUtils.isNotBlank(query.getSupplierName())) {
-            qw.like("p.supplierName", query.getSupplierName());
+            qw.like("w.billObjName", query.getSupplierName());
         }
         if (StringUtils.isNotBlank(query.getManufacturerName())) {
             qw.like("w.manufacturerName", query.getManufacturerName());
@@ -603,6 +604,11 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         qw.apply("w.count > 0");
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryBillUseOrgSidVo> pagging = baseMapper.selInvenGoodsByUseOrgSid(page, qw);
+        for (WmsInventoryBillUseOrgSidVo record : pagging.getRecords()) {
+            String num = pmsPurchasebackDetailFeign.selNumByGoodSid(record.getGoodsSpuSid()).getData();
+            record.setReturnedCount(new BigDecimal(num));
+            record.setAmount(record.getCount().multiply(record.getCost()));
+        }
         PagerVo<WmsInventoryBillUseOrgSidVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java

@@ -86,4 +86,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
     IPage<WmsInventoryCheckbillPageVo> appDetailRackPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryCheckbill> qw);
 
     List<InventoryBillVo> selPyByDeptSid(String deptSid);
+
+    List<InventoryBillVo> selPkByDeptSid(String deptSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@@ -250,15 +250,33 @@
 				wms_inventory_checkbill wc
 						JOIN
 						(SELECT
-								 SUM(profitCount) AS total
+								 SUM(wd.profitCount) AS total,
+								 wd.billSid AS billSid
 						 FROM
-								 wms_inventory_checkbill wc
+								 wms_inventory_checkbill_detail wd
-										 LEFT JOIN wms_inventory_checkbill_detail wd
+						 GROUP BY wd.billSid) AS total_goods
-										 ON wc.sid = wd.billSid
-						 WHERE profitCount > 0) AS total_goods
 		WHERE wc.deptSid = #{deptSid}
+		  AND total_goods.billSid = wc.sid
+		  AND total_goods.total > 0
+		  AND wc.checkState = 2
+	</select>
+
+	<select id="selPkByDeptSid" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo">
+		SELECT
+				wc.sid AS billSid,
+				wc.billNo
+		FROM
+				wms_inventory_checkbill wc
+						JOIN
+						(SELECT
+								 SUM(wd.loseCount) AS total,
+								 wd.billSid AS billSid
+						 FROM
+								 wms_inventory_checkbill_detail wd
+						 GROUP BY wd.billSid) AS total_goods
+		WHERE wc.deptSid = #{deptSid}
+		  AND total_goods.billSid = wc.sid
 		  AND total_goods.total > 0
 		  AND wc.checkState = 2
-		GROUP BY wc.sid
 	</select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -905,4 +905,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public List<InventoryBillVo> selPyByDeptSid(String deptSid) {
         return baseMapper.selPyByDeptSid(deptSid);
     }
+
+    public List<InventoryBillVo> selPkByDeptSid(String deptSid) {
+        return baseMapper.selPkByDeptSid(deptSid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java

@@ -30,6 +30,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -73,4 +74,6 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper<WmsInvento
     HandleBean scan(@Param("sid") String sid,@Param("content") String content,@Param("houseSid") String houseSid);
 
     List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid);
+
+	List<WmsInventoryProfitoutDetailDto> sourceBillPkBySid(String sid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@@ -131,4 +131,32 @@
 		WHERE billSid = #{sid}
 		  AND profitCount > 0
 	</select>
+
+	<select id="sourceBillPkBySid"
+			resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto">
+		SELECT
+				d.goodsID,
+				d.goodsSpuSid AS goodsSid,
+				d.goodsSpuName,
+				d.goodsSkuSid,
+				d.goodsSkuTitle AS goodsName,
+				d.goodsSkuCode AS goodsCode,
+				d.goodsSkuOwnSpec AS goodsSpec,
+				d.manufacturerSid,
+				d.manufacturerName,
+				d.unit,
+				d.loseCount AS pKNum,
+				d.warehouseSid,
+				d.warehouseName,
+				d.warehouseRackSid,
+				d.warehouseRackName,
+				d.loseCount AS outStorageNum,
+				w.cost AS inStoragePrice
+		FROM
+				wms_inventory_checkbill_detail d
+						LEFT JOIN wms_inventory w
+						ON d.goodsID = w.goodsID
+		WHERE billSid = #{sid}
+		  AND loseCount > 0
+	</select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java

@@ -43,6 +43,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbi
 import com.yxt.common.base.service.MybatisBaseService;
 
 import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -183,4 +184,8 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
     public List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid) {
         return baseMapper.sourceBillBySid(sid);
     }
+
+    public List<WmsInventoryProfitoutDetailDto> sourceBillPkBySid(String sid) {
+        return baseMapper.sourceBillPkBySid(sid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java

@@ -73,7 +73,7 @@ public class WmsInventoryProfitinDetailsVo implements Vo {
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
 	@ApiModelProperty("业务类型")
-    private String businessVaule; // 业务类型
+    private String businessValue; // 业务类型
     @ApiModelProperty("盘点单sid")
     private String sourceBillSid; // 盘点单sid
     @ApiModelProperty("盘点单号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java

@@ -69,7 +69,7 @@ public class WmsInventoryProfitinDto implements Dto {
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
 	@ApiModelProperty("业务类型")
-    private String businessVaule; // 业务类型
+    private String businessValue; // 业务类型
 	@ApiModelProperty("盘点单sid")
     private String sourceBillSid; // 盘点单sid
 	@ApiModelProperty("盘点单号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java

@@ -56,4 +56,8 @@ public interface WmsInventoryProfitinDetailMapper extends BaseMapper<WmsInventor
     void delByMainSid(String mainSid);
 
     List<WmsInventoryProfitinDetailDetailsVo> selByMainSid(String mainSid);
+
+    List<String> selSupplierSid(String businessSid);
+
+    List<WmsInventoryProfitinDetailDetailsVo> selByMainSidAndSupSid(@Param("businessSid") String businessSid,@Param("supplierSid") String supplierSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml

@@ -1,29 +1,58 @@
 <?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.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
 
-<select id="selByMainSid"
+    <select id="selByMainSid"
             resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo">
-    SELECT
+        SELECT mainSid,
-            mainSid,
+               goodsSpuSid     AS goodsSid,
-            goodsSpuSid AS goodsSid,
+               goodsSpuName,
-            goodsSpuName,
+               goodsSkuSid,
-            goodsSkuSid,
+               goodsSkuTitle   AS goodsName,
-            goodsSkuTitle AS goodsName,
+               goodsSkuCode    AS goodsCode,
-            goodsSkuCode AS goodsCode,
+               goodsSkuOwnSpec AS goodsSpec,
-            goodsSkuOwnSpec AS goodsSpec,
+               unit,
-            unit,
+               manufacturerSid,
-            manufacturerSid,
+               manufacturerName,
-            manufacturerName,
+               profitCount     AS pyNum,
-            profitCount AS pyNum,
+               supplierSid,
-            supplierSid,
+               supplierName,
-            supplierName,
+               inCost          AS inStoragePrice,
-            inCost AS inStoragePrice,
+               inCount         AS inStorageNum
-            inCount AS inStorageNum
+        FROM wms_inventory_profitin_detail
-    FROM
+        WHERE mainSid = #{mainSid}
-            wms_inventory_profitin_detail
+    </select>
-    WHERE mainSid = #{mainSid}
+
-</select>
+    <select id="selSupplierSid" resultType="java.lang.String">
+        SELECT
+                supplierSid
+        FROM
+                wms_inventory_profitin_detail
+        WHERE mainSid = #{businessSid}
+        GROUP BY supplierSid
+    </select>
+
+    <select id="selByMainSidAndSupSid"
+            resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo">
+        SELECT mainSid,
+               goodsSpuSid     AS goodsSid,
+               goodsSpuName,
+               goodsSkuSid,
+               goodsSkuTitle   AS goodsName,
+               goodsSkuCode    AS goodsCode,
+               goodsSkuOwnSpec AS goodsSpec,
+               unit,
+               manufacturerSid,
+               manufacturerName,
+               profitCount     AS pyNum,
+               supplierSid,
+               supplierName,
+               inCost          AS inStoragePrice,
+               inCount         AS inStorageNum
+        FROM wms_inventory_profitin_detail
+        WHERE mainSid = #{businessSid}
+        AND supplierSid = #{supplierSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java

@@ -63,4 +63,12 @@ public class WmsInventoryProfitinDetailService extends MybatisBaseService<WmsInv
 	public List<WmsInventoryProfitinDetailDetailsVo> selByMainSid(String mainSid) {
 		return baseMapper.selByMainSid(mainSid);
 	}
+
+	public List<String> selSupplierSid(String businessSid) {
+		return baseMapper.selSupplierSid(businessSid);
+	}
+
+	public List<WmsInventoryProfitinDetailDetailsVo> selByMainSidAndSupSid(String businessSid, String supplierSid) {
+		return baseMapper.selByMainSidAndSupSid(businessSid,supplierSid);
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDetailsVo.java

@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.util.List;
 
+import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDetailsVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import io.swagger.annotations.ApiModel;
@@ -66,35 +67,35 @@ public class WmsInventoryProfitoutDetailsVo implements Vo {
     private String remarks;
     @ApiModelProperty("申请人sid")
     private String createBySid;
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("申请部门sid")
     private String deptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
-	@ApiModelProperty("业务类型")
+    @ApiModelProperty("业务类型")
-    private String busType; // 业务类型
+    private String businessValue; // 业务类型
-	@ApiModelProperty("盘点单sid")
+    @ApiModelProperty("盘点单sid")
-    private String checkBillSid; // 盘点单sid
+    private String sourceBillSid; // 盘点单sid
-	@ApiModelProperty("盘点单号")
+    @ApiModelProperty("盘点单号")
-    private String checkBillNo; // 盘点单号
+    private String sourceBillNo; // 盘点单号
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
-    private Date finishTime;
+    private Date finishTime; // 办结时间
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeId; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("任务id")
+    @ApiModelProperty("任务id")
     private String taskId; // 任务id
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty
-    private List<WmsInventoryProfitoutDetailDetailsVo> wmsInventoryProfitoutDetailList;
+    private List<WmsInventoryProfitoutDetailDetailsVo> goodsList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDto.java

@@ -57,41 +57,41 @@ public class WmsInventoryProfitoutDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("单据编号")
+    @ApiModelProperty("单据编号")
     private String billNo; // 单据编号
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("申请人sid")
     private String createBySid;
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("申请部门sid")
     private String deptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
-	@ApiModelProperty("业务类型")
+    @ApiModelProperty("业务类型")
-    private String busType; // 业务类型
+    private String businessValue; // 业务类型
-	@ApiModelProperty("盘点单sid")
+    @ApiModelProperty("盘点单sid")
-    private String checkBillSid; // 盘点单sid
+    private String sourceBillSid; // 盘点单sid
-	@ApiModelProperty("盘点单号")
+    @ApiModelProperty("盘点单号")
-    private String checkBillNo; // 盘点单号
+    private String sourceBillNo; // 盘点单号
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
-    private Date finishTime;
+    private Date finishTime; // 办结时间
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeId; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("任务id")
+    @ApiModelProperty("任务id")
     private String taskId; // 任务id
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty
-    private List<WmsInventoryProfitoutDetailDto> wmsInventoryProfitoutDetailList;
+    private List<WmsInventoryProfitoutDetailDto> goodsList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutMapper.xml

@@ -4,7 +4,18 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitout.WmsInventoryProfitoutVo">
-		SELECT * FROM wms_inventory_profitout wip
+		SELECT wip.sid,
+		wip.nodeState,
+		wip.billNo,
+		wip.deptName,
+		wip.createByName,
+		wip.createTime,
+		wip.finishTime,
+		wip.checkBillNo as sourceBillNo,
+		wip.busType as businessType,
+		wip.procDefId,
+		wip.procInstId
+		FROM wms_inventory_profitout wip
 		LEFT JOIN anrui_portal.sys_organization as s ON wip.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutQuery.java

@@ -58,13 +58,13 @@ public class WmsInventoryProfitoutQuery implements Query {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("申请日期")
-    private String createTimeStart;
+    private String createStartTime;
-    private String createTimeEnd;
+    private String createEndTime;
     @ApiModelProperty("办结日期")
-    private String finishTimeStart;
+    private String finishStartTime;
-    private String finishTimeEnd;
+    private String finishEndTime;
     @ApiModelProperty("盘点单号")
-    private String checkBillNo;
+    private String sourceBillNo;
 
     private String orgPath;
     private String userSid;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java

@@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillService;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitin;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitinVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*;
@@ -92,6 +95,10 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 	private MessageFeign messageFeign;
 	@Autowired
 	private WmsInventoryProfitoutDetailService wmsInventoryProfitoutDetailService;
+	@Autowired
+	private WmsInventoryCheckbillService wmsInventoryCheckbillService;
+	@Autowired
+	private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
 	
 	public PagerVo<WmsInventoryProfitoutVo> listPageVo(PagerQuery<WmsInventoryProfitoutQuery> pq) {
 		WmsInventoryProfitoutQuery query = pq.getParams();
@@ -144,16 +151,16 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		if (StringUtils.isNotBlank(query.getBillNo())) {
 			qw.like("wip.billNo", query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getCheckBillNo())){
+		if (StringUtils.isNotBlank(query.getSourceBillNo())){
-			qw.like("wip.checkBillNo",query.getCheckBillNo());
+			qw.like("wip.checkBillNo",query.getSourceBillNo());
 		}
-		String createTimeStart = query.getCreateTimeStart();
+		String createTimeStart = query.getCreateStartTime();
-		String createTimeEnd = query.getCreateTimeEnd();
+		String createTimeEnd = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (wip.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (wip.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
 				);
-		String finishTimeStart = query.getFinishTimeStart();
+		String finishTimeStart = query.getFinishStartTime();
-		String finishTimeEnd = query.getFinishTimeEnd();
+		String finishTimeEnd = query.getFinishEndTime();
 		qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wip.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wip.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
 				);
@@ -166,7 +173,7 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 	public ResultBean<String> saveOrUpdateDto(WmsInventoryProfitoutDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-		List<WmsInventoryProfitoutDetailDto> wmsInventoryProfitoutDetailList = dto.getWmsInventoryProfitoutDetailList();
+		List<WmsInventoryProfitoutDetailDto> wmsInventoryProfitoutDetailList = dto.getGoodsList();
 		String deptSid = dto.getDeptSid();
 		SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
 		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
@@ -205,6 +212,9 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		WmsInventoryProfitout entity = new WmsInventoryProfitout();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		entity.setNodeState("待提交");
+		entity.setBusType(dto.getBusinessValue());
+		entity.setCheckBillSid(dto.getSourceBillSid());
+		entity.setCheckBillNo(dto.getSourceBillNo());
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
@@ -223,8 +233,11 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		WmsInventoryProfitout entity = fetchBySid(sid);
 		WmsInventoryProfitoutDetailsVo vo = new WmsInventoryProfitoutDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
+		vo.setSourceBillSid(entity.getCheckBillSid());
+		vo.setSourceBillNo(entity.getBillNo());
+		vo.setBusinessValue(entity.getBusType());
 		List<WmsInventoryProfitoutDetailDetailsVo> wmsInventoryProfitoutDetailDetailsVos = wmsInventoryProfitoutDetailService.selByMainSid(sid);
-		vo.setWmsInventoryProfitoutDetailList(wmsInventoryProfitoutDetailDetailsVos);
+		vo.setGoodsList(wmsInventoryProfitoutDetailDetailsVos);
 		return vo;
 	}
 
@@ -544,4 +557,12 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public List<InventoryBillVo> getSourceBillNoBySid(String deptSid) {
+		return wmsInventoryCheckbillService.selPkByDeptSid(deptSid);
+	}
+
+	public List<WmsInventoryProfitoutDetailDto> sourceBillBySid(String sid) {
+		return wmsInventoryCheckbillDetailService.sourceBillPkBySid(sid);
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutVo.java

@@ -68,9 +68,9 @@ public class WmsInventoryProfitoutVo implements Vo {
     @ApiModelProperty("办结日期")
     private Date finishTime;
     @ApiModelProperty("盘点单号")
-    private String checkBillNo;
+    private String sourceBillNo;
     @ApiModelProperty("业务类型")
-    private String busType;
+    private String businessType;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("流程实例的sid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetail.java

@@ -85,7 +85,7 @@ public class WmsInventoryProfitoutDetail extends BaseEntity {
 	@ApiModelProperty("入库单价")
     private BigDecimal inCost; // 入库单价
 	@ApiModelProperty("盘亏数量")
-    private BigDecimal lossCount; // 盘亏数量
+    private BigDecimal loseCount; // 盘亏数量
 	@ApiModelProperty("出库数量")
     private BigDecimal outCount; // 出库数量
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDetailsVo.java

@@ -57,37 +57,38 @@ public class WmsInventoryProfitoutDetailDetailsVo implements Vo {
     private String mainSid; // 主表sid
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
+    @ApiModelProperty("图号")
+    private String goodsCode;
     @ApiModelProperty("商品spuSid")
-    private String goodsSpuSid;
+    private String goodsSid;
     @ApiModelProperty("商品spu名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品sku名称")
-    private String goodsSkuTitle;
+    private String goodsName;
-    @ApiModelProperty("图号")
-    private String goodsSkuCode;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
+    private String goodsSpec;
+    @ApiModelProperty("入库单价")
+    private String inStoragePrice;
+    @ApiModelProperty("盘亏数量")
+    private String pkNum;
     @ApiModelProperty("厂家sid")
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
-	@ApiModelProperty("单位")
+    @ApiModelProperty("单位")
     private String unit; // 单位
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
+    @ApiModelProperty("库位名称")
     private String warehouseRackName; // 库位名称
-	@ApiModelProperty("入库单价")
+    @ApiModelProperty("出库数量")
-    private BigDecimal inCost; // 入库单价
+    private BigDecimal outStorageNum; // 出库数量
-	@ApiModelProperty("盘亏数量")
-    private BigDecimal lossCount; // 盘亏数量
-	@ApiModelProperty("出库数量")
-    private BigDecimal outCount; // 出库数量
 
+    private String money;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java

@@ -53,41 +53,43 @@ public class WmsInventoryProfitoutDetailDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("主表sid")
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("商品ID")
+    @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
+    @ApiModelProperty("图号")
+    private String goodsCode;
     @ApiModelProperty("商品spuSid")
-    private String goodsSpuSid;
+    private String goodsSid;
     @ApiModelProperty("商品spu名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品sku名称")
-    private String goodsSkuTitle;
+    private String goodsName;
-    @ApiModelProperty("图号")
-    private String goodsSkuCode;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
+    private String goodsSpec;
+    @ApiModelProperty("入库单价")
+    private String inStoragePrice;
+    @ApiModelProperty("盘亏数量")
+    private String pkNum;
     @ApiModelProperty("厂家sid")
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
-	@ApiModelProperty("单位")
+    @ApiModelProperty("单位")
     private String unit; // 单位
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
+    @ApiModelProperty("库位名称")
     private String warehouseRackName; // 库位名称
-	@ApiModelProperty("入库单价")
+    @ApiModelProperty("出库数量")
-    private BigDecimal inCost; // 入库单价
+    private BigDecimal outStorageNum; // 出库数量
-	@ApiModelProperty("盘亏数量")
+
-    private BigDecimal lossCount; // 盘亏数量
+    private String money;
-	@ApiModelProperty("出库数量")
-    private BigDecimal outCount; // 出库数量
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.java

@@ -52,6 +52,5 @@ public interface WmsInventoryProfitoutDetailMapper extends BaseMapper<WmsInvento
     @Delete("delete from wms_inventory_profitout_detail where mainSid = #{mainSid}")
     void delByMainSid(String mainSid);
 
-    @Select("select * from wms_inventory_profitout_detail where mainSid = #{mainSid}")
     List<WmsInventoryProfitoutDetailDetailsVo> selByMainSid(String mainSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.xml

@@ -3,4 +3,30 @@
 <mapper namespace="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
+
+<select id="selByMainSid"
+            resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDetailsVo">
+    SELECT
+            mainSid,
+            goodsID,
+            goodsSpuSid AS goodsSid,
+            goodsSpuName,
+            goodsSkuSid,
+            goodsSkuTitle AS goodsName,
+            goodsSkuCode AS goodsCode,
+            goodsSkuOwnSpec AS goodsSpec,
+            unit,
+            manufacturerSid,
+            manufacturerName,
+            loseCount AS pkNum,
+            warehouseSid,
+            warehouseName,
+            warehouseRackSid,
+            warehouseRackName,
+            inCost AS inStoragePrice,
+            outCount AS outStorageNum
+    FROM
+            wms_inventory_profitout_detail
+    WHERE mainSid = #{mainSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailService.java

@@ -30,6 +30,7 @@ import com.yxt.common.base.service.MybatisBaseService;
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -51,6 +52,13 @@ public class WmsInventoryProfitoutDetailService extends MybatisBaseService<WmsIn
 	public void insertByDto(WmsInventoryProfitoutDetailDto dto){
 		WmsInventoryProfitoutDetail entity = new WmsInventoryProfitoutDetail();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setGoodsSpuSid(dto.getGoodsSid());
+		entity.setGoodsSkuTitle(dto.getGoodsName());
+		entity.setGoodsSkuCode(dto.getGoodsCode());
+		entity.setGoodsSkuOwnSpec(dto.getGoodsSpec());
+		entity.setLoseCount(new BigDecimal(dto.getPkNum()));
+		entity.setInCost(new BigDecimal(dto.getInStoragePrice()));
+		entity.setOutCount(dto.getOutStorageNum());
 		baseMapper.insert(entity);
 	}
 	

yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java

@@ -12,5 +12,8 @@ public class BaseSupplierInfoDetailsVo {
 
     @ApiModelProperty("供应商名称")
     private String supplierName;
-
+    @ApiModelProperty("供应商联系人")
+    private String contactName;
+    @ApiModelProperty("电话")
+    private String contactTelePhone;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/feign/pms/PmsPurchasebackDetailFeign.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.feign.pms;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+        contextId = "yxt-pms-PmsPurchasebackDetail",
+        name = "yxt-pms",
+        path = "v1/pmspurchasebackdetail"
+      )
+public interface PmsPurchasebackDetailFeign {
+
+      @ApiOperation("根据商品sid查询已退数量")
+      @GetMapping("/selNumByGoodSid/{sid}")
+      public ResultBean<String> selNumByGoodSid(@PathVariable("sid") String sid);
+}