From b9689355f1e4c597245ebc619dd6b93332d4d1d7 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Mon, 31 Oct 2022 14:27:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=87=91=E8=9D=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=88=E5=8F=8D=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=81=E6=8F=90=E4=BA=A4=E3=80=81=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=81=E5=88=86=E9=85=8D=EF=BC=89=E3=80=82=201=E3=80=81?= =?UTF-8?q?=E4=BB=93=E5=BA=93=202=E3=80=81=E9=93=B6=E8=A1=8C=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=203=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/kingdee/FinKingDeeFeign.java | 9 +- .../api/kingdee/FinKingDeeFeignFallBack.java | 10 ++ .../anrui/fin/api/kingdee/bank/BDBank.java | 4 +- .../api/kingdee/bdcustomer/BdCustomer.java | 6 +- .../fin/api/kingdee/bdstock/BDStock.java | 22 +-- .../fin/api/kingdee/cnbankcnt/CNBankacnt.java | 4 +- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 15 ++ .../bank/BDBankCastToKingDeeBillFields.java | 1 + .../fin/biz/kingdee/bank/BDBankService.java | 10 +- .../anrui/fin/biz/kingdee/bank/data_data.json | 2 +- .../fin/biz/kingdee/bank/data_model.json | 4 +- .../biz/kingdee/bdstock/BDStockService.java | 127 ++++++++++++++--- .../BDStocklCastToKingDeeBillFields.java | 1 + .../fin/biz/kingdee/bdstock/data_data.json | 2 +- .../fin/biz/kingdee/bdstock/data_model.json | 5 +- .../CNBankcntCastToKingDeeBillFields.java | 1 + .../kingdee/cnbankcnt/CNBankcntService.java | 131 ++++++++++++++---- .../fin/biz/kingdee/cnbankcnt/data_data.json | 2 +- .../fin/biz/kingdee/cnbankcnt/data_model.json | 4 +- .../biz/kingdee/saloutstock/data_FEntity.json | 2 +- 20 files changed, 288 insertions(+), 74 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index 42b6a5bc9c..8f9c7f1ee2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -134,6 +134,10 @@ public interface FinKingDeeFeign { @PostMapping("/drafBDStock") @ResponseBody public ResultBean drafBDtStock(@RequestBody @Valid BDStock bDtStock) throws Exception; + @ApiOperation("修改仓库信息的接口") + @PostMapping("/updateBDtStock") + @ResponseBody + public ResultBean updateBDtStock(@RequestBody @Valid BDStock bDtStock); @ApiOperation("暂存银行的接口") @PostMapping("/drafBDBank") @ResponseBody @@ -146,11 +150,14 @@ public interface FinKingDeeFeign { @PostMapping("/drafCNBankacnt") @ResponseBody public ResultBean drafCNBankacnt(@RequestBody @Valid CNBankacnt cnBankacnt); + @ApiOperation("修改银行账号的接口") + @PostMapping("/updateCNBankacnt") + @ResponseBody + public ResultBean updateCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) ; @ApiOperation("暂存收付款的接口") @PostMapping("/draftCNRecpaypurpose") @ResponseBody public ResultBean draftCNRecpaypurpose(@RequestBody @Valid CNRecpaypurpose cNRecpaypurpose); - @ApiOperation("保存部门的接口") @PostMapping("/saveBdDepartment") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java index 7dda670eb1..0252493bf8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java @@ -133,6 +133,11 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean updateBDtStock(BDStock bDtStock) { + return null; + } + @Override public ResultBean drafBDBank(BDBank bdBank) { return null; @@ -153,6 +158,11 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean updateCNBankacnt(CNBankacnt cNBankacnt) { + return null; + } + @Override public ResultBean saveBdDepartment(BdDepartment bdDepartment) { return null; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java index 7093e29694..421b661758 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bank/BDBank.java @@ -19,9 +19,9 @@ public class BDBank { @JsonProperty("FName") public String FName; /* 使用组织:FUseOrgId (必填项)*/ - @NotBlank(message = "FUseOrgId不能为空") + /*@NotBlank(message = "FUseOrgId不能为空") @JsonProperty("FUseOrgId") - public String FUseOrgId; + public String FUseOrgId;*/ /* :FNumber (必填项)*/ @NotBlank(message = "FNumber不能为空") @JsonProperty("FNumber") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java index 0eb99b20f0..8e671514a8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdcustomer/BdCustomer.java @@ -44,11 +44,11 @@ public class BdCustomer { /* 创建组织:FCreateOrgId (必填项)*/ // bdCustomer.setFCreateOrgId("100"); /*客户名称:FName (必填项)*/ - bdCustomer.setFName("士大夫123"); + // bdCustomer.setFName("士大夫123"); /*客户编码:FNumber (必填项)*/ - bdCustomer.setFNumber("33221133"); + // bdCustomer.setFNumber("33221133"); /*目标组织:TOrgId*/ - bdCustomer.setTOrgIds("102"); + // bdCustomer.setTOrgIds("102"); } public static BdCustomer createBdCustomer() { return bdCustomer; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java index 99d20f04ba..da6b6c273a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bdstock/BDStock.java @@ -17,28 +17,28 @@ public class BDStock implements Serializable { */ @JsonProperty("FCreateOrgId") @NotBlank(message = "FCreateOrgId不能为空") - private String FCreateOrgId; - /** - * 使用组织:FUseOrgId (必填项) - */ - @JsonProperty("FUseOrgId") - @NotBlank(message = "FUseOrgId不能为空") - private String FUseOrgId; + public String FCreateOrgId; /** * 名称:FName (必填项) */ @JsonProperty("FName") @NotBlank(message = "FName不能为空") - private String FName; + public String FName; + /** + * 名称:FNumber (必填项) + */ + @JsonProperty("FNumber") + @NotBlank(message = "FNumber不能为空") + public String FNumber; /** * 备注 */ - @JsonProperty("FStockProperty") - private String FStockProperty=""; + @JsonProperty("FDescription") + public String FDescription=""; /** * 分配的分公司的id:TOrgIds (必填项) */ /* @JsonProperty("TOrgIds") @NotBlank - private String TOrgIds;*/ + public String TOrgIds;*/ } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java index 98730e05a2..815ecc1e99 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/cnbankcnt/CNBankacnt.java @@ -27,9 +27,9 @@ public class CNBankacnt { @JsonProperty("FName") public String FName; /*使用组织:FUseOrgId (必填项)*/ - @NotBlank(message = "FUseOrgId不能为空") + /*@NotBlank(message = "FUseOrgId不能为空") @JsonProperty("FUseOrgId") - public String FUseOrgId; + public String FUseOrgId;*/ /*创建组织:FCreateOrgId (必填项)*/ @NotBlank(message = "FCreateOrgId不能为空") @JsonProperty("FCreateOrgId") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 8ca25d9f05..57f6a299b9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -307,6 +307,13 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { public ResultBean drafBDtStock(@RequestBody @Valid BDStock bDtStock) throws Exception { return bDStockService.draftBDStock(bDtStock);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } + @ApiOperation("修改仓库信息的接口") + @PostMapping("/updateBDtStock") + @ResponseBody + @Override + public ResultBean updateBDtStock(@RequestBody @Valid BDStock bDtStock) { + return bDStockService.updateBDtStock(bDtStock);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); + } @ApiOperation("暂存银行的接口") @PostMapping("/drafBDBank") @ResponseBody @@ -331,6 +338,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { return cnBankcntService.draftCNBankcnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); } + @ApiOperation("修改银行账号的接口") + @PostMapping("/updateCNBankacnt") + @ResponseBody + @Override + public ResultBean updateCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) { + return cnBankcntService.updateCNBankacnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("",""); + } + @ApiOperation("暂存收付款用途的接口") @PostMapping("/draftCNRecpaypurpose") @ResponseBody diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java index 672a763b99..4f4ca43b0e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankCastToKingDeeBillFields.java @@ -33,6 +33,7 @@ public class BDBankCastToKingDeeBillFields { //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); + fEntityData_ = KingDeeUtils.replaceTemplateParams(fEntityData_, map_fEntityModel_); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java index 0155d43745..db943d7b4d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/BDBankService.java @@ -1,5 +1,6 @@ package com.yxt.anrui.fin.biz.kingdee.bank; +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.KingDeeResult; @@ -21,6 +22,7 @@ public class BDBankService extends FinKingDeeService { * @return */ public ResultBean> draftBDBankList(List bDBanks) { + log.info("draftBDBankList:{}", JSONObject.toJSONString(bDBanks)); List list=new ArrayList<>(); ResultBean rb=ResultBean.fireFail(); for(BDBank b:bDBanks) { @@ -37,6 +39,7 @@ public class BDBankService extends FinKingDeeService { * @return */ public ResultBean draftBDBank(BDBank bDBank) { + log.info("draftBDBank:{}", JSONObject.toJSONString(bDBank)); //bdCustomer=BdCustomer.createBdCustomer(); ResultBean rb=ResultBean.fireFail(); try { @@ -73,13 +76,14 @@ public class BDBankService extends FinKingDeeService { } public ResultBean updateBDBank(BDBank bdBank) { + log.info("updateBDBank:{}", JSONObject.toJSONString(bdBank)); //bdSupplier=BdSupplier.createBdSupplier(); ResultBean rb=ResultBean.fireFail(); try { Map map_fEntityModel_= object2Map(bdBank); map_fEntityModel_.put("FBANKID","0"); map_fEntityModel_.put("IsDeleteEntry", "True"); - String kingDeeData = BdSupplierCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + String kingDeeData = BDBankCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); ResultBean stringResultBean = viewGetId(KingDeeBillId.BD_BANK.getID(), bdBank.getFNumber()); String id = stringResultBean.getData(); if(!stringResultBean.getSuccess()&&"0".equals(id)){ @@ -91,7 +95,7 @@ public class BDBankService extends FinKingDeeService { map_fEntityModel_.put("FBANKID",id); map_fEntityModel_.put("IsDeleteEntry", "False"); map_fEntityModel_.put("fields","FName,FNumber"); - kingDeeData = BdSupplierCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + kingDeeData = BDBankCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); rb= accessKingDeeInterface(KingDeeBillId.BD_BANK.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); //提交审核 ResultBean resultBean2 = submitAndAudit(id); @@ -107,6 +111,7 @@ public class BDBankService extends FinKingDeeService { * @return */ private ResultBean addBDBank(String kingDeeData,String FNumber){ + log.info("addBDBank:{}", JSONObject.toJSONString(kingDeeData)); ResultBean rb=ResultBean.fireFail(); try{ rb= accessKingDeeInterface(KingDeeBillId.BD_BANK.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); @@ -123,6 +128,7 @@ public class BDBankService extends FinKingDeeService { * @return */ private ResultBean submitAndAudit( String id){ + log.info("submitAndAudit:{}", id); ResultBean rb=ResultBean.fireFail(); try{ String submitKDTempJson = getSubmitKDTempJson(KingDeeBillId.BD_BANK.getID(),id ); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json index f8b9dc071d..7318e63684 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_data.json @@ -2,7 +2,7 @@ "Creator": "", "NeedUpDateFields": [], "NeedReturnFields": [], - "IsDeleteEntry": "True", + "IsDeleteEntry": "@KD_IsDeleteEntry", "SubSystemId": "", "IsVerifyBaseDataField": "false", "IsEntryBatchFill": "True", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json index da6b03d2ed..ce64ba7859 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bank/data_model.json @@ -1,11 +1,11 @@ { - "FBANKID": 0, + "FBANKID": @KD_FBANKID, "FName": "@KD_FName", "FNumber": "@KD_FNumber", "FCreateOrgId": { "FNumber": "@KD_FCreateOrgId" }, "FUseOrgId": { - "FNumber": "@KD_FUseOrgId" + "FNumber": "@KD_FCreateOrgId" } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStockService.java index 53551bff68..98bfea3bd8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStockService.java @@ -1,8 +1,11 @@ package com.yxt.anrui.fin.biz.kingdee.bdstock; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; +import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.bdstock.BDStock; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.common.base.config.RedisUtil; @@ -15,6 +18,7 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Map; import java.util.concurrent.TimeUnit; /** @@ -31,26 +35,12 @@ public class BDStockService extends FinKingDeeService { * @return */ public ResultBean draftBDStock(BDStock bDStock) { - String jsonUser = null;//这样就变成了一个json对象了 - try { - jsonUser = new ObjectMapper().writeValueAsString(bDStock); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - stringRedisTemplate.opsForValue().set("stock-in",jsonUser,5L, TimeUnit.SECONDS); - stringRedisTemplate.opsForValue().set("stock-in1",jsonUser); - String s = stringRedisTemplate.opsForValue().get("stock-in"); - String s1 = stringRedisTemplate.opsForValue().get("stock-in1"); - // boolean set = redisUtil.set("stock-in", jsonUser, 10L); - log.info("set:{}",s); - log.info("set1:{}",s1); - return null; - } - /* public ResultBean draftBDStock(BDStock bDStock) { // bDStock=BDStock.createBdMaterial(); ResultBean rb=ResultBean.fireFail(); //仓库信息转map参数 Map stringObjectMap = BeanUtil.beanToMap(bDStock); + stringObjectMap.put("FStockId","0"); + stringObjectMap.put("IsDeleteEntry", "True"); //业务表的主表数据集合 Map map_fEntityModel_=createMapParams(stringObjectMap); String kingDeeData = BDStocklCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); @@ -73,9 +63,9 @@ public class BDStockService extends FinKingDeeService { log.info("仓库保存成功!"); String data = resultBean.getData(); - String submitKD = getSubmitKD(data,KingDeeBillId.BD_STOCK.getID()); + String submitKD = getSubmitKD(data, KingDeeBillId.BD_STOCK.getID()); ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), - submitKD,KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_STOCK.getID(), submitKD); + submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());//submitKingDeeBillData(KingDeeBillId.BD_STOCK.getID(), submitKD); if(!resultBean1.getSuccess()){ log.info("仓库提交失败!"); return rb.setMsg("仓库提交失败!"); @@ -95,6 +85,105 @@ public class BDStockService extends FinKingDeeService { e.printStackTrace(); } return rb; - }*/ + } + /* public ResultBean draftBDStock(BDStock bDStock) { + String jsonUser = null;//这样就变成了一个json对象了 + try { + jsonUser = new ObjectMapper().writeValueAsString(bDStock); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + stringRedisTemplate.opsForValue().set("stock-in",jsonUser,5L, TimeUnit.SECONDS); + stringRedisTemplate.opsForValue().set("stock-in1",jsonUser); + String s = stringRedisTemplate.opsForValue().get("stock-in"); + String s1 = stringRedisTemplate.opsForValue().get("stock-in1"); + // boolean set = redisUtil.set("stock-in", jsonUser, 10L); + log.info("set:{}",s); + log.info("set1:{}",s1); + return null; + } +*/ + + /** + * 修改仓库信息 + * @param bDStock + * @return + */ + public ResultBean updateBDtStock(BDStock bDStock) { + //bdSupplier=BdSupplier.createBdSupplier(); + ResultBean rb=ResultBean.fireFail(); + try { + Map map_fEntityModel_= object2Map(bDStock); + map_fEntityModel_.put("FStockId","0"); + map_fEntityModel_.put("IsDeleteEntry", "True"); + String kingDeeData = BDStocklCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + ResultBean stringResultBean = viewGetId(KingDeeBillId.BD_STOCK.getID(), bDStock.getFNumber()); + String id = stringResultBean.getData(); + if(!stringResultBean.getSuccess()&&"0".equals(id)){ + return addBDtStock(kingDeeData,bDStock.getFNumber()); + } + //反审核 + boolean c = isAudit(KingDeeBillId.BD_STOCK.getID(), "C", id); + //修改 + map_fEntityModel_.put("FStockId",id); + map_fEntityModel_.put("IsDeleteEntry", "False"); + map_fEntityModel_.put("fields","FName,FNumber"); + kingDeeData = BDStocklCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + rb= accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); + //提交审核 + ResultBean resultBean2 = submitAndAudit(id); + return resultBean2; + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } + /** + * 新增 + * @param kingDeeData + * @return + */ + private ResultBean addBDtStock(String kingDeeData, String FNumber){ + ResultBean rb=ResultBean.fireFail(); + try{ + rb= accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); + String s = draftResultGetId(rb.getData()); + return submitAndAudit(s); + }catch (Exception e){ + e.printStackTrace(); + return rb.setMsg("仓库新增失败"); + } + } + /** + * 提交审核仓库 + * @param id + * @return + */ + private ResultBean submitAndAudit( String id){ + ResultBean rb=ResultBean.fireFail(); + try{ + String submitKDTempJson = getSubmitKDTempJson(KingDeeBillId.BD_STOCK.getID(),id ); + ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), submitKDTempJson, + KingDeeBillUrl.SUBMIT_URL.getURL()); + if(!resultBean1.getSuccess()){ + log.info("仓库提交失败!"); + return rb.setMsg("仓库提交失败!"); + } + log.info("仓库提交成功!"); + String auditKDTempJson = getAuditKDTempJson(KingDeeBillId.BD_STOCK.getID(), id); + ResultBean resultBean2 = + accessKingDeeInterface(KingDeeBillId.BD_STOCK.getID(), auditKDTempJson, + KingDeeBillUrl.AUDIT_URL.getURL()); + if(!resultBean2.getSuccess()){ + log.info("仓库审核失败!"); + return rb.setMsg("仓库审核失败!"); + } + log.info("仓库审核成功!"); + return resultBean2; + } catch (Exception e){ + e.printStackTrace(); + return rb.setMsg("仓库提交审核失败"); + } + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStocklCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStocklCastToKingDeeBillFields.java index 553e5233c0..b61901ae06 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStocklCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/BDStocklCastToKingDeeBillFields.java @@ -33,6 +33,7 @@ public class BDStocklCastToKingDeeBillFields { //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); + fEntityData_ = KingDeeUtils.replaceTemplateParams(fEntityData_, map_fEntityModel_); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_data.json index f8b9dc071d..7318e63684 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_data.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_data.json @@ -2,7 +2,7 @@ "Creator": "", "NeedUpDateFields": [], "NeedReturnFields": [], - "IsDeleteEntry": "True", + "IsDeleteEntry": "@KD_IsDeleteEntry", "SubSystemId": "", "IsVerifyBaseDataField": "false", "IsEntryBatchFill": "True", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json index f2a07c5378..866bf3d4c8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdstock/data_model.json @@ -1,12 +1,13 @@ { - "FStockId": 0, + "FStockId": @KD_FStockId, "FCreateOrgId": { "FNumber": "@KD_FCreateOrgId" }, "FUseOrgId": { - "FNumber": "@KD_FUseOrgId" + "FNumber": "@KD_FCreateOrgId" }, "FName": "@KD_FName", + "FNumber": "@KD_FNumber", "FStockProperty": "1", "FDescription": "@KD_FDescription", "FStockStatusType": "0,1,2,3,4,5,6,7,8", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java index eae698dc6e..bc0f5abe54 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntCastToKingDeeBillFields.java @@ -33,6 +33,7 @@ public class CNBankcntCastToKingDeeBillFields { //模板字符创转json JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); + fEntityData_ = KingDeeUtils.replaceTemplateParams(fEntityData_, map_fEntityModel_); JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java index 2ceb7b2072..58f69337cb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java @@ -5,7 +5,6 @@ import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.fin.api.kingdee.bank.BDBank; -import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig; @@ -50,18 +49,7 @@ public class CNBankcntService extends FinKingDeeService { ResultBean rb=ResultBean.fireFail(); try { //银行 - String fbankid = cNBankcnt.getFBANKID(); - JSONObject result = view(fbankid); - log.info(JSONObject.toJSONString(result)); - Object result1 = result.get("Result"); - if(result1==null){ - BDBank b=new BDBank(); - b.setFName(cNBankcnt.getBankName()); - b.setFNumber(cNBankcnt.getFBANKID()); - b.setFCreateOrgId(cNBankcnt.getFCreateOrgId()); - b.setFUseOrgId(cNBankcnt.getFUseOrgId()); - bdBankService.draftBDBank(b); - } + validBankInfo(cNBankcnt); //业务表的主表数据集合 Map map_fEntityModel_= object2Map(cNBankcnt); //准备 物料列表的数据 ForEntryBill @@ -85,21 +73,33 @@ public class CNBankcntService extends FinKingDeeService { return rb.setMsg("银行账号审核失败!"); } log.info("银行账号审核成功!"); - /*String allocate = getAllocate(resultBean.getData(),cNBankcnt.getTOrgIds(),KingDeeBillId.BD_MATERIAL.getID()); - ResultBean resultBean3 =accessKingDeeInterface( - KingDeeBillId.CN_BANKACNT.getID(), allocate, - KingDeeBillUrl.ALLOCATE_URL.getURL());// allocateKingDeeBillData(KingDeeBillId.BD_MATERIAL.getID(), allocate); - if(!resultBean3.getSuccess()){ - log.info("银行账号分配失败!"); - return rb.setMsg("银行账号分配失败!"); - } - log.info("银行账号分配成功!");*/ return resultBean; } catch (Exception e) { e.printStackTrace(); } return rb; } + + /** + * 验证银行的信息 有就不做操作 没有就新增了 + * @param cNBankcnt + * @throws Exception + */ + private void validBankInfo(CNBankacnt cNBankcnt) throws Exception { + String FBANKACNTID = cNBankcnt.getFBANKID(); + JSONObject result = view(FBANKACNTID); + log.info(JSONObject.toJSONString(result)); + Object result1 = result.get("Result"); + if(result1==null){ + BDBank b=new BDBank(); + b.setFName(cNBankcnt.getBankName()); + b.setFNumber(cNBankcnt.getFBANKID()); + b.setFCreateOrgId(cNBankcnt.getFCreateOrgId()); + //b.setFUseOrgId(cNBankcnt.getFUseOrgId()); + bdBankService.draftBDBank(b); + } + } + /** * 查看物料 * @param bankName @@ -107,12 +107,95 @@ public class CNBankcntService extends FinKingDeeService { * @throws Exception */ private JSONObject view(String bankName) throws Exception { - String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.BD_BANK.getID(), bankName); - ResultBean kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.BD_BANK.getID(), getKDForNumbers, + String getKDForNumbers = getGetKDForNumbers(KingDeeBillId.CN_BANKACNT.getID(), bankName); + ResultBean kingDataInfoByNumber = accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), getKDForNumbers, kingDeeConfig.getUserName_administrator(),kingDeeConfig.getPassword_administrator(), KingDeeBillUrl.VIEW_URL.getURL()); log.info("kingDataInfoByNumber:{}",kingDataInfoByNumber.getData()); JSONObject jsonObject = JSONObject.parseObject(kingDataInfoByNumber.getData().toString()); JSONObject result = (JSONObject)jsonObject.get("Result"); return result; } + + /** + * 修改银行账号 + * @param cNBankacnt + * @return + */ + public ResultBean updateCNBankacnt(CNBankacnt cNBankacnt) { + //bdSupplier=BdSupplier.createBdSupplier(); + ResultBean rb=ResultBean.fireFail(); + try { + validBankInfo(cNBankacnt); + Map map_fEntityModel_= object2Map(cNBankacnt); + map_fEntityModel_.put("FBANKACNTID","0"); + map_fEntityModel_.put("IsDeleteEntry", "True"); + String kingDeeData = CNBankcntCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + ResultBean stringResultBean = viewGetId(KingDeeBillId.CN_BANKACNT.getID(), cNBankacnt.getFNumber()); + String id = stringResultBean.getData(); + if(!stringResultBean.getSuccess()&&"0".equals(id)){ + return addCNBankacnt(kingDeeData,cNBankacnt.getFNumber()); + } + //反审核 + boolean c = isAudit(KingDeeBillId.CN_BANKACNT.getID(), "C", id); + //修改 + map_fEntityModel_.put("FBANKACNTID",id); + map_fEntityModel_.put("IsDeleteEntry", "False"); + map_fEntityModel_.put("fields","FName,FNumber,FBANKID"); + kingDeeData = CNBankcntCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_); + rb= accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); + //提交审核 + ResultBean resultBean2 = submitAndAudit(id); + return resultBean2; + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } + /** + * 新增 + * @param kingDeeData + * @return + */ + private ResultBean addCNBankacnt(String kingDeeData, String FNumber){ + ResultBean rb=ResultBean.fireFail(); + try{ + rb= accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), kingDeeData,KingDeeBillUrl.SAVE_URL.getURL()); + String s = draftResultGetId(rb.getData()); + return submitAndAudit(s); + }catch (Exception e){ + e.printStackTrace(); + return rb.setMsg("银行账号新增失败"); + } + } + /** + * 提交审核银行 + * @param id + * @return + */ + private ResultBean submitAndAudit( String id){ + ResultBean rb=ResultBean.fireFail(); + try{ + String submitKDTempJson = getSubmitKDTempJson(KingDeeBillId.CN_BANKACNT.getID(),id ); + ResultBean resultBean1 = accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), submitKDTempJson, + KingDeeBillUrl.SUBMIT_URL.getURL()); + if(!resultBean1.getSuccess()){ + log.info("银行账号提交失败!"); + return rb.setMsg("银行账号提交失败!"); + } + log.info("银行账号提交成功!"); + String auditKDTempJson = getAuditKDTempJson(KingDeeBillId.CN_BANKACNT.getID(), id); + ResultBean resultBean2 = + accessKingDeeInterface(KingDeeBillId.CN_BANKACNT.getID(), auditKDTempJson, + KingDeeBillUrl.AUDIT_URL.getURL()); + if(!resultBean2.getSuccess()){ + log.info("银行账号审核失败!"); + return rb.setMsg("银行账号审核失败!"); + } + log.info("银行账号审核成功!"); + return resultBean2; + } catch (Exception e){ + e.printStackTrace(); + return rb.setMsg("银行账号提交审核失败"); + } + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json index f8b9dc071d..7318e63684 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_data.json @@ -2,7 +2,7 @@ "Creator": "", "NeedUpDateFields": [], "NeedReturnFields": [], - "IsDeleteEntry": "True", + "IsDeleteEntry": "@KD_IsDeleteEntry", "SubSystemId": "", "IsVerifyBaseDataField": "false", "IsEntryBatchFill": "True", diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json index fcb756e1a6..933c94d907 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/data_model.json @@ -1,5 +1,5 @@ { - "FBANKACNTID": 0, + "FBANKACNTID": @KD_FBANKACNTID, "FCreateOrgId": { "FNumber": "@KD_FCreateOrgId" }, @@ -9,7 +9,7 @@ }, "FName": "@KD_FName", "FUseOrgId": { - "FNumber": "@KD_FUseOrgId" + "FNumber": "@KD_FCreateOrgId" }, "FIsCancel": false, "FIsFundUp": false, diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json index 6163b5aa3d..e719784bf5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/data_FEntity.json @@ -22,7 +22,7 @@ "FNumber": "@KD_FStockID" }, "FStockStatusID": { - "FNumber": "" + "FNumber": "KCZT01_SYS" }, "FSalUnitID": { "FNumber": "liang"