Merge remote-tracking branch 'origin/master'

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

@@ -79,9 +79,9 @@ public class NonPoServerImpl implements NonPoServer {
         String PD = (String) dataForm.get("selectField_mj1cq2oz");//是否生成SAP凭证
         String SAPID = (String) dataForm.get("textField_mejezfwk");//SAP凭证号码
         String SFXCFK = (String) dataForm.get("radioField_mj1gc7qe");//仅携程付款是否
-        String VBUND="";
-        if (dataForm.containsKey("textField_mo8k1bjy")){
-            VBUND=(String) dataForm.get("textField_mo8k1bjy");
+        String VBUND = "";
+        if (dataForm.containsKey("textField_mo8k1bjy")) {
+            VBUND = (String) dataForm.get("textField_mo8k1bjy");
         }
 
         /**
@@ -107,24 +107,30 @@ public class NonPoServerImpl implements NonPoServer {
             sapJson.put("BLDAT", CusutUtil.getFormatDate((Long) dataForm.get("dateField_l9nsavm3"))); //凭证日期ƒ   Date / 申请日期
             String uid = "TEST-CN001";
             String uname = "";
-            if (!dataForm.get("employeeField_mhxdzya9_id").equals("")) {
-
-                com.alibaba.fastjson.JSONArray array = JSON.parseArray(String.valueOf(dataForm.get("employeeField_mhxdzya9_id")));
-                String number = array.getString(0);
-
-                List<Map<String, Object>> conditions = new ArrayList<>(Arrays.asList(buildCondition("textField_l6dddg5k", number, "TEXT", "eq", "TextField")));
-                String listJson = JSON.toJSONString(conditions);
-                YDParam YGydParam = _getYDTokenZXXZ(listJson);
-                List<Map> dataList = (List<Map>) ydClient.queryData(YGydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
-                if (dataList != null && dataList.size() > 0) {
-                    Map map = dataList.get(0);
-                    Map formData = (Map) map.get("formData");
-                    uid = formData.get("textField_l6djch1m").toString();
-                    uid = "CHN-0" + uid;
+            if (dataForm.containsKey("employeeField_mhxdzya9") ){
+                if (!dataForm.get("employeeField_mhxdzya9_id").equals("")) {
+
+                    com.alibaba.fastjson.JSONArray array = JSON.parseArray(String.valueOf(dataForm.get("employeeField_mhxdzya9_id")));
+                    String number = array.getString(0);
+
+                    List<Map<String, Object>> conditions = new ArrayList<>(Arrays.asList(buildCondition("textField_l6dddg5k", number, "TEXT", "eq", "TextField")));
+                    String listJson = JSON.toJSONString(conditions);
+                    YDParam YGydParam = _getYDTokenZXXZ(listJson);
+                    List<Map> dataList = (List<Map>) ydClient.queryData(YGydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
+                    if (dataList != null && dataList.size() > 0) {
+                        Map map = dataList.get(0);
+                        Map formData = (Map) map.get("formData");
+                        uid = formData.get("textField_l6djch1m").toString();
+                        uid = "CHN-0" + uid;
+                    }
                 }
+            }else {
+
+                uid="CHN-01000332";
             }
-            // uid="CHN-01000332";
-            // uid = "CHN-01000332";//测试过账人
+
+
+            //uid = "CHN-01000332";//测试过账人
             sapJson.put("USNAM", uid);   //过账人
             sapJson.put("BUDAT", CusutUtil.getFormatDate((Long) dataForm.get("dateField_mhxdzyaa")));  //过账日期
             sapJson.put("ZOA_TYPE", dataForm.get("selectField_mejfoona").equals("无票预付") || dataForm.get("selectField_mejfoona").equals("100%清预付款") || dataForm.get("selectField_mejfoona").equals("100%清收据") ? "AD" : "NP");//OA单据类型
@@ -152,7 +158,11 @@ public class NonPoServerImpl implements NonPoServer {
                         JSONObject itemObj = new JSONObject();
                         itemObj.put("KOSTL", String.valueOf(row.get("textField_mi5kjmwk"))); //成本中心
                         itemObj.put("DMBTR", String.valueOf(row.get("numberField_l6ujr47g_value")));  //不含税金额
-                        itemObj.put("XREF1", "");//参考码  9000242
+                        itemObj.put("XREF1", "");//参考码1  9000242
+                        if (row.containsKey("textField_mrn3t7rg")) {
+                            itemObj.put("XREF2", String.valueOf(row.get("textField_mrn3t7rg")));//参考码2
+                        }
+
 
                         String sjItemNo = "";
                         if (x < 10) {
@@ -169,7 +179,7 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("MWSKZ", String.valueOf(row.get("textField_l7a6bzpv")));///税码
                         itemObj.put("ZTAX_AMT", String.valueOf(row.get("numberField_memejxqp")).equals("") ? "0" : String.valueOf(row.get("numberField_memejxqp")));  //税额
                         itemObj.put("SGTXT", String.valueOf(row.get("textField_mejfoonz")));  //行项目文本
-                        itemObj.put("VBUND",VBUND);//贸易伙伴的公司标识
+                        itemObj.put("VBUND", VBUND);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 
@@ -180,7 +190,7 @@ public class NonPoServerImpl implements NonPoServer {
             } else if (dataForm.get("selectField_mejfoona").equals("无票预付")) {
 
                 sapJson.put("BLART", "Z4");//凭证类型
-            if (dataForm.containsKey("selectField_mmcx7567")) {
+                if (dataForm.containsKey("selectField_mmcx7567")) {
                     if (!"".equals(dataForm.get("selectField_mmcx7567").toString())) {
                         sapJson.put("UMSKZ", dataForm.get("selectField_mmcx7567").toString());//特别总账标识
                     } else {
@@ -204,7 +214,8 @@ public class NonPoServerImpl implements NonPoServer {
                 itemObject.put("ZTAXOUT_AMT", "0");       //进项税转出金额
                 itemObject.put("SGTXT", "");       //行项目文本
                 itemObject.put("XREF1", dataForm.get("textareaField_mejfoonw")); //cir项目号
-                itemObject.put("VBUND",VBUND);//贸易伙伴的公司标识
+
+                itemObject.put("VBUND", VBUND);//贸易伙伴的公司标识
                 SapItem.put(itemObject);
                 sapJson.put("ITEM", SapItem);
             } else if (dataForm.get("selectField_mejfoona").equals("收据支付")) {
@@ -221,6 +232,10 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("KOSTL", String.valueOf(row.get("textField_mi7c3wku"))); //成本中心
                         itemObj.put("DMBTR", String.valueOf(row.get("numberField_mi7c3wky_value")));  //不含税金额
                         itemObj.put("XREF1", row.get("textField_mne91q1d") != null ? String.valueOf(row.get("textField_mne91q1d")) : "");//参考码  9000242
+                        if (row.containsKey("textField_mrn3t7ri")) {
+                            itemObj.put("XREF2", String.valueOf(row.get("textField_mrn3t7ri")));//参考码2
+                        }
+
                         String sjItemNo = "";
                         if (x < 10) {
                             sjItemNo += "00" + x;
@@ -236,7 +251,7 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("MWSKZ", "");///税码
                         itemObj.put("ZTAX_AMT", "0");  //税额
                         itemObj.put("SGTXT", String.valueOf(row.get("textField_mi7c3wkn")));  //行项目文本
-                        itemObj.put("VBUND",VBUND);//贸易伙伴的公司标识
+                        itemObj.put("VBUND", VBUND);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 
@@ -291,7 +306,10 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("KOSTL", String.valueOf(row.get("textField_mi5kjmwk"))); //成本中心
                         itemObj.put("DMBTR", String.valueOf(row.get("numberField_l6ujr47g_value")));  //不含税金额
                         itemObj.put("XREF1", XREF1);//参考码1
-                        itemObj.put("XREF2", XREF2);//参考码2
+                        //itemObj.put("XREF2", XREF2);//参考码2
+                        if (row.containsKey("textField_mrn3t7rg")) {
+                            itemObj.put("XREF2", String.valueOf(row.get("textField_mrn3t7rg")));//参考码2
+                        }
                         String sjItemNo = "";
                         if (x < 10) {
                             sjItemNo += "00" + x;
@@ -307,7 +325,7 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("MWSKZ", String.valueOf(row.get("textField_l7a6bzpv")));///税码
                         itemObj.put("ZTAX_AMT", String.valueOf(row.get("numberField_memejxqp")).equals("") ? "0" : String.valueOf(row.get("numberField_memejxqp")));  //税额
                         itemObj.put("SGTXT", String.valueOf(row.get("textField_mejfoonz")));  //行项目文本
-                        itemObj.put("VBUND",VBUND);//贸易伙伴的公司标识
+                        itemObj.put("VBUND", VBUND);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 
@@ -360,7 +378,10 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("KOSTL", String.valueOf(row.get("textField_mi7c3wku"))); //成本中心
                         itemObj.put("DMBTR", String.valueOf(row.get("numberField_mi7c3wky_value")));  //不含税金额
                         itemObj.put("XREF1", XREF1);//参考码1
-                        itemObj.put("XREF2", XREF2);//参考码2
+                       // itemObj.put("XREF2", XREF2);//参考码2
+                        if (row.containsKey("textField_mrn3t7ri")) {
+                            itemObj.put("XREF2", String.valueOf(row.get("textField_mrn3t7ri")));//参考码2
+                        }
                         String sjItemNo = "";
                         if (x < 10) {
                             sjItemNo += "00" + x;
@@ -376,7 +397,7 @@ public class NonPoServerImpl implements NonPoServer {
                         itemObj.put("MWSKZ", "");///税码
                         itemObj.put("ZTAX_AMT", "0");  //税额
                         itemObj.put("SGTXT", String.valueOf(row.get("textField_mi7c3wkn")));  //行项目文本
-                        itemObj.put("VBUND",VBUND);//贸易伙伴的公司标识
+                        itemObj.put("VBUND", VBUND);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }