Merge remote-tracking branch 'origin/master'

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

@@ -241,4 +241,9 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid")String orgSid);
 
+    @ApiOperation("查询供应商下的开户行信息")
+    @GetMapping("/getBankList")
+    @ResponseBody
+    ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid")String sid);
+
 }

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

@@ -150,4 +150,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
     public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<ManBankVo>> getBankList(String sid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 16:40
+ * @Description
+ */
+@Data
+public class ManBankVo implements Vo {
+    private static final long serialVersionUID = 7602748514129847222L;
+    @ApiModelProperty("收款银行名称")
+    private String receiveBank;
+    @ApiModelProperty("收款银行账号")
+    private String receiveBankAccount;
+
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 16:39
+ * @Description
+ */
+@Data
+public class ManufacturerVo implements Vo {
+    private static final long serialVersionUID = 6527095329799323031L;
+    @ApiModelProperty("供应商sid")
+    private String sid;
+    @ApiModelProperty("供应商编码")
+    private String payCode;
+    @ApiModelProperty("供应商名称")
+    private String name;
+
+
+}

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

@@ -242,4 +242,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
         return baseManufacturerService.getDetailsList(orgSid);
     }
+
+    @Override
+    public ResultBean<List<ManBankVo>> getBankList(String sid) {
+        return baseManufacturerService.getBankList(sid);
+    }
 }

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

@@ -743,4 +743,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         }
         return rb.success().setData(voList);
     }
+
+    public ResultBean<List<ManBankVo>> getBankList(String sid) {
+        ResultBean<List<ManBankVo>> rb = ResultBean.fireFail();
+        List<ManBankVo> bankVoList = baseManufacturerBankService.getBankList(sid);
+        return rb.success().setData(bankVoList);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.basemanufacturer.ManBankVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
@@ -73,4 +74,11 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     BaseManufacturerBankVo details(String sid);
 
     String selectBankAccount(@Param("brandSid") String brandSid,@Param("manufaSaleChannelValue") String manufaSaleChannelValue);
+
+    /**
+     * 根据供应商sid获取开户行信息
+     * @param sid 供应商sid
+     * @return
+     */
+    List<ManBankVo> getBankList(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -162,4 +162,8 @@
           AND bm.isDelete = 0
           AND bmb.actualPay != ""
     </select>
+
+    <select id="getBankList" resultType="com.yxt.anrui.base.api.basemanufacturer.ManBankVo">
+        select depositBank as receiveBank,bankAccount as receiveBankAccount from base_manufacturer_bank where manufacturerSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
+import com.yxt.anrui.base.api.basemanufacturer.ManBankVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
@@ -97,4 +98,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
         String bankAccount = baseMapper.selectBankAccount(brandSid, manufaSaleChannelValue);
         return rb.success().setData(bankAccount);
     }
+
+    public List<ManBankVo> getBankList(String sid) {
+        return baseMapper.getBankList(sid);
+    }
 }

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

@@ -40,4 +40,14 @@ public class FinPaymentrecordUpdateDto implements Dto {
 
     @ApiModelProperty(value = "付款凭证")
     private List<String> payFiles;
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany;
+    @ApiModelProperty("收款账号")
+    private String receiveBankAccount;
+    @ApiModelProperty("收款银行名称")
+    private String receiveBank;
+    @ApiModelProperty("供应商编码")
+    private String payCode;
+    @ApiModelProperty("金额")
+    private String cost;
 }

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

@@ -84,5 +84,7 @@ public class FinPaymentrecordVo implements Vo {
     private List<String> payFiles;
 
     private String payFile;
+    @ApiModelProperty("供应商编码")
+    private String payCode;
 
 }

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

@@ -22,7 +22,8 @@
                fp.receiveBankAccount,
                fp.receiveBank,
                fp.cost,
-               fp.payFile
+               fp.payFile,
+               fp.payCode
         FROM fin_paymentrecord fp
         <where>
             ${ew.sqlSegment}