|
|
@ -48,107 +48,6 @@ public class FinKingDeeService { |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 查看审核金蝶的数据接口 |
|
|
|
* @param number |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/* public ResultBean<List<KingDeeResult>> getKingDeeBillDataByNumber(String formId, String number) throws Exception { |
|
|
|
*//* String data="{\"formId\":\""+formId+"\"," +
|
|
|
|
"\"data\":\"{\\\"CreateOrgId\\\":\\\"0\\\",\\\"Number\\\":\\\""+number+"\\\",\\\"Id\\\":\\\"\\\"}\"}"; |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}", JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.getKingDeeBillDataByNumber(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean;*//*
|
|
|
|
String data = getGetKDForNumbers(formId, number); |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* 调用提交金蝶的数据接口 |
|
|
|
* @param formId |
|
|
|
* @param data |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/*public ResultBean<List<KingDeeResult>> submitKingDeeBillData(String formId,String data) throws Exception { |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* 调用提交金蝶的数据接口 |
|
|
|
* @param formId |
|
|
|
* @param result |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/* public ResultBean<List<KingDeeResult>> submitKingDeeBillData(String formId,ResultBean<List<KingDeeResult>> result) throws Exception { |
|
|
|
String data = getSubmitKD(result, formId); |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* 调用审核金蝶的数据接口 |
|
|
|
* @param formId |
|
|
|
* @param data |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/*public ResultBean<List<KingDeeResult>> auditKingDeeBillData(String formId,String data) throws Exception { |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* 调用审核金蝶的数据接口 |
|
|
|
* @param formId |
|
|
|
* @param result |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/* public ResultBean<List<KingDeeResult>> auditKingDeeBillData(String formId,ResultBean<List<KingDeeResult>> result) throws Exception { |
|
|
|
String data = getAuditKD(result, formId); |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* 调用分配金蝶的数据接口 |
|
|
|
* @param formId |
|
|
|
* @param data |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/*public ResultBean<List<KingDeeResult>> allocateKingDeeBillData(String formId, String data) throws Exception { |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
/** |
|
|
|
* 调用分配金蝶的数据接口 |
|
|
|
* @param formId |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
/* public ResultBean<List<KingDeeResult>> allocateKingDeeBillData(String formId,String tOrgIds,ResultBean<List<KingDeeResult>> result) throws Exception { |
|
|
|
String data = getAllocate(result,tOrgIds, formId); |
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, data); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
|
|
|
|
private KingDeeParams getKingDeeParams(String formId, String data) { |
|
|
|
KingDeeParams kdp=new KingDeeParams(); |
|
|
|
kdp.setData(data); |
|
|
@ -195,6 +94,18 @@ public class FinKingDeeService { |
|
|
|
} |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 构造单据查询接口的数据格式 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public String getQueryKDTempJSON(String formId, String Numbers) { |
|
|
|
//2.1.CreateOrgId:创建者组织内码,字符串类型(非必录)
|
|
|
|
//2.2.Numbers:单据编码集合,数组类型,格式:[No1,No2,...](使用编码时必录)
|
|
|
|
//2.3.Ids:单据内码集合,字符串类型,格式:"Id1,Id2,..."(使用内码时必录)
|
|
|
|
return "{\"data\":\"{\\\"FormId\\\":\\\""+formId+"\\\"," + |
|
|
|
"\\\"FieldKeys\\\":\\\"FName,FNumber,FUseOrgId\\\",\\\"FilterString\\\":\\\"FNumber='"+Numbers+"'\\\"," + |
|
|
|
"\\\"OrderString\\\":\\\"\\\",\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"20\\\"}\"}"; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 构造查看接口的数据格式 |
|
|
|
* @return |
|
|
@ -209,61 +120,42 @@ public class FinKingDeeService { |
|
|
|
* 构造提交接口的数据格式 |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public String getSubmitKD(String data,String formId) { |
|
|
|
public String getSubmitKDTempJson( String formId,String s) { |
|
|
|
//2.1.CreateOrgId:创建者组织内码,字符串类型(非必录)
|
|
|
|
//2.2.Numbers:单据编码集合,数组类型,格式:[No1,No2,...](使用编码时必录)
|
|
|
|
//2.3.Ids:单据内码集合,字符串类型,格式:"Id1,Id2,..."(使用内码时必录)
|
|
|
|
/* List<KingDeeResult> data = resultBean.getData(); |
|
|
|
StringBuilder Ids=new StringBuilder(); |
|
|
|
for (int i=0;i<data.size();i++){ |
|
|
|
Ids.append(data.get(i).getId()).append(","); |
|
|
|
} |
|
|
|
String s = Ids.toString(); |
|
|
|
s=s.substring(0,s.length()-1);*/ |
|
|
|
JSONObject jsonObject = JSONObject.parseObject(data); |
|
|
|
JSONObject result = (JSONObject)jsonObject.get("Result"); |
|
|
|
JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); |
|
|
|
JSONArray successEntitys = (JSONArray)responseStatus.get("SuccessEntitys"); |
|
|
|
StringBuilder Ids=new StringBuilder(); |
|
|
|
for (int i=0;i<successEntitys.size();i++){ |
|
|
|
JSONObject o = (JSONObject)successEntitys.get(i); |
|
|
|
Ids.append(o.get("Id")).append(","); |
|
|
|
} |
|
|
|
String s = Ids.toString(); |
|
|
|
s=s.substring(0,s.length()-1); |
|
|
|
return "{\"formId\":\""+formId+"\",\"data\":\"{\\\"CreateOrgId\\\":\\\"\\\",\\\"Numbers\\\":[],\\\"Ids\\\":\\\""+s+"\\\"}\"}"; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 构造审核接口的数据格式 |
|
|
|
* @param resultBean |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public String getAuditKD(String data,String formId) { |
|
|
|
public String getAuditKDTempJson(String formId,String s) { |
|
|
|
//2.1.CreateOrgId:创建者组织内码,字符串类型(非必录)
|
|
|
|
//2.2.Numbers:单据编码集合,数组类型,格式:[No1,No2,...](使用编码时必录)
|
|
|
|
//2.3.Ids:单据内码集合,字符串类型,格式:"Id1,Id2,..."(使用内码时必录)
|
|
|
|
JSONObject jsonObject = JSONObject.parseObject(data); |
|
|
|
JSONObject result = (JSONObject)jsonObject.get("Result"); |
|
|
|
JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); |
|
|
|
JSONArray successEntitys = (JSONArray)responseStatus.get("SuccessEntitys"); |
|
|
|
StringBuilder Ids=new StringBuilder(); |
|
|
|
for (int i=0;i<successEntitys.size();i++){ |
|
|
|
JSONObject o = (JSONObject)successEntitys.get(i); |
|
|
|
Ids.append(o.get("Id")).append(","); |
|
|
|
} |
|
|
|
String s = Ids.toString(); |
|
|
|
s=s.substring(0,s.length()-1); |
|
|
|
return "{\"formId\":\""+formId+"\",\"data\":\"{\\\"CreateOrgId\\\":\\\"\\\",\\\"Numbers\\\":[],\\\"Ids\\\":\\\""+s+"\\\",\\\"InterationFlags\\\":\\\"\\\"}\"}"; |
|
|
|
} |
|
|
|
/** |
|
|
|
* 构造分配接口的数据格式 |
|
|
|
* @param resultBean |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public String getAllocate(String data,String tOrgIds,String formId) { |
|
|
|
public String getAllocateTempJson(String formId,String s,String tOrgIds) { |
|
|
|
/* 2.1.PkIds:被分配的基础资料内码集合,字符串类型,格式:"PkId1,PkId2,..."(必录) |
|
|
|
2.2.TOrgIds:目标组织内码集合,字符串类型,格式:"TOrgId1,TOrgId2,..."(必录) |
|
|
|
2.3.IsAutoSubmitAndAudit:是否自动提交与审核,布尔类型,默认false(非必录)*/ |
|
|
|
return "{\"formId\":\""+formId+"\",\"data\":\"{\\\"PkIds\\\":\\\""+s+"\\\",\\\"TOrgIds\\\":\\\""+tOrgIds+"\\\",\\\"IsAutoSubmitAndAudit\\\":\\\"true\\\"}\"}"; |
|
|
|
} |
|
|
|
public String getAllocate(String data,String tOrgIds,String formId) { |
|
|
|
return getAllocateTempJson(formId,getParam(data),tOrgIds);//"{\"formId\":\""+formId+"\",\"data\":\"{\\\"PkIds\\\":\\\""+s+"\\\",\\\"TOrgIds\\\":\\\""+tOrgIds+"\\\",\\\"IsAutoSubmitAndAudit\\\":\\\"true\\\"}\"}";
|
|
|
|
} |
|
|
|
public String getAuditKD(String data,String formId) { |
|
|
|
return getAuditKDTempJson(formId,getParam(data));//"{\"formId\":\""+formId+"\",\"data\":\"{\\\"CreateOrgId\\\":\\\"\\\",\\\"Numbers\\\":[],\\\"Ids\\\":\\\""+s+"\\\",\\\"InterationFlags\\\":\\\"\\\"}\"}";
|
|
|
|
} |
|
|
|
public String getSubmitKD(String data,String formId) { |
|
|
|
return getSubmitKDTempJson(formId,getParam(data));//"{\"formId\":\""+formId+"\",\"data\":\"{\\\"CreateOrgId\\\":\\\"\\\",\\\"Numbers\\\":[],\\\"Ids\\\":\\\""+s+"\\\"}\"}";
|
|
|
|
} |
|
|
|
private String getParam(String data) { |
|
|
|
JSONObject jsonObject = JSONObject.parseObject(data); |
|
|
|
JSONObject result = (JSONObject)jsonObject.get("Result"); |
|
|
|
JSONObject responseStatus = (JSONObject)result.get("ResponseStatus"); |
|
|
@ -275,24 +167,8 @@ public class FinKingDeeService { |
|
|
|
} |
|
|
|
String s = Ids.toString(); |
|
|
|
s=s.substring(0,s.length()-1); |
|
|
|
/*{\"PkIds\":\"0\",\"TOrgIds\":\"\",\"IsAutoSubmitAndAudit\":\"false\"}*/ |
|
|
|
return "{\"formId\":\""+formId+"\",\"data\":\"{\\\"PkIds\\\":\\\""+s+"\\\",\\\"TOrgIds\\\":\\\""+tOrgIds+"\\\",\\\"IsAutoSubmitAndAudit\\\":\\\"true\\\"}\"}"; |
|
|
|
return s; |
|
|
|
} |
|
|
|
/* public ResultBean<List<KingDeeResult>> getKingDataInfoByNumber(String formId, String number) throws Exception { |
|
|
|
ResultBean<List<KingDeeResult>> kingDeeBillDataByNumber = getKingDeeBillDataByNumber(formId, number); |
|
|
|
return kingDeeBillDataByNumber; |
|
|
|
}*/ |
|
|
|
|
|
|
|
/* public ResultBean<List<KingDeeResult>> getKingBillDataInfoList(String formId, String jsonParam) throws Exception { |
|
|
|
*//*String jsonParam="{\\\"FormId\\\":\\\""+KingDeeBillId.BD_MATERIAL+"\\\"," +
|
|
|
|
"\\\"FieldKeys\\\":\\\"\\\",\\\"FilterString\\\":\\\"FName=''\\\",\\\"OrderString\\\":\\\"\\\"," + |
|
|
|
"\\\"TopRowCount\\\":\\\"0\\\",\\\"StartRow\\\":\\\"0\\\",\\\"Limit\\\":\\\"0\\\"}";*//*
|
|
|
|
KingDeeParams kdp = getKingDeeParams(formId, jsonParam); |
|
|
|
log.info("kdp:{}",JSONObject.toJSONString(kdp)); |
|
|
|
ResultBean<List<KingDeeResult>> listResultBean = KingDeeSaveSKD.accessKingDeeInterface(kdp); |
|
|
|
log.info("listResultBean:{}",JSONObject.toJSONString(listResultBean)); |
|
|
|
return listResultBean; |
|
|
|
}*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 调用金蝶接口的数据格式 |
|
|
|