Merge remote-tracking branch 'origin/master'

mjava-ts/src/main/java/com/malk/taisen/service/NonPoServer.java

@@ -4,7 +4,8 @@ public interface NonPoServer {
 
     void  NonPoinsetSAP0005(String type,String InstanceId);
 
-    void  NonPoinsetSAP0005list( );
+    void
+    NonPoinsetSAP0005list( );
 
     void  FPGX(String InstanceId,String voucherNumber,String OAnumber);
 

mjava-ts/src/main/java/com/malk/taisen/service/impl/NonPoServerImpl.java

@@ -48,6 +48,7 @@ public class NonPoServerImpl implements NonPoServer {
      */
 
     private String QA_sapUrl = "https://etl-nonprod-tasks.tysondt.com:443/api/1/rest/feed/run/task/TysonNonProd/Ultra_PoC/10-QA-team-fssc/tk_oa_to_sap_p2p?bearer_token=bBiGTA7PS0JJ6wKhQU8Vm0vLsIDNjLaN&interface_id=";
+    private String formUuid = "FORM-E9A6EBE00F3E4DA68681107F85600D80ZJUT";
 
     //    @Override
     public void NonPoinsetSAP0005(String type, String InstanceId) {
@@ -111,7 +112,10 @@ public class NonPoServerImpl implements NonPoServer {
                 sapJson.put("BLART", "Z2");//凭证类型
                 JSONArray itemArray = new JSONArray();
                 int x = 1;//OA单据行号累计用
-                List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_l6ujr47b");
+
+                List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_l6ujr47b").build());
+
+                // List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_l6ujr47b");
                 if (tableFils != null && tableFils.size() > 0) {
                     for (int n = 0; n < tableFils.size(); n++) {
                         Map<String, Object> row = new HashMap(tableFils.get(n));
@@ -173,7 +177,8 @@ public class NonPoServerImpl implements NonPoServer {
                 sapJson.put("BLART", "Z2");//凭证类型
                 JSONArray itemArray = new JSONArray();
                 int x = 1;//OA单据行号累计用
-                List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_mi7c3wl9");
+                List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_mi7c3wl9").build());
+            //List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_mi7c3wl9");
                 if (tableFils != null && tableFils.size() > 0) {
                     for (int n = 0; n < tableFils.size(); n++) {
                         Map<String, Object> row = new HashMap(tableFils.get(n));
@@ -207,8 +212,8 @@ public class NonPoServerImpl implements NonPoServer {
                 /***
                  *  获取参考代码1 2
                  */
-
-                List<Map<String, Object>> XREFlist = (List<Map<String, Object>>) dataForm.get("tableField_mi8q495e");
+                List<Map> XREFlist = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_mi8q495e").build());
+              //  List<Map<String, Object>> XREFlist = (List<Map<String, Object>>) dataForm.get("tableField_mi8q495e");
 
                 if (XREFlist != null && !XREFlist.isEmpty()) {
                     if (XREFlist.size() == 1) {
@@ -238,7 +243,9 @@ public class NonPoServerImpl implements NonPoServer {
                 sapJson.put("BLART", "Z2");//凭证类型
                 JSONArray itemArray = new JSONArray();
                 int x = 1;//OA单据行号累计用
-                List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_l6ujr47b");
+
+                List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_l6ujr47b").build());
+              //  List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_l6ujr47b");
                 if (tableFils != null && tableFils.size() > 0) {
                     for (int n = 0; n < tableFils.size(); n++) {
                         Map<String, Object> row = new HashMap(tableFils.get(n));
@@ -277,8 +284,8 @@ public class NonPoServerImpl implements NonPoServer {
                 /***
                  *  获取参考代码1 2
                  */
-
-                List<Map<String, Object>> XREFlist = (List<Map<String, Object>>) dataForm.get("tableField_mi8q495e");
+                List<Map> XREFlist = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_mi8q495e").build());
+              //  List<Map<String, Object>> XREFlist = (List<Map<String, Object>>) dataForm.get("tableField_mi8q495e");
 
                 if (XREFlist != null && !XREFlist.isEmpty()) {
                     if (XREFlist.size() == 1) {
@@ -307,7 +314,8 @@ public class NonPoServerImpl implements NonPoServer {
                 sapJson.put("BLART", "Z2");//凭证类型
                 JSONArray itemArray = new JSONArray();
                 int x = 1;//OA单据行号累计用
-                List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_mi7c3wl9");
+                List<Map> tableFils = ydService.queryDetails(YDParam.builder().formInstanceId(InstanceId).formUuid(formUuid).tableFieldId("tableField_mi7c3wl9").build());
+              //  List<Map<String, Object>> tableFils = (List<Map<String, Object>>) dataForm.get("tableField_mi7c3wl9");
                 if (tableFils != null && tableFils.size() > 0) {
                     for (int n = 0; n < tableFils.size(); n++) {
                         Map<String, Object> row = new HashMap(tableFils.get(n));
@@ -410,7 +418,7 @@ public class NonPoServerImpl implements NonPoServer {
             for (Map<String, Object> map : dataList) {
                 String insetid = map.get("formInstanceId").toString();
 
-               // this.NonPoinsetSAP0005("", insetid);
+                // this.NonPoinsetSAP0005("", insetid);
 
             }
         }
@@ -772,12 +780,12 @@ public class NonPoServerImpl implements NonPoServer {
     public static YDParam _getYDTokenZXXZ(String searchFieldJson) {
         return YDParam.builder().appType("APP_N9NPHVTQLPBPO8MR6WFG").systemToken("UM6660D1PGF2O34KAVVKG8XZ756E3O06MZX5LW").formUuid("FORM-4J7669A10FO250UJ9C6Q7CM00PC62YPW8DD6LT").searchFieldJson(searchFieldJson).build();
     }
+
     public static YDParam _getNPonlist(String searchFieldJson) {
-        return YDParam.builder().appType("APP_N9NPHVTQLPBPO8MR6WFG").systemToken("UM6660D1PGF2O34KAVVKG8XZ756E3O06MZX5LW").formUuid("FORM-E9A6EBE00F3E4DA68681107F85600D80ZJUT") .searchFieldJson(searchFieldJson) .approvedResult("agree").build();
+        return YDParam.builder().appType("APP_N9NPHVTQLPBPO8MR6WFG").systemToken("UM6660D1PGF2O34KAVVKG8XZ756E3O06MZX5LW").formUuid("FORM-E9A6EBE00F3E4DA68681107F85600D80ZJUT").searchFieldJson(searchFieldJson).approvedResult("agree").build();
     }
 
 
-
     //匹配条件用
     private static final String KEY = "key";
     private static final String VALUE = "value";