violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: violet:67fec9f726fbcf4516e8cffbf8d2ac7c0e14ec00
Branches Tags
violet:main
violet:test
violet:dev-1217-req
violet:dev-new-test
violet:dev-comp-price
violet:dev-ljw
violet:dev_zhouc
violet:dev-zhouc
violet:dev-plm
violet:dev-change
violet:fix-warehouse
violet:fix-report-zzs
violet:dev-zzs
violet:dev-price
violet:dev-calc
...
compare: violet:3e92771397662c6fbf0a4419bd308cee7997fd79
Branches Tags
violet:test
violet:main
violet:dev-1217-req
violet:dev-new-test
violet:dev-comp-price
violet:dev-ljw
violet:dev_zhouc
violet:dev-zhouc
violet:dev-plm
violet:dev-change
violet:fix-warehouse
violet:fix-report-zzs
violet:dev-zzs
violet:dev-price
violet:dev-calc

2 Commits
67fec9f726 ... 3e92771397

Author SHA1 Message Date
zhouc
3e92771397 Merge remote-tracking branch 'origin/test' into test 2024-10-31 20:06:36 +08:00
zhouc
963efc52d0 1.修改同步云之家拼接json中存在空行数据问题 2024-10-31 20:06:08 +08:00
2 changed files with 17 additions and 9 deletions
Show Stats Expand all files Collapse all files

12
src/main/java/com/yem/ia/intebilllogon/Utils/ObjectToJsonUtils.java
View File

@ -296,7 +296,9 @@ public class ObjectToJsonUtils {
}
}
}
jsonArray.add(entityObject);
if(entityObject.size()>0){
jsonArray.add(entityObject);
}
}
} else {
JSONObject entityObject = new JSONObject();
@ -382,7 +384,9 @@ public class ObjectToJsonUtils {
}
}
}
jsonArray.add(entityObject);
if(entityObject.size()>0){
jsonArray.add(entityObject);
}
}
}
}
@ -430,7 +434,9 @@ public class ObjectToJsonUtils {
}
}
}
jsonArray.add(entityObject);
if(entityObject.size()>0){
jsonArray.add(entityObject);
}
}
}
widgetValueEntry.put("widgetValue", jsonArray);

14
src/main/java/com/yem/ia/intebilllogon/form/intebilllogonDemo.java
View File

@ -194,10 +194,12 @@ public class intebilllogonDemo extends AbstractBillPlugIn {
if (key.equals("generatejson_zz")) {
DynamicObject yemFormid = dataEntity.getDynamicObject("yem_formid");
if (yemFormid != null) {
Map map = new HashMap<>();
map.put("entityName", yemFormid.getString("number"));
// map.put("billtype","yem_orderproreqbill_DB");
JSONObject json = ObjectToJsonUtils.ObjectToJson(dataEntity.getLong("yem_formcode"), map);
long yem_formcode = dataEntity.getLong("yem_formcode");
if(yem_formcode==0){
this.getView().showErrorNotification("请选择单据后重试！");
return;
}
JSONObject json = ObjectToJsonUtils.ToJson(dataEntity, yem_formcode, yemFormid.getString("number"), " ");
this.getView().getModel().setValue("yem_generatejson", json);
this.getView().showSuccessNotification("获取完成！");
} else {
@ -230,7 +232,7 @@ public class intebilllogonDemo extends AbstractBillPlugIn {
}
if (fag) {
//获取云之家token
String url = YunzhijiaUtils.yzjurl+"/cmmpapi/cmmp/fileToken.do?tokenId=D4EB05B9FE9C41D0868D33EC92AAEDB4";
String url = YunzhijiaUtils.yzjurl + "/cmmpapi/cmmp/fileToken.do?tokenId=D4EB05B9FE9C41D0868D33EC92AAEDB4";
String Token = "";
try {
Token = YunzhijiaUtils.doPost(url, "");
@ -301,7 +303,7 @@ public class intebilllogonDemo extends AbstractBillPlugIn {
return;
}
//获取云之家token
String url = YunzhijiaUtils.yzjurl+"/cmmpapi/cmmp/fileToken.do?tokenId=D4EB05B9FE9C41D0868D33EC92AAEDB4";
String url = YunzhijiaUtils.yzjurl + "/cmmpapi/cmmp/fileToken.do?tokenId=D4EB05B9FE9C41D0868D33EC92AAEDB4";
String Token = "";
try {
Token = YunzhijiaUtils.doPost(url, "");