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 fb6418b47f..e61ff71af4 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 @@ -88,14 +88,22 @@ public interface FinKingDeeFeign { @PostMapping("/draftBdSupplier") @ResponseBody ResultBean draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier); - @ApiOperation("暂存客户信息的接口") + @ApiOperation("新增客户信息的接口 适用客户查询的批量推送财务客户数据") @PostMapping("/draftBdCustomer") @ResponseBody ResultBean draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer); + @ApiOperation("新增客户信息的接口 适用客户查询的批量推送财务客户数据 批量") + @PostMapping("/draftBdCustomer") + @ResponseBody + ResultBean draftBdCustomers(@RequestBody @Valid List bdCustomers); @ApiOperation("修改客户信息的接口") @PostMapping("/saveBdCustomers") @ResponseBody ResultBean saveBdCustomers(@RequestBody @Valid List bdCustomers); + @ApiOperation("单个 销售出库单 推送客户信息") + @PostMapping("/updateSingleCustomer") + @ResponseBody + public ResultBean updateSingleCustomer(@RequestBody @Valid BdCustomer bdCustomer); @ApiOperation("使用number查看数据表单") @GetMapping("/getKingDataInfoByNumber/{formId}/{number}") @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 76f9ab0500..94061ef8c1 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 @@ -81,11 +81,21 @@ implements FinKingDeeFeign{ return null; } + @Override + public ResultBean draftBdCustomers(List bdCustomers) { + return null; + } + @Override public ResultBean saveBdCustomers(List bdCustomers) { return null; } + @Override + public ResultBean updateSingleCustomer(BdCustomer bdCustomers) { + return null; + } + @Override public ResultBean getKingDataInfoByNumber(String formId,String number) { return null; 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 ac0fbcdc9f..4c62b1da7f 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 @@ -14,7 +14,12 @@ public class BdCustomer { @NotBlank( message = "FName不能为空") @JsonProperty("FName") public String FName; - /*客户编码:FName (必填项)*/ + + /*旧客户编码:oldFNumber*/ + @JsonProperty("oldFNumber") + public String oldFNumber; + + /*客户编码:FNumber (必填项)*/ @NotBlank(message = "FNumber不能为空") @JsonProperty("FNumber") public String FNumber; 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 672ff8d059..d1b615aff1 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 @@ -216,12 +216,28 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { public ResultBean draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer) { return bdCustomerService.draftBdCustomer(bdCustomer); } + @ApiOperation("暂存客户信息的接口 批量") + @PostMapping("/draftBdCustomers") + @ResponseBody + @Override + public ResultBean draftBdCustomers(@RequestBody @Valid List bdCustomers) { + return bdCustomerService.draftBdCustomers(bdCustomers); + } + @ApiOperation("修改客户信息的接口") @PostMapping("/saveBdCustomers") @ResponseBody @Override public ResultBean saveBdCustomers(List bdCustomers) { - return bdCustomerService.saveBdCustomers(bdCustomers); + return bdCustomerService.updateCustomers(bdCustomers); + } + + @ApiOperation("单个 销售出库单 推送客户信息") + @PostMapping("/updateSingleCustomer") + @ResponseBody + @Override + public ResultBean updateSingleCustomer( BdCustomer bdCustomers) { + return bdCustomerService.updateSingleCustomer(bdCustomers); } @ApiOperation("使用number查看数据表单") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java index 09041a1802..6286c528ac 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillService.java @@ -1,8 +1,10 @@ package com.yxt.anrui.fin.biz.kingdee.appaybill; import cn.hutool.core.bean.BeanUtil; +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.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService; @@ -56,7 +58,19 @@ public class ApPayBillService extends FinKingDeeService { params.put("FSETTLETYPEID",sysMappingInfoVoResultBean.getData().getMap_itemKey());//"02");// } String kingDeeData = ApPayBillCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); - return accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(),kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + // ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); + String data = stringResultBean.getData(); + JSONObject jsonObject = JSONObject.parseObject(data.toString()); + JSONObject result = (JSONObject)jsonObject.get("Result"); + JSONObject result2 = (JSONObject)result.get("Result"); + log.info("ApPayBillService:{}",data); + log.info("result:{}",result); + log.info("result2:{}",result2); + int id = (int)result.get("Id"); + ResultBean submit = submit(id+"",KingDeeBillId.AP_PAYBILL.getID()); + if (!submit.getSuccess()) return rb.setCode(KingDeeCode.SUBMIT.getCode()).setData(submit.getData()); + return stringResultBean; } catch (Exception e) { e.printStackTrace(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java index adc114c916..40c9a7ba79 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdcustomer/BdCustomerService.java @@ -40,8 +40,23 @@ public class BdCustomerService extends FinKingDeeService { return rb.success().setData(list); } + /** + * 保存客户信息 批量 + * 适用客户查询的批量推送财务客户数据 + * @param bdCustomers + * @return + */ + public ResultBean draftBdCustomers(List bdCustomers) { + ResultBean rb=ResultBean.fireFail(); + List list_r=new ArrayList<>(); + for(BdCustomer b:bdCustomers) { + list_r.add(draftBdCustomer(b).getMsg()); + } + return rb.success().setData(JSONObject.toJSONString(list_r)); + } /** * 保存客户信息 + * 适用客户查询的批量推送财务客户数据 * @param bdCustomer * @return */ @@ -102,14 +117,25 @@ public class BdCustomerService extends FinKingDeeService { } /** - * 批量修改客户 list + * 批量修改客户 + * 使用于出库单中推送财务客户数据 * @return */ - public ResultBean saveBdCustomers(List bdCustomers) { + public ResultBean updateCustomers(List bdCustomers) { ResultBean rb=ResultBean.fireFail(); List list_r=new ArrayList<>(); for(BdCustomer b:bdCustomers) { - ResultBean stringResultBean = viewGetId(KingDeeBillId.BD_CUSTOMER.getID(), b.getFNumber()); + list_r.add(updateSingleCustomer(b).getMsg()); + } + return rb.success().setData(JSONObject.toJSONString(list_r)); + } + /** + * 单个 销售出库单 推送客户信息 + * @return + */ + public ResultBean updateSingleCustomer( BdCustomer b) { + ResultBean rb=ResultBean.fireFail(); + ResultBean stringResultBean = viewGetId(KingDeeBillId.BD_CUSTOMER.getID(), b.getOldFNumber()); if(!stringResultBean.getSuccess()&&!"0".equals(stringResultBean.getData())){ return stringResultBean; } @@ -126,7 +152,7 @@ public class BdCustomerService extends FinKingDeeService { return rb.setMsg("反审核失败!"); } try{ - ResultBean save = save(b,custId); + ResultBean save = updateCustomer(b,custId); if(!save.getSuccess()){ log.info("客户保存失败!:{}"); return rb.setMsg("客户保存失败!"); @@ -152,12 +178,11 @@ public class BdCustomerService extends FinKingDeeService { return rb.setMsg("客户分配失败!"); } log.info("客户分配成功!"); - list_r.add(save.getData()); + return rb.success().setData(save.getData()).setMsg("客户保存成功!"); }catch (Exception e){ e.printStackTrace(); + return rb.setMsg("客户保存失败!"); } - } - return rb.success().setData(JSONObject.toJSONString(list_r)); } /** @@ -166,7 +191,7 @@ public class BdCustomerService extends FinKingDeeService { * @return * @throws Exception */ - private ResultBean save(BdCustomer b,String fcustid) { + private ResultBean updateCustomer(BdCustomer b, String fcustid) { Map stringObjectMap = BeanUtil.beanToMap(b); Map mapParams = createMapParams(stringObjectMap); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java index 6a7008a67c..aaafaa2657 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/saloutstock/SalOutStockService.java @@ -82,7 +82,8 @@ public class SalOutStockService extends FinKingDeeService { List> vehicleListMap = createVehicleLists(fEntity); String kingDeeData = SalOutStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); // ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); - ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); + ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(), + kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); String data = stringResultBean.getData(); JSONObject jsonObject = JSONObject.parseObject(data.toString()); JSONObject result = (JSONObject)jsonObject.get("Result"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java index f1f04dca8b..9368a4de9a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stkinstock/STKInStockService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; 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.KingDeeCode; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.stkInstockNumber.FinStkInstockNumber; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; @@ -134,7 +135,19 @@ public class STKInStockService extends FinKingDeeService { //准备 物料列表的数据 ForEntryBill List> vehicleListMap = createVehicleLists(fInStockEntry); String kingDeeData =STKInStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap); - return accessKingDeeInterface(KingDeeBillId.STK_INSTOCK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + //accessKingDeeInterface(KingDeeBillId.STK_INSTOCK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL()); + ResultBean stringResultBean = accessKingDeeInterface(KingDeeBillId.STK_INSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL()); + String data = stringResultBean.getData(); + JSONObject jsonObject = JSONObject.parseObject(data.toString()); + JSONObject result = (JSONObject)jsonObject.get("Result"); + JSONObject result2 = (JSONObject)result.get("Result"); + log.info("ApPayBillService:{}",data); + log.info("result:{}",result); + log.info("result2:{}",result2); + int id = (int)result.get("Id"); + ResultBean submit = submit(id+"",KingDeeBillId.STK_INSTOCK.getID()); + if (!submit.getSuccess()) return submit; + return stringResultBean; } /**