Merge branch 'master' of http://111.75.220.136:10030/turborao/jyyy

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/mservice/SyncSapFIUtils.java

@@ -182,8 +182,8 @@ public class SyncSapFIUtils {
         ENTRYITEMINFO.put("SGTXT", SGTXT); //凭证摘要
         ENTRYITEMINFO.put("WAERS", WAERS); //币种
         ENTRYITEMINFO.put("ZZTM", ZZTM); //法定账套
-        ENTRYITEMINFO.put("WRBTR", WRBTR); //原币金额
-        ENTRYITEMINFO.put("DMBTR", DMBTR); //本币金额
+        ENTRYITEMINFO.put("WRBTR", WRBTR.toString()); //原币金额
+        ENTRYITEMINFO.put("DMBTR", DMBTR.toString()); //本币金额
         ENTRYITEMINFO.put("ZFBDT", ZFBDT); //到期日
         ENTRYITEMINFO.put("MWSKZ", "");    //税控
         ENTRYITEMINFO.put("KOSTL", KOSTL); //成本中心

code/jyyy/nckd-jimin-jyyy-fi/src/main/java/nckd/jimin/jyyy/fi/mservice/impl/SynSapFIServiceImpl.java

@@ -98,6 +98,11 @@ public class SynSapFIServiceImpl implements SynSapService {
                 err.append("同步失败,SAP凭证:" + voucherInfo);
             }
             JSONObject rsJson = JSONObject.parseObject(response);
+            if (rsJson == null) {
+                result.put("code", "302");
+                result.put("msg", "同步SAP凭证没的返回值，请检查SAP是否正常；");
+                return result;
+            }
             JSONObject reEt = rsJson.getJSONObject("ET_RETURN");
             JSONArray item = reEt.getJSONArray("item");
             for (int i = 0; i < item.size(); i++) {