新增客户的修改功能（查询 修改 提交 审核 分配）

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<String> draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier);
-    @ApiOperation("暂存客户信息的接口")
+    @ApiOperation("新增客户信息的接口   适用客户查询的批量推送财务客户数据")
     @PostMapping("/draftBdCustomer")
     @ResponseBody
     ResultBean<String> draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer);
+    @ApiOperation("新增客户信息的接口   适用客户查询的批量推送财务客户数据   批量")
+    @PostMapping("/draftBdCustomer")
+    @ResponseBody
+    ResultBean<String> draftBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers);
     @ApiOperation("修改客户信息的接口")
     @PostMapping("/saveBdCustomers")
     @ResponseBody
     ResultBean<String> saveBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers);
+    @ApiOperation("单个 销售出库单 推送客户信息")
+    @PostMapping("/updateSingleCustomer")
+    @ResponseBody
+    public ResultBean<String> updateSingleCustomer(@RequestBody @Valid BdCustomer bdCustomer);
     @ApiOperation("使用number查看数据表单")
     @GetMapping("/getKingDataInfoByNumber/{formId}/{number}")
     @ResponseBody

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<String> draftBdCustomers(List<BdCustomer> bdCustomers) {
+        return null;
+    }
+
     @Override
     public ResultBean<String> saveBdCustomers(List<BdCustomer> bdCustomers) {
         return null;
     }
 
+    @Override
+    public ResultBean<String> updateSingleCustomer(BdCustomer bdCustomers) {
+        return null;
+    }
+
     @Override
     public ResultBean<String> getKingDataInfoByNumber(String formId,String number) {
         return null;

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;

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<String> draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer) {
         return bdCustomerService.draftBdCustomer(bdCustomer);
     }
+    @ApiOperation("暂存客户信息的接口 批量")
+    @PostMapping("/draftBdCustomers")
+    @ResponseBody
+    @Override
+    public ResultBean<String> draftBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers) {
+        return bdCustomerService.draftBdCustomers(bdCustomers);
+    }
+
     @ApiOperation("修改客户信息的接口")
     @PostMapping("/saveBdCustomers")
     @ResponseBody
     @Override
     public ResultBean<String> saveBdCustomers(List<BdCustomer> bdCustomers) {
-        return  bdCustomerService.saveBdCustomers(bdCustomers);
+        return  bdCustomerService.updateCustomers(bdCustomers);
+    }
+
+    @ApiOperation("单个 销售出库单 推送客户信息")
+    @PostMapping("/updateSingleCustomer")
+    @ResponseBody
+    @Override
+    public ResultBean<String> updateSingleCustomer( BdCustomer bdCustomers) {
+        return  bdCustomerService.updateSingleCustomer(bdCustomers);
     }
 
     @ApiOperation("使用number查看数据表单")

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<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.AP_PAYBILL.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+            ResultBean<String> 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<String> 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();
         }

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<String> draftBdCustomers(List<BdCustomer> bdCustomers) {
+        ResultBean rb=ResultBean.fireFail();
+        List<String> 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<String> saveBdCustomers(List<BdCustomer > bdCustomers) {
+    public ResultBean<String> updateCustomers(List<BdCustomer > bdCustomers) {
         ResultBean<String> rb=ResultBean.fireFail();
         List<String> list_r=new ArrayList<>();
         for(BdCustomer b:bdCustomers) {
-            ResultBean<String> 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<String> updateSingleCustomer( BdCustomer  b) {
+        ResultBean<String> rb=ResultBean.fireFail();
+            ResultBean<String> 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<String> save = save(b,custId);
+                ResultBean<String> 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<String> save(BdCustomer b,String fcustid) {
+    private ResultBean<String> updateCustomer(BdCustomer b, String fcustid) {
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(b);
 
         Map<String, String> mapParams = createMapParams(stringObjectMap);

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<Map<String, String>> vehicleListMap = createVehicleLists(fEntity);
             String kingDeeData = SalOutStockCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_,vehicleListMap);
            // ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.BD_MATERIAL.getID(),kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
-            ResultBean<String> stringResultBean = accessKingDeeInterface(KingDeeBillId.SAL_OUTSTOCK.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
+            ResultBean<String> 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");

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<Map<String, String>>  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<String> 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<String> submit = submit(id+"",KingDeeBillId.STK_INSTOCK.getID());
+        if (!submit.getSuccess()) return submit;
+        return stringResultBean;
     }
 
     /**