Merge remote-tracking branch 'origin/master'

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

@@ -79,6 +79,11 @@ 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");
+        }
+
         /**
          * 是否需要生成SAP凭证
          */
@@ -164,8 +169,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);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 
@@ -176,8 +180,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 {
@@ -201,7 +204,7 @@ 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);//贸易伙伴的公司标识
                 SapItem.put(itemObject);
                 sapJson.put("ITEM", SapItem);
             } else if (dataForm.get("selectField_mejfoona").equals("收据支付")) {
@@ -217,31 +220,7 @@ public class NonPoServerImpl implements NonPoServer {
                         JSONObject itemObj = new JSONObject();
                         itemObj.put("KOSTL", String.valueOf(row.get("textField_mi7c3wku"))); //成本中心
                         itemObj.put("DMBTR", String.valueOf(row.get("numberField_mi7c3wky_value")));  //不含税金额
-                        if (dataForm.get("textField_mi73dy3n").equals("NP6610260041")) {
-                            itemObj.put("XREF1", "N30340072");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260040")) {
-                            itemObj.put("XREF1", "N30120071");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260039")) {
-                            itemObj.put("XREF1", "N30430046");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260041")) {
-                            itemObj.put("XREF1", "N30340072");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260038")) {
-                            itemObj.put("XREF1", "N30490028");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260035")) {
-                            itemObj.put("XREF1", "N30340072");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260033")) {
-                            itemObj.put("XREF1", "N30190066");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260032")) {
-                            itemObj.put("XREF1", "N30380070");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260046")) {
-                            itemObj.put("XREF1", "N30330069");//参考码  9000242
-                        } else if (dataForm.get("textField_mi73dy3n").equals("NP6610260045")) {
-                            itemObj.put("XREF1", "N30290072");//参考码  9000242
-                        } else {
-                            itemObj.put("XREF1", "");//参考码  9000242
-                        }
-
-
+                        itemObj.put("XREF1", row.get("textField_mne91q1d") != null ? String.valueOf(row.get("textField_mne91q1d")) : "");//参考码  9000242
                         String sjItemNo = "";
                         if (x < 10) {
                             sjItemNo += "00" + x;
@@ -257,6 +236,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);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 
@@ -327,6 +307,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);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 
@@ -395,6 +376,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);//贸易伙伴的公司标识
                         itemArray.put(itemObj);
                     }
 

mjava-ts/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
   servlet:
     context-path: /api/ts
 npo:
-  scheduling: true
+  scheduling: false
 
 enable:
   scheduling: false

mjava-ts/src/main/resources/application-test.yml

@@ -5,7 +5,7 @@ server:
     context-path: /apits
 
 npo:
-  scheduling: true
+  scheduling: false
 
 enable:
   scheduling: false