Browse Source

修改

master
ligaode 2 weeks ago
parent
commit
97762e2771
  1. 16
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseBankVo.java
  2. 32
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  3. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  4. 14
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java
  5. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  6. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  7. 28
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  8. 78
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

16
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;
}

32
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.List;
import java.util.Map; 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 = "供应厂商信息") @Api(tags = "供应厂商信息")
@FeignClient( @FeignClient(
contextId = "anrui-base-BaseManufacturer", contextId = "anrui-base-BaseManufacturer",
@ -75,7 +62,12 @@ public interface BaseManufacturerFeign {
@ApiOperation("获取分公司和分类获取供应商") @ApiOperation("获取分公司和分类获取供应商")
@PostMapping("/getGysTypeByOrgSid") @PostMapping("/getGysTypeByOrgSid")
@ResponseBody @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("车辆台账新增查询供应商") @ApiOperation("车辆台账新增查询供应商")
@GetMapping("/selectSupplier") @GetMapping("/selectSupplier")
@ResponseBody @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") @ApiOperation("根据分公司sid和厂商sid查询供应商sid")
@GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}") @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}")
@ResponseBody @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查询品牌、厂商等信息") @ApiOperation("根据车型sid查询品牌、厂商等信息")
@GetMapping("/getManDetails/{modelSid}") @GetMapping("/getManDetails/{modelSid}")
@ResponseBody @ResponseBody
ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid")String modelSid); ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid") String modelSid);
@ApiOperation("根据车型sid查询品牌、厂商等信息") @ApiOperation("根据车型sid查询品牌、厂商等信息")
@GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}") @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}")
@ResponseBody @ResponseBody
ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName); ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid") String buyerOrgSid, @PathVariable("sellerOrgName") String sellerOrgName);
@ApiOperation("查询分公司下的供应商信息和主机厂信息") @ApiOperation("查询分公司下的供应商信息和主机厂信息")
@GetMapping("/getDetailsList") @GetMapping("/getDetailsList")
@ResponseBody @ResponseBody
ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid")String orgSid); ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid") String orgSid);
@ApiOperation("查询供应商下的开户行信息") @ApiOperation("查询供应商下的开户行信息")
@GetMapping("/getBankList") @GetMapping("/getBankList")
@ResponseBody @ResponseBody
ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid")String sid); ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid") String sid);
@ApiOperation("根据供应商code查询供应商信息") @ApiOperation("根据供应商code查询供应商信息")
@GetMapping("/fetchByCode") @GetMapping("/fetchByCode")

18
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.List;
import java.util.Map; 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 @Component
public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
@ -45,6 +32,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
return null; return null;
} }
@Override
public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
return null;
}
@Override @Override
public ResultBean copyManBankToGys(String orgSid) { public ResultBean copyManBankToGys(String orgSid) {
return null; return null;

14
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; package com.yxt.anrui.base.api.basemanufacturer;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; 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 = "供应厂商信息 视图数据对象") @ApiModel(value = "供应厂商信息 视图数据对象", description = "供应厂商信息 视图数据对象")
@Data @Data
public class BaseManufacturerVo implements Vo { public class BaseManufacturerVo implements Vo {

2
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}") @Select("SELECT * FROM base_manufacturer WHERE manufacturerCode = #{supplierCode}")
BaseManufacturerDetailsVo fetchByCode(String supplierCode); BaseManufacturerDetailsVo fetchByCode(String supplierCode);
List<BaseBankVo> getKhhByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
} }

11
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 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},'%') where bm.supplierType = '0001' and bm.isDelete = 0 and bb.useOrg like concat('%',#{orgSid},'%')
</select> </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> </mapper>

28
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.List;
import java.util.Map; 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 = "供应厂商信息") @Api(tags = "供应厂商信息")
@Controller @Controller
@RequestMapping("v1/basemanufacturer") @RequestMapping("v1/basemanufacturer")
@ -92,8 +79,13 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
} }
@Override @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 @Override
@ -136,8 +128,8 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
} }
@Override @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 @Override
@ -235,7 +227,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
@Override @Override
public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) { public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName); return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName);
} }
@Override @Override

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