diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseBankVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseBankVo.java new file mode 100644 index 0000000000..7f39da1952 --- /dev/null +++ b/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; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index a0f9177bbe..a00d05d438 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/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(安瑞基础信息模块)
- * File: BaseManufacturerFeign.java
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign
- * Description: 供应厂商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @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> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid,@RequestParam("supplierType") String supplierType); + public ResultBean> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType); + + @ApiOperation("根据分公司和分类获取开户行信息") + @PostMapping("/getKhhByOrgSid") + @ResponseBody + public ResultBean> getKhhByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType); /** * 生成厂商开户行信息到供应商 @@ -142,7 +134,7 @@ public interface BaseManufacturerFeign { @ApiOperation("车辆台账新增查询供应商") @GetMapping("/selectSupplier") @ResponseBody - public ResultBean>> selectSupplier(@RequestParam("manPurOrderTypeKey") String manPurOrderTypeKey,@RequestParam(value = "carBrandSid",required = false) String carBrandSid,@RequestParam("orgSid") String orgSid); + public ResultBean>> 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 selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid); + ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid, @PathVariable("manufacturerSid") String manufacturerSid); @ApiOperation("根据车型sid查询品牌、厂商等信息") @GetMapping("/getManDetails/{modelSid}") @ResponseBody - ResultBean getManDetails(@PathVariable("modelSid")String modelSid); + ResultBean getManDetails(@PathVariable("modelSid") String modelSid); @ApiOperation("根据车型sid查询品牌、厂商等信息") @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}") @ResponseBody - ResultBean selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName); + ResultBean selectByInternalPurchaseSid(@PathVariable("buyerOrgSid") String buyerOrgSid, @PathVariable("sellerOrgName") String sellerOrgName); @ApiOperation("查询分公司下的供应商信息和主机厂信息") @GetMapping("/getDetailsList") @ResponseBody - ResultBean> getDetailsList(@RequestParam("orgSid")String orgSid); + ResultBean> getDetailsList(@RequestParam("orgSid") String orgSid); @ApiOperation("查询供应商下的开户行信息") @GetMapping("/getBankList") @ResponseBody - ResultBean> getBankList(@RequestParam("sid")String sid); + ResultBean> getBankList(@RequestParam("sid") String sid); @ApiOperation("根据供应商code查询供应商信息") @GetMapping("/fetchByCode") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index e6047f37e0..d420556b91 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/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(安瑞基础信息模块)
- * File: BaseManufacturerFeignFallback.java
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeignFallback
- * Description: 供应厂商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @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> getKhhByOrgSid(String orgSid, String supplierType) { + return null; + } + @Override public ResultBean copyManBankToGys(String orgSid) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java index 9b235db69a..143d235ef2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java +++ b/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(安瑞基础信息模块)
- * File: BaseManufacturerVo.java
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerVo
- * Description: 供应厂商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "供应厂商信息 视图数据对象", description = "供应厂商信息 视图数据对象") @Data public class BaseManufacturerVo implements Vo { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index e2c2b1c22c..586754c821 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/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 { @Select("SELECT * FROM base_manufacturer WHERE manufacturerCode = #{supplierCode}") BaseManufacturerDetailsVo fetchByCode(String supplierCode); + + List getKhhByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index 2f41b67001..18c3565b5a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/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},'%') + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index a7656e169d..e85c6a5f9c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/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(安瑞基础信息模块)
- * File: BaseManufacturerFeignFallback.java
- * Class: com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerRest
- * Description: 供应厂商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @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> getGysTypeByOrgSid(String orgSid,String supplierType) { - return baseManufacturerService.getGysTypeByOrgSid(orgSid,supplierType); + public ResultBean> getGysTypeByOrgSid(String orgSid, String supplierType) { + return baseManufacturerService.getGysTypeByOrgSid(orgSid, supplierType); + } + + @Override + public ResultBean> getKhhByOrgSid(String orgSid, String supplierType) { + return baseManufacturerService.getKhhByOrgSid(orgSid, supplierType); } @Override @@ -136,8 +128,8 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { } @Override - public ResultBean>> selectSupplier(String manPurOrderTypeKey, String carBrandSid,String orgSid) { - return baseManufacturerService.selectSupplier(manPurOrderTypeKey,carBrandSid,orgSid); + public ResultBean>> selectSupplier(String manPurOrderTypeKey, String carBrandSid, String orgSid) { + return baseManufacturerService.selectSupplier(manPurOrderTypeKey, carBrandSid, orgSid); } @Override @@ -235,7 +227,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { @Override public ResultBean selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) { - return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName); + return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 9081b50065..7db8315787 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/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> orgList = sysOrganizationFeign.selectOrgSidList(); List list = orgList.getData(); for (SysOrganizationVo sysOrganizationVo : list) { List 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 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 0) { return rb.setMsg("该厂商名称已存在"); } @@ -489,9 +489,9 @@ public class BaseManufacturerService extends MybatisBaseService baseManufacturerBankDto = dto.getBaseManufacturerBankDto(); - List stringList = baseManufacturerBankDto.stream().map(v->v.getSid()).collect(Collectors.toList()); + List stringList = baseManufacturerBankDto.stream().map(v -> v.getSid()).collect(Collectors.toList()); List 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 stringList1 = baseManufacturerBankList.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))){ - baseManufacturerBankService.updateBySidIsDeletes(stringList1.get(j)); - } - } - } + if (!baseManufacturerBankList.isEmpty()) { + List stringList1 = baseManufacturerBankList.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))) { + 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> orgList = sysOrganizationFeign.selectOrgSidList(); List list = orgList.getData(); for (SysOrganizationVo sysOrganizationVo : list) { List 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 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 map = new HashMap<>(); - map.put("sid",s); - map.put("manufacturerName",sysOrganizationVo.getName()); + map.put("sid", s); + map.put("manufacturerName", sysOrganizationVo.getName()); maps.add(map); } } @@ -805,16 +805,16 @@ public class BaseManufacturerService extends MybatisBaseService> getGysTypeByOrgSid(String orgSid,String supplierType) { + public ResultBean> getGysTypeByOrgSid(String orgSid, String supplierType) { ResultBean rb = ResultBean.fireFail(); - List baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType); + List baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid, supplierType); return rb.success().setData(baseManufacturerVos); } public ResultBean> getDetailsList(String orgSid) { ResultBean> rb = ResultBean.fireFail(); List 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> getKhhByOrgSid(String orgSid, String supplierType) { + ResultBean rb = ResultBean.fireFail(); + List baseBankVoList = baseMapper.getKhhByOrgSid(orgSid, supplierType); + return rb.success().setData(baseBankVoList); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js index be4e1f3184..591a84f4f2 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js +++ b/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 + }) +} + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue index a47ccea063..a1ee69f629 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -155,16 +155,23 @@ - + + + + + -