yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

金蝶分公司间编码合并、问题修改

zhanglei
God 2 years ago
parent
1f91778b5c
commit
2d5b787a40
14 changed files with 161 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java
  5. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java
  7. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java
  8. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java
  9. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java
  10. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  11. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeOrgAndDeptCode.java
  12. 32
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeUtils.java
  13. 94
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  14. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdempinfo/BDEmpinfoService.java

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java
View File

@ -60,5 +60,4 @@ public class BaseBrandletpricepowimit extends BaseEntity {
private String useOrgName; // 分公司名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java
View File

@ -64,6 +64,8 @@ public class BaseBrandletpricepowimitDto implements Dto {
private String useOrgName; // 分公司名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("事业部sid")
private String sybOrgSid; // 事业部sid
@ApiModelProperty("角色让价权限")
private List<BaseRoleletpricepowimitDto> baseRoleletpricepowimits;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
View File

@ -50,8 +50,6 @@ import lombok.Data;
public class BaseTrailerModel extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号名称")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java
View File

@ -51,8 +51,6 @@ public class BaseTrailerModelDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号名称")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java
View File

@ -51,8 +51,6 @@ public class BaseTrailerModelDto implements Dto {
private String sid; // sid
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java
View File

@ -49,8 +49,8 @@ import lombok.Data;
@ApiModel(value = "挂车车型表 查询条件", description = "挂车车型表 查询条件")
public class BaseTrailerModelQuery implements Query {
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelVo.java
View File

@ -51,8 +51,6 @@ public class BaseTrailerModelVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java
View File

@ -110,6 +110,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
if (StringUtils.isNotBlank(query.getUseOrgSid())) {
qw.eq("useOrgSid", query.getUseOrgSid());
}
qw.eq("createOrgSid", sybOrgSid);
IPage<BaseBrandletpricepowimit> page = PagerUtil.queryToPage(pq);
IPage<BaseBrandletpricepowimitVo> pagging = baseMapper.selectPageVo(page, qw);
for (BaseBrandletpricepowimitVo record : pagging.getRecords()) {
@ -122,7 +123,7 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
String letPrice = baseRoleletpricepowimitDetailsVo.getLetPrice();
roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、");
}
record.setRoleLetPrice(roleLetPrice.substring(0,roleLetPrice.lastIndexOf("、")));
record.setRoleLetPrice(roleLetPrice.substring(0, roleLetPrice.lastIndexOf("、")));
}
}
PagerVo<BaseBrandletpricepowimitVo> p = PagerUtil.pageToVo(pagging, null);
@ -184,8 +185,8 @@ public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBran
String brandSid = query.getBrandSid();
String orgSid = query.getOrgSid();
String roleSid = query.getRoleSid();
String money = baseMapper.getMoney(brandSid,orgSid,roleSid);
if(StringUtils.isBlank(money)){
String money = baseMapper.getMoney(brandSid, orgSid, roleSid);
if (StringUtils.isBlank(money)) {
return rb;
}
return rb.success().setData(money);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java
View File

@ -71,8 +71,8 @@ public class BaseTrailerModelService extends MybatisBaseService<BaseTrailerModel
BaseTrailerModelQuery query = pq.getParams();
QueryWrapper<BaseTrailerModel> qw = new QueryWrapper<>();
qw.eq("useOrgSid",query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getBrandSid())){
qw.eq("brandSid",query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())){
qw.eq("brandName",query.getBrandName());
}
if (StringUtils.isNotBlank(query.getCarModelName())){
qw.like("carModelName",query.getCarModelName());

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
View File

@ -188,5 +188,4 @@ public interface FinKingDeeFeign {
@PostMapping("/updateBDEmpinfo")
@ResponseBody
public ResultBean<String> updateBDEmpinfo(@RequestBody @Valid BDEmpinfo bdEmpinfo);
}

15
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeOrgAndDeptCode.java
View File

@ -0,0 +1,15 @@
package com.yxt.anrui.fin.api.kingdee.kingdeeUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class KingDeeOrgAndDeptCode {
@ApiModelProperty("分公司编码")
private String orgCode; // 分公司编码
@ApiModelProperty("其他编码")
private String otherCode; // 其他编码
@ApiModelProperty("部门编码")
private String deptCode; // 部门编码
}

32
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/kingdeeUtils/KingDeeUtils.java
View File

@ -0,0 +1,32 @@
package com.yxt.anrui.fin.api.kingdee.kingdeeUtils;
public class KingDeeUtils {
/**
* 陕汽绵阳富创-陕汽成都礼贤财务分公司编码、其他编码、部门编码合并
* @return
*/
public static KingDeeOrgAndDeptCode orgAndDeptCodeMerge(KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode) {
String orgCode = kingDeeOrgAndDeptCode.getOrgCode();
String otherCode = kingDeeOrgAndDeptCode.getOtherCode();
String deptCode = kingDeeOrgAndDeptCode.getDeptCode();
if ("119".equals(orgCode)){
kingDeeOrgAndDeptCode.setOrgCode("112");
}
if ("01.119".equals(otherCode)){
kingDeeOrgAndDeptCode.setOtherCode("01.112");
}
if ("134".equals(deptCode)){
kingDeeOrgAndDeptCode.setDeptCode("103");
}else if ("139".equals(deptCode)){
kingDeeOrgAndDeptCode.setDeptCode("99");
}else if ("137".equals(deptCode)){
kingDeeOrgAndDeptCode.setDeptCode("96");
}else if ("138".equals(deptCode)){
kingDeeOrgAndDeptCode.setDeptCode("106");
}else if ("136".equals(deptCode) || "135".equals(deptCode)){
kingDeeOrgAndDeptCode.setDeptCode("132");
}
return kingDeeOrgAndDeptCode;
}
}

94
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -15,6 +15,8 @@ import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock;
import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
import com.yxt.anrui.fin.api.kingdee.cnrecpaypurpose.CNRecpaypurpose;
import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeOrgAndDeptCode;
import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeUtils;
import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
@ -177,6 +179,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftArReceivebill(@RequestBody @Valid ARReceivebill arReceivebill) {
log.info("FinKingDeeFeignRest-draftArReceivebill:{}", JSONObject.toJSONString(arReceivebill));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(arReceivebill.getFPAYORGID());
kingDeeOrgAndDeptCode.setDeptCode(arReceivebill.getFSALEDEPTID());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
arReceivebill.setFPAYORGID(kingDeeOrgAndDeptCode.getOrgCode());
arReceivebill.setFSALEDEPTID(kingDeeOrgAndDeptCode.getDeptCode());
return arReceivebillService.draftArReceivebill(arReceivebill);
}
@ -186,6 +194,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) {
log.info("FinKingDeeFeignRest-draftApPayBill:{}", JSONObject.toJSONString(apPayBill));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(apPayBill.getFPURCHASEORGID());
kingDeeOrgAndDeptCode.setDeptCode(apPayBill.getFPURCHASEDEPTID());
kingDeeOrgAndDeptCode.setOtherCode(apPayBill.getFRECTUNIT());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
apPayBill.setFPURCHASEORGID(kingDeeOrgAndDeptCode.getOrgCode());
apPayBill.setFPURCHASEDEPTID(kingDeeOrgAndDeptCode.getDeptCode());
apPayBill.setFRECTUNIT(kingDeeOrgAndDeptCode.getOtherCode());
return apPayBillService.draftApPayBill(apPayBill);
}
@ -195,6 +211,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception {
log.info("FinKingDeeFeignRest-draftStkInStock:{}", JSONObject.toJSONString(stkInStock));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(stkInStock.getFPurchaseOrgId());
kingDeeOrgAndDeptCode.setDeptCode(stkInStock.getFPurchaseDeptId());
kingDeeOrgAndDeptCode.setOtherCode(stkInStock.getFSupplierId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
stkInStock.setFPurchaseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
stkInStock.setFPurchaseDeptId(kingDeeOrgAndDeptCode.getDeptCode());
stkInStock.setFSupplierId(kingDeeOrgAndDeptCode.getOtherCode());
return stkInStockService.draftStkInStock(stkInStock);
}
@ApiOperation("根据物料查询入库单的状态 的审核状态 true 审核通过 false 未审核通过")
@ -212,6 +236,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftPurMrb(@RequestBody @Valid PurMrb purMrb) {
log.info("FinKingDeeFeignRest-draftPurMrb:{}", JSONObject.toJSONString(purMrb));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(purMrb.getFStockOrgId());
kingDeeOrgAndDeptCode.setOtherCode(purMrb.getFSupplierID());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
purMrb.setFStockOrgId(kingDeeOrgAndDeptCode.getOrgCode());
purMrb.setFSupplierID(kingDeeOrgAndDeptCode.getOtherCode());
return purMrbService.draftPurMrb(purMrb);
}
@ApiOperation("暂存采购出库单的接口")
@ -220,6 +250,15 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) {
log.info("FinKingDeeFeignRest-draftSalOutStock:{}", JSONObject.toJSONString(salOutStock));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(salOutStock.getFSaleOrgId());
kingDeeOrgAndDeptCode.setDeptCode(salOutStock.getFSaleDeptID());
kingDeeOrgAndDeptCode.setOtherCode(salOutStock.getFCustomerID());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
salOutStock.setFSaleOrgId(kingDeeOrgAndDeptCode.getOrgCode());
salOutStock.setFSaleDeptID(kingDeeOrgAndDeptCode.getDeptCode());
salOutStock.setFCustomerID(kingDeeOrgAndDeptCode.getOtherCode());
salOutStock.setF_PAEZ_Base(kingDeeOrgAndDeptCode.getOrgCode());
return salOutStockService.draftSalOutStock(salOutStock);
}
@ApiOperation("批量暂存物料的接口")
@ -228,6 +267,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftBdMaterialList(@RequestBody @Valid List<BdMaterial> bdMaterial) {
log.info("FinKingDeeFeignRest-draftBdMaterialList:{}", JSONObject.toJSONString(bdMaterial));
for (BdMaterial material : bdMaterial) {
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(material.getTOrgIds());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
material.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
}
return bdMaterialService.draftBdMaterialList(bdMaterial);
}
@ApiOperation("批量修改物料的接口")
@ -236,6 +281,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> saveBdMaterialList(@RequestBody @Valid List<BdMaterial> bdMaterial) {
log.info("FinKingDeeFeignRest-saveBdMaterialList:{}", JSONObject.toJSONString(bdMaterial));
for (BdMaterial material : bdMaterial) {
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(material.getTOrgIds());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
material.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
}
return bdMaterialService.saveBdMaterialList(bdMaterial);
}
@ApiOperation("暂存直接调拨单的接口")
@ -268,6 +319,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier) {
log.info("FinKingDeeFeignRest-draftBdSupplier:{}", JSONObject.toJSONString(bdSupplier));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdSupplier.getFUseOrgId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdSupplier.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
return bdSupplierService.draftBdSupplier(bdSupplier);
}
@ApiOperation("修改供应商的接口")
@ -276,6 +331,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> updateBdSupplier(@RequestBody @Valid BdSupplier bdSupplier) {
log.info("FinKingDeeFeignRest-updateBdSupplier:{}", JSONObject.toJSONString(bdSupplier));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdSupplier.getFUseOrgId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdSupplier.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
return bdSupplierService.updateBdSupplier(bdSupplier);
}
@ApiOperation("暂存客户信息的接口")
@ -284,6 +343,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer) {
log.info("FinKingDeeFeignRest-draftEntryBill:{}", JSONObject.toJSONString(bdCustomer));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdCustomer.getTOrgIds());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
return bdCustomerService.draftBdCustomer(bdCustomer);
}
@ApiOperation("暂存客户信息的接口 批量")
@ -292,6 +355,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> draftBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers) {
log.info("FinKingDeeFeignRest-draftBdCustomers:{}", JSONObject.toJSONString(bdCustomers));
for (BdCustomer bdCustomer : bdCustomers) {
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdCustomer.getTOrgIds());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
}
return bdCustomerService.draftBdCustomers(bdCustomers);
}
@ApiOperation("修改客户信息的接口")
@ -300,6 +369,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> saveBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers) {
log.info("FinKingDeeFeignRest-saveBdCustomers:{}", JSONObject.toJSONString(bdCustomers));
for (BdCustomer bdCustomer : bdCustomers) {
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdCustomer.getTOrgIds());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
}
return bdCustomerService.updateCustomers(bdCustomers);
}
@ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在")
@ -387,7 +462,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> drafCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) {
log.info("FinKingDeeFeignRest-drafCNBankacnt:{}", JSONObject.toJSONString(cNBankacnt));
return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(cNBankacnt.getFCreateOrgId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
cNBankacnt.setFCreateOrgId(kingDeeOrgAndDeptCode.getOrgCode());
return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
}
@ApiOperation("修改银行账号的接口")
@ -396,6 +475,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> updateCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) {
log.info("FinKingDeeFeignRest-updateCNBankacnt:{}", JSONObject.toJSONString(cNBankacnt));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(cNBankacnt.getFCreateOrgId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
cNBankacnt.setFCreateOrgId(kingDeeOrgAndDeptCode.getOrgCode());
return cnBankcntService.updateCNBankacnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
}
@ -413,6 +496,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> saveBdDepartment(BdDepartment bdDepartment) {
log.info("FinKingDeeFeignRest-saveBdDepartment:{}", JSONObject.toJSONString(bdDepartment));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdDepartment.getFUseOrgId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdDepartment.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
return bdDepartmentService.saveBdDepartment(bdDepartment);
}
@ApiOperation("修改部门的接口")
@ -421,6 +508,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
@Override
public ResultBean<String> updateBdDepartment(BdDepartment bdDepartment) {
log.info("FinKingDeeFeignRest-updateBdDepartment:{}", JSONObject.toJSONString(bdDepartment));
KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
kingDeeOrgAndDeptCode.setOrgCode(bdDepartment.getFUseOrgId());
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
bdDepartment.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
return bdDepartmentService.updateBdDepartment(bdDepartment);
}
@ApiOperation("保存员工的接口")
@ -439,5 +530,4 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
log.info("FinKingDeeFeignRest-updateBDEmpinfo:{}", JSONObject.toJSONString(bdEmpinfo));
return bDEmpinfoService.updateBDEmpinfo(bdEmpinfo);
}
}

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdempinfo/BDEmpinfoService.java
View File

@ -3,7 +3,8 @@ package com.yxt.anrui.fin.biz.kingdee.bdempinfo;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeOrgAndDeptCode;
import com.yxt.anrui.fin.api.kingdee.kingdeeUtils.KingDeeUtils;
import com.yxt.anrui.fin.api.kingdee.bdempinfo.BDEmpinfo;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig;
@ -140,5 +141,15 @@ public class BDEmpinfoService extends FinKingDeeService {
return rb.setMsg("员工提交审核失败");
}
}
/**
* 陕汽绵阳富创-陕汽成都礼贤财务分公司编码、其他编码、部门编码合并
* @return
*/
public ResultBean<KingDeeOrgAndDeptCode> orgAndDeptCodeMerge(KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode) {
ResultBean<KingDeeOrgAndDeptCode> rb=ResultBean.fireFail();
kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
return rb.success().setData(kingDeeOrgAndDeptCode);
}
}

Write Preview
Loading…
Cancel
Save