完善金蝶的接口

3 years ago · 34a079d4e7
7 changed files with 51 additions and 56 deletions
--- 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
@ -38,7 +38,7 @@ public interface FinKingDeeFeign {
    @ApiOperation("入账保存应付单的接口")
    @PostMapping("/draftEntryBill")
    @ResponseBody
-    ResultBean<List<KingDeeResult>> draftEntryBill(@RequestBody APPayable APPayable);
+    ResultBean<String> draftEntryBill(@RequestBody APPayable APPayable);
    /**
     * 生成的应付单的数据，推送到金蝶的平台中
     * @return
@ -46,53 +46,53 @@ public interface FinKingDeeFeign {
    @ApiOperation("入账保存应收单的接口")
    @PostMapping("/draftReceivableBill")
    @ResponseBody
-    ResultBean<List<KingDeeResult>> draftReceivableBill(@RequestBody ARReceivable aRReceivable);
+    ResultBean<String> draftReceivableBill(@RequestBody ARReceivable aRReceivable);
    @ApiOperation("保存付款单的接口")
    @PostMapping("/draftApPayBill")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftApPayBill(@RequestBody ApPayBill apPayBill) ;
+    public ResultBean<String> draftApPayBill(@RequestBody ApPayBill apPayBill) ;

    @ApiOperation("保存采购入库单的接口")
    @PostMapping("/draftStkInStock")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception;
+    public ResultBean<String> draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception;

    @ApiOperation("保存采购退料单的接口")
    @PostMapping("/draftPurMrb")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftPurMrb(@RequestBody PurMrb purMrb) ;
+    public ResultBean<String> draftPurMrb(@RequestBody PurMrb purMrb) ;
    @ApiOperation("保存采购出库单的接口")
    @PostMapping("/draftSalOutStock")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftSalOutStock(@RequestBody SalOutStock salOutStock) ;
+    public ResultBean<String> draftSalOutStock(@RequestBody SalOutStock salOutStock) ;
    @ApiOperation("保存物料的接口")
    @PostMapping("/draftBdMaterial")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftBdMaterial(@RequestBody  BdMaterial bdMaterial) ;
+    public ResultBean<String> draftBdMaterial(@RequestBody  BdMaterial bdMaterial) ;

    @ApiOperation("保存物料的接口")
    @PostMapping("/draftBdMaterialList")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) ;
+    public ResultBean<String> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) ;

    @ApiOperation("保存直接调拨单的接口")
    @PostMapping("/draftStkTransferDirect")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) ;
+    public ResultBean<String> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) ;
    @ApiOperation("保存直接调拨单的接口")
    @PostMapping("/draftOrgOrganizations")
    @ResponseBody
-    public ResultBean<List<KingDeeResult>> draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) ;
+    public ResultBean<String> draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) ;

    @ApiOperation("保存供应商的接口")
    @PostMapping("/draftBdSupplier")
    @ResponseBody
-    ResultBean<List<KingDeeResult>> draftBdSupplier(@RequestBody BdSupplier bdSupplier);
+    ResultBean<String> draftBdSupplier(@RequestBody BdSupplier bdSupplier);

    @ApiOperation("保存客户信息的接口")
    @PostMapping("/draftBdCustomer")
    @ResponseBody
-    ResultBean<List<KingDeeResult>> draftBdCustomer(@RequestBody BdCustomer bdCustomer);
+    ResultBean<String> draftBdCustomer(@RequestBody BdCustomer bdCustomer);

    @ApiOperation("使用number查看数据表单")
    @GetMapping("/getKingDataInfoByNumber/{formId}/{number}")
--- 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
@ -19,62 +19,62 @@ import java.util.List;
 public class FinKingDeeFeignFallBack
 implements FinKingDeeFeign{
    @Override
-    public ResultBean draftEntryBill(APPayable APPayable) {
+    public ResultBean<String> draftEntryBill(APPayable APPayable) {
        return null;
    }

    @Override
-    public ResultBean draftReceivableBill(ARReceivable aRReceivable) {
+    public ResultBean<String> draftReceivableBill(ARReceivable aRReceivable) {
        return null;
    }

    @Override
-    public ResultBean draftApPayBill(ApPayBill apPayBill) {
+    public ResultBean<String> draftApPayBill(ApPayBill apPayBill) {
        return null;
    }

    @Override
-    public ResultBean draftStkInStock(StkInStock stkInStock) {
+    public ResultBean<String> draftStkInStock(StkInStock stkInStock) {
        return null;
    }

    @Override
-    public ResultBean draftPurMrb(PurMrb purMrb) {
+    public ResultBean<String> draftPurMrb(PurMrb purMrb) {
        return null;
    }

    @Override
-    public ResultBean draftSalOutStock(SalOutStock salOutStock) {
+    public ResultBean<String> draftSalOutStock(SalOutStock salOutStock) {
        return null;
    }

    @Override
-    public ResultBean<List<KingDeeResult>> draftBdMaterial(BdMaterial bdMaterial) {
+    public ResultBean<String> draftBdMaterial(BdMaterial bdMaterial) {
        return null;
    }

    @Override
-    public ResultBean<List<KingDeeResult>> draftBdMaterialList(List<BdMaterial> bdMaterial) {
+    public ResultBean<String> draftBdMaterialList(List<BdMaterial> bdMaterial) {
        return null;
    }

    @Override
-    public ResultBean<List<KingDeeResult>> draftStkTransferDirect(StkTransferDirect stkTransferDirect) {
+    public ResultBean<String> draftStkTransferDirect(StkTransferDirect stkTransferDirect) {
        return null;
    }

    @Override
-    public ResultBean<List<KingDeeResult>> draftOrgOrganizations(OrgOrganizations orgOrganizations) {
+    public ResultBean<String> draftOrgOrganizations(OrgOrganizations orgOrganizations) {
        return null;
    }

    @Override
-    public ResultBean<List<KingDeeResult>> draftBdSupplier(BdSupplier bdSupplier) {
+    public ResultBean<String> draftBdSupplier(BdSupplier bdSupplier) {
        return null;
    }

    @Override
-    public ResultBean<List<KingDeeResult>> draftBdCustomer(BdCustomer bdCustomer) {
+    public ResultBean<String> draftBdCustomer(BdCustomer bdCustomer) {
        return null;
    }

--- 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
@ -96,21 +96,21 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
    @PostMapping("/draftEntryBill")
    @ResponseBody
    @Override
-    public ResultBean draftEntryBill(@RequestBody APPayable APPayable) {
+    public ResultBean<String> draftEntryBill(@RequestBody APPayable APPayable) {
        return apPayableService.draftAPPayable(APPayable);
    }
    @ApiOperation("保存应收单的接口")
    @PostMapping("/draftReceivableBill")
    @ResponseBody
    @Override
-    public ResultBean draftReceivableBill(@RequestBody ARReceivable aRReceivable) {
+    public ResultBean<String> draftReceivableBill(@RequestBody ARReceivable aRReceivable) {
        return receivableBillService.draftReceivableBill(aRReceivable);
    }
    @ApiOperation("保存付款单的接口")
    @PostMapping("/draftApPayBill")
    @ResponseBody
    @Override
-    public ResultBean draftApPayBill(@RequestBody ApPayBill apPayBill) {
+    public ResultBean<String> draftApPayBill(@RequestBody ApPayBill apPayBill) {
        return apPayBillService.draftApPayBill(apPayBill);
    }

@ -118,28 +118,28 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
    @PostMapping("/draftStkInStock")
    @ResponseBody
    @Override
-    public ResultBean draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception {
+    public ResultBean<String> draftStkInStock(@RequestBody StkInStock stkInStock) throws Exception {
        return stkInStockService.draftStkInStock(stkInStock);
    }
    @ApiOperation("保存采购退料单的接口")
    @PostMapping("/draftPurMrb")
    @ResponseBody
    @Override
-    public ResultBean draftPurMrb(@RequestBody PurMrb purMrb) {
+    public ResultBean<String> draftPurMrb(@RequestBody PurMrb purMrb) {
        return purMrbService.draftPurMrb(purMrb);
    }
    @ApiOperation("保存采购出库单的接口")
    @PostMapping("/draftSalOutStock")
    @ResponseBody
    @Override
-    public ResultBean draftSalOutStock(@RequestBody SalOutStock salOutStock) {
+    public ResultBean<String> draftSalOutStock(@RequestBody SalOutStock salOutStock) {
        return salOutStockService.draftSalOutStock(salOutStock);
    }
    @ApiOperation("保存物料的接口")
    @PostMapping("/draftBdMaterial")
    @ResponseBody
    @Override
-    public ResultBean draftBdMaterial(@RequestBody BdMaterial bdMaterial) {
+    public ResultBean<String> draftBdMaterial(@RequestBody BdMaterial bdMaterial) {
        return bdMaterialService.draftBdMaterial(bdMaterial);
    }

@ -147,35 +147,35 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
    @PostMapping("/draftBdMaterialList")
    @ResponseBody
    @Override
-    public ResultBean<List<KingDeeResult>> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) {
+    public ResultBean<String> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) {
        return bdMaterialService.draftBdMaterialList(bdMaterial);
    }
    @ApiOperation("保存直接调拨单的接口")
    @PostMapping("/draftStkTransferDirect")
    @ResponseBody
    @Override
-    public ResultBean<List<KingDeeResult>> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) {
+    public ResultBean<String> draftStkTransferDirect(@RequestBody StkTransferDirect stkTransferDirect) {
        return stkTransferDirectService.draftStkTransferDirect(stkTransferDirect);
    }
    @ApiOperation("保存组织机构的接口")
    @PostMapping("/draftOrgOrganizations")
    @ResponseBody
    @Override
-    public ResultBean<List<KingDeeResult>> draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) {
+    public ResultBean<String> draftOrgOrganizations(@RequestBody OrgOrganizations orgOrganizations) {
        return orgOrganizationsService.draftOrgOrganizations(orgOrganizations);
    }
    @ApiOperation("保存供应商的接口")
    @PostMapping("/draftBdSupplier")
    @ResponseBody
    @Override
-    public ResultBean<List<KingDeeResult>> draftBdSupplier(@RequestBody BdSupplier bdSupplier) {
+    public ResultBean<String> draftBdSupplier(@RequestBody BdSupplier bdSupplier) {
        return bdSupplierService.draftBdSupplier(bdSupplier);
    }
    @ApiOperation("保存客户信息的接口")
    @PostMapping("/draftBdCustomer")
    @ResponseBody
    @Override
-    public ResultBean<List<KingDeeResult>> draftBdCustomer(@RequestBody BdCustomer bdCustomer) {
+    public ResultBean<String> draftBdCustomer(@RequestBody BdCustomer bdCustomer) {
        return bdCustomerService.draftBdCustomer(bdCustomer);
    }
    @ApiOperation("使用number查看数据表单")
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java
@ -1,21 +1,18 @@
 package com.yxt.anrui.fin.biz.kingdee.bdmaterial;

 import cn.hutool.core.bean.BeanUtil;
-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.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

@ -30,17 +27,17 @@ public class BdMaterialService extends FinKingDeeService {
     *  @param bdMaterial
     * @return
     */
-    public ResultBean<List<KingDeeResult>> draftBdMaterialList(List<BdMaterial> bdMaterial) {
+    public ResultBean<String> draftBdMaterialList(List<BdMaterial> bdMaterial) {
        // bdMaterial=BdMaterial.createBdMaterial();
        List<String> list=new ArrayList<>();
-        ResultBean rb=ResultBean.fireFail();
+        ResultBean<String> rb=ResultBean.fireFail();
        for(BdMaterial b:bdMaterial) {
-            ResultBean<String> resultBean = draftBdMaterial(b);
-            if (resultBean.getSuccess()) {
-                list.add(resultBean.getData());
+            rb= draftBdMaterial(b);
+            if (rb.getSuccess()) {
+                list.add(rb.getData());
            }
        }
-        return rb.success().setData(list);
+        return rb.success();
    }
    /**
     * 保存物料
@ -62,6 +59,15 @@ public class BdMaterialService extends FinKingDeeService {
                log.info("物料保存失败!");
                return rb.setMsg("物料保存失败!");
            }
+            String data1 = resultBean.getData();
+            JSONObject jsonObject = JSONObject.parseObject(data1);
+            JSONObject result = (JSONObject)jsonObject.get("Result");
+            JSONObject responseStatus =  (JSONObject)result.get("ResponseStatus");
+            boolean isSuccess = (boolean) responseStatus.get("IsSuccess");
+            if(!isSuccess){
+                log.info("物料保存失败!");
+                return rb.setMsg("物料保存失败!");
+            }
            log.info("物料保存成功!");
            String data = resultBean.getData();

--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdsupplier/BdSupplierService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdsupplier/BdSupplierService.java
@ -1,13 +1,9 @@
 package com.yxt.anrui.fin.biz.kingdee.bdsupplier;

-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.KingDeeResult;
-import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
 import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
-import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/OrgOrganizationsService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/orgorganizations/OrgOrganizationsService.java
@ -3,16 +3,12 @@ package com.yxt.anrui.fin.biz.kingdee.orgorganizations;
 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;
 import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
-import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.KingDeeConfig;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;

-import java.util.List;
 import java.util.Map;

@Service
--- 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
@ -1,6 +1,5 @@
 package com.yxt.anrui.fin.biz.kingdee.saloutstock;

-import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
 import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@ -8,8 +7,6 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;

-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;