|
|
@@ -86,7 +86,8 @@ public class RtrServerImpl implements RtrServer {
|
|
|
//获取子表
|
|
|
if (type.equals("YWJT")) {
|
|
|
JSONArray itemArray = new JSONArray();
|
|
|
- Boolean isOtherTypeFor = (formUuid.equals("FORM-66A4F00A1E0E4E67B607D4119B88CEF6FBP6")||formUuid.equals("FORM-2CB3F7D8B4224AB9972A8C24CDBF3464C1OU"))&&"其他".equals(UtilMap.getString(dataForm,"radioField_mj1hb0kj"));
|
|
|
+ Boolean isOtherTypeFor = (formUuid.equals("FORM-66A4F00A1E0E4E67B607D4119B88CEF6FBP6")||formUuid.equals("FORM-2CB3F7D8B4224AB9972A8C24CDBF3464C1OU"))
|
|
|
+ &&Arrays.asList("其他","资金").contains(UtilMap.getString(dataForm,"radioField_mj1hb0kj"));
|
|
|
int x = 1;//OA单据行号累计用
|
|
|
List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId(isOtherTypeFor?"tableField_mk7rt61h":"tableField_mipgl0vx").build());
|
|
|
if (tableFils != null && tableFils.size() > 0) {
|
|
|
@@ -117,6 +118,9 @@ public class RtrServerImpl implements RtrServer {
|
|
|
itemObj.put("XREF1", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61f":"textField_miwh5y88")));///参考码1:取接口行项目接口字段 XREF1
|
|
|
itemObj.put("SGTXT", String.valueOf(row.get(isOtherTypeFor?"textareaField_mk7rt616":"textareaField_miwh5y86")));///行项目文本:取接口行项目接口字段行项目文本 SGTXT
|
|
|
itemObj.put("VBUND", UtilMap.getString_default(row,isOtherTypeFor?"selectField_moccqmz4":"selectField_moccqmz2","")); //贸易伙伴 VBUND
|
|
|
+ if(isOtherTypeFor&&"资金".equals(UtilMap.getString(dataForm,"radioField_mj1hb0kj"))){
|
|
|
+ itemObj.put("RSTGR", UtilMap.getString_default(row,"selectField_mrlu1hs1","").split("-")[0]); // 原因代码
|
|
|
+ }
|
|
|
itemArray.put(itemObj);
|
|
|
}
|
|
|
}
|
|
|
@@ -150,6 +154,9 @@ public class RtrServerImpl implements RtrServer {
|
|
|
itemObj.put("XREF1", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61s":"textField_miwh5y8l")));///参考码1:取接口行项目接口字段 XREF1
|
|
|
itemObj.put("SGTXT", String.valueOf(row.get(isOtherTypeFor?"textareaField_mk7rt61j":"textareaField_miwh5y8c")));///行项目文本:取接口行项目接口字段行项目文本 SGTXT
|
|
|
itemObj.put("VBUND", UtilMap.getString_default(row,isOtherTypeFor?"selectField_moccqmz5":"selectField_moccqmz3","")); //贸易伙伴 VBUND
|
|
|
+ if(isOtherTypeFor&&"资金".equals(UtilMap.getString(dataForm,"radioField_mj1hb0kj"))){
|
|
|
+ itemObj.put("RSTGR", UtilMap.getString_default(row,"selectField_mrlu1hs2","").split("-")[0]); // 原因代码
|
|
|
+ }
|
|
|
itemArray.put(itemObj);
|
|
|
}
|
|
|
}
|