소스 검색

RTR 业务计提

lfx 3 주 전
부모
커밋
5ce4a00b73
1개의 변경된 파일23개의 추가작업 그리고 25개의 파일을 삭제
  1. 23 25
      mjava-ts/src/main/java/com/malk/taisen/service/impl/RtrServerImpl.java

+ 23 - 25
mjava-ts/src/main/java/com/malk/taisen/service/impl/RtrServerImpl.java

@@ -47,9 +47,7 @@ public class RtrServerImpl implements RtrServer {
     public void RtrInsetSAP0005(String type,String formUuid, String InstanceId) {
         DDR_New ddr = ydClient.queryData(YDParam.builder().formInstId(InstanceId).build(), YDConf.FORM_QUERY.retrieve_id);
         Map dataForm = ddr.getFormData();
-
         JSONObject sapJson = new JSONObject();
-        JSONObject upJson = new JSONObject();
         // 添加顶级键值对
         sapJson.put("BLART", "Z5");//凭证类型
         sapJson.put("ZOA_TYPE", "GL");//总账类型
@@ -85,9 +83,9 @@ public class RtrServerImpl implements RtrServer {
         //获取子表
         if (type.equals("YWJT")) {
             JSONArray itemArray = new JSONArray();
+            Boolean isOtherTypeFor = formUuid.equals("FORM-66A4F00A1E0E4E67B607D4119B88CEF6FBP6")&&"其他".equals(UtilMap.getString(dataForm,"radioField_mj1hb0kj"));
             int x = 1;//OA单据行号累计用
-            List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_mipgl0vx").build());
-//            List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_mipgl0vx");
+            List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId(isOtherTypeFor?"tableField_mk7rt61h":"tableField_mipgl0vx").build());
             if (tableFils != null && tableFils.size() > 0) {
                 for (int n = 0; n < tableFils.size(); n++) {
                     Map<String, Object> row = new HashMap(tableFils.get(n));
@@ -104,21 +102,21 @@ public class RtrServerImpl implements RtrServer {
                     itemObj.put("ZOA_ITEMNO", sjItemNo);//OA单据行号
                     itemObj.put("SHKZG", "S");//  S借方
                     itemObj.put("ZTAXOUT_AMT", "0"); // 进项转出金额
-                    itemObj.put("ZTAX_AMT", UtilMap.getString_default(row,"numberField_miwh5y8a_value","0")); // 税额
+                    itemObj.put("ZTAX_AMT", UtilMap.getString_default(row,isOtherTypeFor?"numberField_mk7rt61g_value":"numberField_miwh5y8a_value","0")); // 税额
 //                    itemObj.put("HKONT", String.valueOf(row.get("textField_mipgl0w1"))); //会计科目:取接口行项目接口字段会计科目 HKONT
-                    itemObj.put("HKONT", String.valueOf(row.get("textField_miwh5y87"))); //会计科目:取接口行项目接口字段会计科目 HKONT
-                    itemObj.put("DMBTR", String.valueOf(row.get("numberField_mipgl0w2_value")));  //凭证金额:取接口行项目接口字段 DMBTR
-                    itemObj.put("KOSTL", String.valueOf(row.get("textField_mipgl0w3"))); //成本中心:取接口行项目接口字段成本中心KOSTL
-                    itemObj.put("AUFNR", String.valueOf(row.get("textField_mipgl0w4"))); //订单:取接口行项目接口字段订单 AUFNR
-                    itemObj.put("PS_POSID", String.valueOf(row.get("textField_mipgl0w5"))); //WBS:职接口行项目接口字段 WBS元素 PS_POSID
-                    itemObj.put("MWSKZ", String.valueOf(row.get("textField_mipgl0w6")));///税码:取总账通用工单的行项目的税码,接口字段MWSKZ
-                    itemObj.put("ZUONR", String.valueOf(row.get("textField_mipgl0w7")));///分配:取接口行项目接口字段分配 ZUONR
-                    itemObj.put("XREF1", String.valueOf(row.get("textField_miwh5y88")));///参考码1:取接口行项目接口字段 XREF1
-                    itemObj.put("SGTXT", String.valueOf(row.get("textareaField_miwh5y86")));///行项目文本:取接口行项目接口字段行项目文本 SGTXT
+                    itemObj.put("HKONT", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt617":"textField_miwh5y87"))); //会计科目:取接口行项目接口字段会计科目 HKONT
+                    itemObj.put("DMBTR", String.valueOf(row.get(isOtherTypeFor?"numberField_mk7rt619_value":"numberField_mipgl0w2_value")));  //凭证金额:取接口行项目接口字段 DMBTR
+                    itemObj.put("KOSTL", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61a":"textField_mipgl0w3"))); //成本中心:取接口行项目接口字段成本中心KOSTL
+                    itemObj.put("AUFNR", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61b":"textField_mipgl0w4"))); //订单:取接口行项目接口字段订单 AUFNR
+                    itemObj.put("PS_POSID", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61c":"textField_mipgl0w5"))); //WBS:职接口行项目接口字段 WBS元素 PS_POSID
+                    itemObj.put("MWSKZ", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61d":"textField_mipgl0w6")));///税码:取总账通用工单的行项目的税码,接口字段MWSKZ
+                    itemObj.put("ZUONR", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61e":"textField_mipgl0w7")));///分配:取接口行项目接口字段分配 ZUONR
+                    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
                     itemArray.put(itemObj);
                 }
             }
-            List<Map> tableFils2 = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_miwh5y8n").build());
+            List<Map> tableFils2 = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId(isOtherTypeFor?"tableField_mk7rt61v":"tableField_miwh5y8n").build());
 //            List<Map<String, Object>> tableFils2 = (List<Map<String, Object>>) dataForm.get("tableField_miwh5y8n");
             if (tableFils2 != null && tableFils2.size() > 0) {
                 for (int n = 0; n < tableFils2.size(); n++) {
@@ -136,17 +134,17 @@ public class RtrServerImpl implements RtrServer {
                     x++;
                     itemObj.put("ZOA_ITEMNO", sjItemNo);//OA单据行号
                     itemObj.put("ZTAXOUT_AMT", "0"); // 进项转出金额
-                    itemObj.put("ZTAX_AMT", UtilMap.getString_default(row,"numberField_miwh5y8m_value","0")); // 税额
+                    itemObj.put("ZTAX_AMT", UtilMap.getString_default(row,isOtherTypeFor?"numberField_mk7rt61u_value":"numberField_miwh5y8m_value","0")); // 税额
 //                    itemObj.put("HKONT", String.valueOf(row.get("textField_miwh5y8d"))); //会计科目:取接口行项目接口字段会计科目 HKONT
-                    itemObj.put("HKONT", String.valueOf(row.get("textField_miwh5y8e"))); //会计科目:取接口行项目接口字段会计科目 HKONT
-                    itemObj.put("DMBTR", String.valueOf(row.get("numberField_miwh5y8f_value")));  //凭证金额:取接口行项目接口字段 DMBTR
-                    itemObj.put("KOSTL", String.valueOf(row.get("textField_miwh5y8g"))); //成本中心:取接口行项目接口字段成本中心KOSTL
-                    itemObj.put("AUFNR", String.valueOf(row.get("textField_miwh5y8h"))); //订单:取接口行项目接口字段订单 AUFNR
-                    itemObj.put("PS_POSID", String.valueOf(row.get("textField_miwh5y8i"))); //WBS:职接口行项目接口字段 WBS元素 PS_POSID
-                    itemObj.put("MWSKZ", String.valueOf(row.get("textField_miwh5y8j")));///税码:取总账通用工单的行项目的税码,接口字段MWSKZ
-                    itemObj.put("ZUONR", String.valueOf(row.get("textField_miwh5y8k")));///分配:取接口行项目接口字段分配 ZUONR
-                    itemObj.put("XREF1", String.valueOf(row.get("textField_miwh5y8l")));///参考码1:取接口行项目接口字段 XREF1
-                    itemObj.put("SGTXT", String.valueOf(row.get("textareaField_miwh5y8c")));///行项目文本:取接口行项目接口字段行项目文本 SGTXT
+                    itemObj.put("HKONT", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61k":"textField_miwh5y8e"))); //会计科目:取接口行项目接口字段会计科目 HKONT
+                    itemObj.put("DMBTR", String.valueOf(row.get(isOtherTypeFor?"numberField_mk7rt61m_value":"numberField_miwh5y8f_value")));  //凭证金额:取接口行项目接口字段 DMBTR
+                    itemObj.put("KOSTL", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61n":"textField_miwh5y8g"))); //成本中心:取接口行项目接口字段成本中心KOSTL
+                    itemObj.put("AUFNR", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61o":"textField_miwh5y8h"))); //订单:取接口行项目接口字段订单 AUFNR
+                    itemObj.put("PS_POSID", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61p":"textField_miwh5y8i"))); //WBS:职接口行项目接口字段 WBS元素 PS_POSID
+                    itemObj.put("MWSKZ", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61q":"textField_miwh5y8j")));///税码:取总账通用工单的行项目的税码,接口字段MWSKZ
+                    itemObj.put("ZUONR", String.valueOf(row.get(isOtherTypeFor?"textField_mk7rt61r":"textField_miwh5y8k")));///分配:取接口行项目接口字段分配 ZUONR
+                    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
 
                     itemArray.put(itemObj);
                 }