Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseBankVo implements Vo {
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccount;
+    @ApiModelProperty(value = "开户行")
+    private String depositBank;
+    @ApiModelProperty(value = "供应商")
+    private String manufacturerName;
+}

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

@@ -14,19 +14,6 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeign.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "供应厂商信息")
 @FeignClient(
         contextId = "anrui-base-BaseManufacturer",
@@ -75,7 +62,12 @@ public interface BaseManufacturerFeign {
     @ApiOperation("获取分公司和分类获取供应商")
     @PostMapping("/getGysTypeByOrgSid")
     @ResponseBody
-    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid,@RequestParam("supplierType") String supplierType);
+    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType);
+
+    @ApiOperation("根据分公司和分类获取开户行信息")
+    @PostMapping("/getKhhByOrgSid")
+    @ResponseBody
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType);
 
     /**
      * 生成厂商开户行信息到供应商
@@ -142,7 +134,7 @@ public interface BaseManufacturerFeign {
     @ApiOperation("车辆台账新增查询供应商")
     @GetMapping("/selectSupplier")
     @ResponseBody
-    public ResultBean<List<Map<String,String>>> selectSupplier(@RequestParam("manPurOrderTypeKey") String manPurOrderTypeKey,@RequestParam(value = "carBrandSid",required = false) String carBrandSid,@RequestParam("orgSid") String orgSid);
+    public ResultBean<List<Map<String, String>>> selectSupplier(@RequestParam("manPurOrderTypeKey") String manPurOrderTypeKey, @RequestParam(value = "carBrandSid", required = false) String carBrandSid, @RequestParam("orgSid") String orgSid);
 
     /**
      * 外采供应商名称下拉选
@@ -224,27 +216,27 @@ public interface BaseManufacturerFeign {
     @ApiOperation("根据分公司sid和厂商sid查询供应商sid")
     @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}")
     @ResponseBody
-    ResultBean<BaseManufacturerDetailsVo> selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid);
+    ResultBean<BaseManufacturerDetailsVo> selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid, @PathVariable("manufacturerSid") String manufacturerSid);
 
     @ApiOperation("根据车型sid查询品牌、厂商等信息")
     @GetMapping("/getManDetails/{modelSid}")
     @ResponseBody
-    ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid")String modelSid);
+    ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid") String modelSid);
 
     @ApiOperation("根据车型sid查询品牌、厂商等信息")
     @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}")
     @ResponseBody
-    ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName);
+    ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid") String buyerOrgSid, @PathVariable("sellerOrgName") String sellerOrgName);
 
     @ApiOperation("查询分公司下的供应商信息和主机厂信息")
     @GetMapping("/getDetailsList")
     @ResponseBody
-    ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid")String orgSid);
+    ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid") String orgSid);
 
     @ApiOperation("查询供应商下的开户行信息")
     @GetMapping("/getBankList")
     @ResponseBody
-    ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid")String sid);
+    ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid") String sid);
 
     @ApiOperation("根据供应商code查询供应商信息")
     @GetMapping("/fetchByCode")

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

@@ -8,19 +8,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeignFallback <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
 
@@ -45,6 +32,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        return null;
+    }
+
     @Override
     public ResultBean copyManBankToGys(String orgSid) {
         return null;

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

@@ -1,25 +1,11 @@
 package com.yxt.anrui.base.api.basemanufacturer;
 
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerVo.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerVo <br/>
- * Description: 供应厂商信息 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "供应厂商信息 视图数据对象", description = "供应厂商信息 视图数据对象")
 @Data
 public class BaseManufacturerVo implements Vo {

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

@@ -155,4 +155,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     @Select("SELECT * FROM base_manufacturer WHERE manufacturerCode = #{supplierCode}")
     BaseManufacturerDetailsVo fetchByCode(String supplierCode);
+
+    List<BaseBankVo> getKhhByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
 }

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

@@ -352,4 +352,15 @@
         left join base_vehicle_brand bb on bb.manufacturerSid = bm.sid
         where bm.supplierType = '0001' and bm.isDelete = 0 and bb.useOrg like concat('%',#{orgSid},'%')
     </select>
+
+    <select id="getKhhByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseBankVo">
+        SELECT bb.bankAccount,
+               bb.depositBank,
+               b.manufacturerName
+        FROM base_manufacturer_bank bb
+                 LEFT JOIN base_manufacturer b
+                           ON bb.manufacturerSid = b.sid
+        WHERE b.createOrg = #{orgSid}
+          AND b.supplierType = #{supplierType}
+    </select>
 </mapper>

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

@@ -24,19 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerRest <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "供应厂商信息")
 @Controller
 @RequestMapping("v1/basemanufacturer")
@@ -92,8 +79,13 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     }
 
     @Override
-    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid,String supplierType) {
+    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid, String supplierType) {
-        return baseManufacturerService.getGysTypeByOrgSid(orgSid,supplierType);
+        return baseManufacturerService.getGysTypeByOrgSid(orgSid, supplierType);
+    }
+
+    @Override
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        return baseManufacturerService.getKhhByOrgSid(orgSid, supplierType);
     }
 
     @Override
@@ -136,8 +128,8 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     }
 
     @Override
-    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid,String orgSid) {
+    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid, String orgSid) {
-        return baseManufacturerService.selectSupplier(manPurOrderTypeKey,carBrandSid,orgSid);
+        return baseManufacturerService.selectSupplier(manPurOrderTypeKey, carBrandSid, orgSid);
     }
 
     @Override
@@ -235,7 +227,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
 
     @Override
     public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
-        return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName);
+        return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName);
     }
 
     @Override

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

@@ -139,8 +139,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
      * @param name 厂商名称
      * @return
      */
-    public int selectCountByName(String name,String createOrg) {
+    public int selectCountByName(String name, String createOrg) {
-        return baseMapper.selectCountByName(name,createOrg);
+        return baseMapper.selectCountByName(name, createOrg);
     }
 
     /**
@@ -334,14 +334,14 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){
+        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())) {
             //集团推送所有分公司的供应商
             //查询所有分公司，并向所有分公司中插入供应商信息
             ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
             List<SysOrganizationVo> list = orgList.getData();
             for (SysOrganizationVo sysOrganizationVo : list) {
                 List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-                if (data != null){
+                if (data != null) {
                     for (BasePurchaseSystemDetailsVo datum : data) {
                         BdSupplier bdSupplier = new BdSupplier();
                         bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -350,7 +350,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                         bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                         finKingDeeFeign.draftBdSupplier(bdSupplier);
                     }
-                }else {
+                } else {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                     bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -359,10 +359,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     finKingDeeFeign.draftBdSupplier(bdSupplier);
                 }
             }
-        }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
+        } else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())) {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
             List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-            if (data != null){
+            if (data != null) {
                 for (BasePurchaseSystemDetailsVo datum : data) {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -371,7 +371,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                     finKingDeeFeign.draftBdSupplier(bdSupplier);
                 }
-            }else {
+            } else {
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                 bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -398,14 +398,14 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
     private ResultBean saveBaseManufacturerBankDto(BaseManufacturerBankDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         String bankSid = dto.getSid();
-        if(StringUtils.isNotBlank(bankSid)){
+        if (StringUtils.isNotBlank(bankSid)) {
             BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(bankSid);
-            BeanUtil.copyProperties(dto,baseManufacturerBank,"sid");
+            BeanUtil.copyProperties(dto, baseManufacturerBank, "sid");
             baseManufacturerBank.setManufacturerSid(sid);
             baseManufacturerBankService.updateById(baseManufacturerBank);
-        }else{
+        } else {
             BaseManufacturerBank baseManufacturerBank = new BaseManufacturerBank();
-            BeanUtil.copyProperties(dto,baseManufacturerBank,"sid");
+            BeanUtil.copyProperties(dto, baseManufacturerBank, "sid");
             baseManufacturerBank.setManufacturerSid(sid);
             baseManufacturerBankService.insert(baseManufacturerBank);
         }
@@ -436,7 +436,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         }
         String name = dto.getManufacturerName();
         String createOrg = dto.getCreateOrg();
-        int count = this.selectCountByName(name,createOrg);
+        int count = this.selectCountByName(name, createOrg);
         if (count > 0) {
             return rb.setMsg("该厂商名称已存在");
         }
@@ -489,9 +489,9 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         strings.add(sid);
 //        baseManufacturerBankService.updateBySidIsDelete(strings);
         List<BaseManufacturerBankDto> baseManufacturerBankDto = dto.getBaseManufacturerBankDto();
-        List<String> stringList = baseManufacturerBankDto.stream().map(v->v.getSid()).collect(Collectors.toList());
+        List<String> stringList = baseManufacturerBankDto.stream().map(v -> v.getSid()).collect(Collectors.toList());
         List<BaseManufacturerBank> baseManufacturerBankList = baseManufacturerBankService.selectByManSid(sid);
-         if (baseManufacturerBankDto.size() > 0) {
+        if (baseManufacturerBankDto.size() > 0) {
             for (BaseManufacturerBankDto manufacturerBankDto : baseManufacturerBankDto) {
                 ResultBean resultBean1 = saveBaseManufacturerBankDto(manufacturerBankDto, sid);
                 if (!resultBean1.getCode().equals("200")) {
@@ -499,25 +499,25 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 }
             }
         }
-         if(!baseManufacturerBankList.isEmpty()){
+        if (!baseManufacturerBankList.isEmpty()) {
-             List<String> stringList1 = baseManufacturerBankList.stream().map(v->v.getSid()).collect(Collectors.toList());
+            List<String> stringList1 = baseManufacturerBankList.stream().map(v -> v.getSid()).collect(Collectors.toList());
-             stringList.removeAll(Collections.singleton(null));
+            stringList.removeAll(Collections.singleton(null));
-             for (int j = 0; j < stringList1.size(); j++) {
+            for (int j = 0; j < stringList1.size(); j++) {
-                 if(!stringList.contains(stringList1.get(j))){
+                if (!stringList.contains(stringList1.get(j))) {
-                     baseManufacturerBankService.updateBySidIsDeletes(stringList1.get(j));
+                    baseManufacturerBankService.updateBySidIsDeletes(stringList1.get(j));
-                 }
+                }
-             }
+            }
-         }
+        }
         //BaseManufacturerFinance baseManufacturerFinance = baseManufacturerFinanceService.selectByBaseManufacturerSid(sid);
         //baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(), baseManufacturerFinance.getSid());
-        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){
+        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())) {
             //集团推送所有分公司的供应商
             //查询所有分公司，并向所有分公司中插入供应商信息
             ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
             List<SysOrganizationVo> list = orgList.getData();
             for (SysOrganizationVo sysOrganizationVo : list) {
                 List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-                if (data != null){
+                if (data != null) {
                     for (BasePurchaseSystemDetailsVo datum : data) {
                         BdSupplier bdSupplier = new BdSupplier();
                         bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -526,7 +526,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                         bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                         finKingDeeFeign.updateBdSupplier(bdSupplier);
                     }
-                }else {
+                } else {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                     bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -535,10 +535,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     finKingDeeFeign.updateBdSupplier(bdSupplier);
                 }
             }
-        }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
+        } else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())) {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
             List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-            if (data != null){
+            if (data != null) {
                 for (BasePurchaseSystemDetailsVo datum : data) {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -547,7 +547,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                     finKingDeeFeign.updateBdSupplier(bdSupplier);
                 }
-            }else {
+            } else {
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                 bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -787,11 +787,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             String useOrg = baseVehicleBrand.getUseOrg();
             String[] split = useOrg.split(",");
             for (String s : split) {
-                if (!s.equals(orgSid)){
+                if (!s.equals(orgSid)) {
                     SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s).getData();
                     Map<String, String> map = new HashMap<>();
-                    map.put("sid",s);
+                    map.put("sid", s);
-                    map.put("manufacturerName",sysOrganizationVo.getName());
+                    map.put("manufacturerName", sysOrganizationVo.getName());
                     maps.add(map);
                 }
             }
@@ -805,16 +805,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         return rb.success().setData(baseManufacturerVos);
     }
 
-    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid,String supplierType) {
+    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid, String supplierType) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType);
+        List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid, supplierType);
         return rb.success().setData(baseManufacturerVos);
     }
 
     public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
         ResultBean<List<ManufacturerVo>> rb = ResultBean.fireFail();
         List<ManufacturerVo> voList = baseMapper.getDetailsList(orgSid);
-        if(voList.size() == 0){
+        if (voList.size() == 0) {
             voList = new ArrayList<>();
         }
         return rb.success().setData(voList);
@@ -831,4 +831,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.fetchByCode(supplierCode);
         return rb.success().setData(baseManufacturerDetailsVo);
     }
+
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseBankVo> baseBankVoList = baseMapper.getKhhByOrgSid(orgSid, supplierType);
+        return rb.success().setData(baseBankVoList);
+    }
 }

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -34,14 +34,6 @@ export function getListOrg(data) {
     params: data
   })
 }
-// 根据登陆人sid查询分公司sid（正确的）
-export function getPathSidByUserSid(data) {
-  return request({
-    url: '/portal/v1/sysstafforg/getPathSidByUserSid',
-    method: 'get',
-    params: data
-  })
-}
 
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
@@ -59,14 +51,7 @@ export function fetchBySid(sid) {
     method: 'get'
   })
 }
-// 获取厂商可搜索下拉列表
+
-export function changShang(data) {
-  return request({
-    url: '/base/v1/basemanufacturer/namesDown',
-    method: 'get',
-    params: data
-  })
-}
 // 根据当前登录用户的分公司Sid获取该分公司下的厂商
 export function selectByOrgSid(data) {
   return request({
@@ -75,14 +60,7 @@ export function selectByOrgSid(data) {
     params: data
   })
 }
-// 根据分公司sid获取该分公司下的所有供应商以及厂商
+
-export function getGysByOrgSid(data) {
-  return request({
-    url: '/base/v1/basemanufacturer/getGysByOrgSid',
-    method: 'post',
-    params: data
-  })
-}
 // 获取该分公司下的开户账号
 export function selectAccountByUseOrgSid(data) {
   return request({
@@ -242,3 +220,12 @@ export function getInvoicingList(data) {
   })
 }
 
+// 根据当前登录用户的分公司sid以及供应商分类获取供营商、开户行、银行账号(供应链下)
+export function getKhhByOrgSid(data) {
+  return request({
+    url: '/base/v1/basemanufacturer/getKhhByOrgSid',
+    method: 'post',
+    params: data
+  })
+}
+

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

@@ -155,16 +155,23 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column label="厂家回款通路" align="center" width="200">
+              <el-table-column v-if="formobj.costTypeKey == '001'" label="厂家回款通路" align="center" width="200">
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
                     <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
                   </el-select>
                 </template>
               </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '002' || formobj.costTypeKey == '003'" label="收款账号" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.receivingAccount" placeholder="请选择" filterable @change="changeReceivingAccount($event, scope.row)">
+                    <el-option v-for="item in receivingAccount_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
@@ -361,7 +368,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, getInvoicingList, brandDown, selectNameByOrg, getTypeValueList, getKhhByOrgSid } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 import trailerCar from './relation/trailerCar'
 import top from './relation/top'
@@ -400,6 +407,7 @@ export default {
       payCompany_list: [],
       payment_list: [],
       actualPay_list: [],
+      receivingAccount_list: [],
       formobj: {
         billNo: '', // 申请编号
         name: '', // 申请人姓名
@@ -537,6 +545,30 @@ export default {
               this.actualPay_list = res.data
             }
           })
+          if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+            getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+              if (res.success) {
+                this.costTitle_list = res.data
+              }
+            })
+          } else {
+            this.costTitle_list = []
+          }
+          if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+            let type = ''
+            if (this.formobj.costTypeKey === '002') {
+              type = '0002'
+            } else if (this.formobj.costTypeKey === '003') {
+              type = '0003'
+            }
+            getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+              if (resp.success) {
+                this.receivingAccount_list = resp.data
+              }
+            })
+          } else {
+            this.receivingAccount_list = []
+          }
         }
       }).catch((e) => {
         this.formobj = row
@@ -571,9 +603,11 @@ export default {
         if (this.formobj.costTypeKey !== '001') {
           this.formobj.isVeh = '0'
         }
+        this.formobj.detailsList = []
       } else {
         this.formobj.costTypeKey = ''
         this.formobj.isVeh = ''
+        this.formobj.detailsList = []
       }
       if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
         getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
@@ -584,7 +618,21 @@ export default {
       } else {
         this.costTitle_list = []
       }
-      this.formobj.detailsList = []
+      if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+        let type = ''
+        if (this.formobj.costTypeKey === '002') {
+          type = '0002'
+        } else if (this.formobj.costTypeKey === '003') {
+          type = '0003'
+        }
+        getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+          if (resp.success) {
+            this.receivingAccount_list = resp.data
+          }
+        })
+      } else {
+        this.receivingAccount_list = []
+      }
     },
     isVehChange(val) {
       if (val === '1') {
@@ -620,7 +668,6 @@ export default {
     backClosingPayment(value) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
-      console.log(value, 77)
       value.forEach((e) => {
         this.formobj.eveList.push({
           sid: '', // sid
@@ -701,6 +748,17 @@ export default {
         row.receivingAccount = ''
       }
     },
+    changeReceivingAccount(value, row) {
+      const choose = this.receivingAccount_list.filter((item) => item.bankAccount === value)
+      if (choose.length > 0 && choose !== null) {
+        row.receiveCompany = choose[0].manufacturerName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.bank = ''
+        row.receivingAccount = ''
+      }
+    },
     handleAddPayment(row, index) {
       if (row.paymentType === '') {
         this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
@@ -898,6 +956,19 @@ export default {
       }
     },
     saveOrUpdate() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
@@ -930,6 +1001,19 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })

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

@@ -87,10 +87,10 @@
               <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
               <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
               <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
               <el-table-column label="关联付款详情" align="center" width="120">

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

@@ -89,10 +89,10 @@
               <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
               <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
               <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
               <el-table-column label="关联付款详情" align="center" width="120">

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

@@ -154,16 +154,23 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column label="厂家回款通路" align="center" width="200">
+              <el-table-column v-if="formobj.costTypeKey == '001'" label="厂家回款通路" align="center" width="200">
                 <template slot-scope="scope">
                   <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
                     <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
                   </el-select>
                 </template>
               </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '002' || formobj.costTypeKey == '003'" label="收款账号" align="center" width="200">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.receivingAccount" placeholder="请选择" filterable @change="changeReceivingAccount($event, scope.row)">
+                    <el-option v-for="item in receivingAccount_list" :key="item.bankAccount" :label="item.bankAccount" :value="item.bankAccount"/>
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
@@ -360,7 +367,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, brandDown, selectNameByOrg, getInvoicingList, getTypeValueList } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, brandDown, selectNameByOrg, getInvoicingList, getTypeValueList, getKhhByOrgSid } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 import trailerCar from './relation/trailerCar'
 import top from './relation/top'
@@ -399,6 +406,7 @@ export default {
       payCompany_list: [],
       payment_list: [],
       actualPay_list: [],
+      receivingAccount_list: [],
       formobj: {
         billNo: '', // 申请编号
         name: '', // 申请人姓名
@@ -528,6 +536,30 @@ export default {
               this.carBrand_list = res.data
             }
           })
+          if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
+            getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
+              if (res.success) {
+                this.costTitle_list = res.data
+              }
+            })
+          } else {
+            this.costTitle_list = []
+          }
+          if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+            let type = ''
+            if (this.formobj.costTypeKey === '002') {
+              type = '0002'
+            } else if (this.formobj.costTypeKey === '003') {
+              type = '0003'
+            }
+            getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+              if (resp.success) {
+                this.receivingAccount_list = resp.data
+              }
+            })
+          } else {
+            this.receivingAccount_list = []
+          }
         }
       }).catch((e) => {
         this.formobj = {}
@@ -562,9 +594,11 @@ export default {
         if (this.formobj.costTypeKey !== '001') {
           this.formobj.isVeh = '0'
         }
+        this.formobj.detailsList = []
       } else {
         this.formobj.costTypeKey = ''
         this.formobj.isVeh = ''
+        this.formobj.detailsList = []
       }
       if (this.formobj.costTypeKey !== '' && this.formobj.costTypeKey !== '004') {
         getTypeValueList({ type: 'payCostType', groupNum: this.formobj.costTypeKey }).then((res) => {
@@ -575,7 +609,21 @@ export default {
       } else {
         this.costTitle_list = []
       }
-      this.formobj.detailsList = []
+      if (this.formobj.costTypeKey === '002' || this.formobj.costTypeKey === '003') {
+        let type = ''
+        if (this.formobj.costTypeKey === '002') {
+          type = '0002'
+        } else if (this.formobj.costTypeKey === '003') {
+          type = '0003'
+        }
+        getKhhByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: type }).then((resp) => {
+          if (resp.success) {
+            this.receivingAccount_list = resp.data
+          }
+        })
+      } else {
+        this.receivingAccount_list = []
+      }
     },
     isVehChange(val) {
       if (val === '1') {
@@ -611,7 +659,6 @@ export default {
     backClosingPayment(value) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
-      console.log(value, 77)
       value.forEach((e) => {
         this.formobj.eveList.push({
           sid: '', // sid
@@ -692,6 +739,17 @@ export default {
         row.receivingAccount = ''
       }
     },
+    changeReceivingAccount(value, row) {
+      const choose = this.receivingAccount_list.filter((item) => item.bankAccount === value)
+      if (choose.length > 0 && choose !== null) {
+        row.receiveCompany = choose[0].manufacturerName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.bank = ''
+        row.receivingAccount = ''
+      }
+    },
     handleAddPayment(row, index) {
       if (row.paymentType === '') {
         this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
@@ -889,6 +947,19 @@ export default {
       }
     },
     saveOrUpdate() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })
@@ -928,6 +999,19 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (this.formobj.costTypeKey !== '004' && this.formobj.costTypeKey !== '') {
+        if (this.formobj.detailsList.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '付款明细列表不能为空' })
+          return
+        } else {
+          for (var i = 0; i < this.formobj.detailsList.length; i++) {
+            if (this.formobj.detailsList[i].payAccount === '') {
+              this.$message({ showClose: true, type: 'error', message: '付款明细列表中付款金额不能为空' })
+              return
+            }
+          }
+        }
+      }
       if (this.formobj.costTypeKey === '001' && this.formobj.isVeh === '1') {
         if (this.formobj.vehicleList.length === 0) {
           this.$message({ showClose: true, type: 'error', message: '车辆列表不能为空' })

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

@@ -87,10 +87,10 @@
               <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
               <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
-              <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column v-if="formobj.costTypeKey == '001'" prop="actualPay" label="厂家回款通路" align="center" width="200" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
               <el-table-column prop="bank" label="开户行" align="center" width="140" />
-              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
               <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
               <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
               <el-table-column label="关联付款详情" align="center" width="120">