NPO 冲销处理

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

@@ -114,7 +114,7 @@ public class NonPoServerImpl implements NonPoServer {
                 }
             }
             // 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单据类型
@@ -171,7 +171,16 @@ public class NonPoServerImpl implements NonPoServer {
             } else if (dataForm.get("selectField_mejfoona").equals("无票预付")) {
 
                 sapJson.put("BLART", "Z4");//凭证类型
-                sapJson.put("UMSKZ", "A");//特别总账标识
+
+                if (dataForm.containsKey("selectField_mmcx7567")) {
+                    if (!"".equals(dataForm.get("selectField_mmcx7567").toString())) {
+                        sapJson.put("UMSKZ", dataForm.get("selectField_mmcx7567").toString());//特别总账标识
+                    } else {
+                        sapJson.put("UMSKZ", "A");//特别总账标识
+                    }
+                } else {
+                    sapJson.put("UMSKZ", "A");//特别总账标识
+                }
                 JSONArray SapItem = new JSONArray();       //子表
                 JSONObject itemObject = new JSONObject();
                 itemObject.put("ZOA_ITEMNO", "001");       //OA单据行号
@@ -693,8 +702,8 @@ public class NonPoServerImpl implements NonPoServer {
                     body.put("ZOA_TYPE", "NP");
 
                     if (detail.containsKey("textField_mkxd96yz")) {
-                        if (!"".equals(detail.get("textField_mkxd96yz").toString())   && detail.get("textField_mkxd96yz").toString() != null) {
-                            body.put("ZOA_NUMBER",   detail.get("textField_mkxd96yz").toString() );
+                        if (!"".equals(detail.get("textField_mkxd96yz").toString()) && detail.get("textField_mkxd96yz").toString() != null) {
+                            body.put("ZOA_NUMBER", detail.get("textField_mkxd96yz").toString());
                         } else {
                             body.put("ZOA_NUMBER", ZOA_NUMBER);
                         }
@@ -721,15 +730,15 @@ public class NonPoServerImpl implements NonPoServer {
                         if (!"".equals(detail.get("dateField_mkxd96z1").toString())) {
                             body.put("BUDAT", CusutUtil.getFormatDate((long) detail.get("dateField_mkxd96z1")));
                         } else {
-                           // body.put("BUDAT", "");
+                            // body.put("BUDAT", "");
                         }
-                    }else {
-                     //   body.put("BUDAT", "");
+                    } else {
+                        //   body.put("BUDAT", "");
                     }
 
 
                     Map result = this._pushSPCX(body);
-                    if (result!=null && result.size()>0){
+                    if (result != null && result.size() > 0) {
                         // prd 重复推送标记成功
                         if ("S".equals(result.get("E_SYSMSGTYPE")) || "post operation had already been done, repeat is not allowed".equals(result.get("E_MESSAGE"))) {
                             detail.put("selectField_mkxoe0yk", "成功");
@@ -741,7 +750,7 @@ public class NonPoServerImpl implements NonPoServer {
                             fail += 1;
                         }
                         detail.put("textareaField_mkxuo69d", result.get("E_MESSAGE"));
-                    }else {
+                    } else {
                         detail.put("selectField_mkxoe0yk", "失败");
                         detail.put("textareaField_mkxuo69d", "失败，请检查后提交");
                         fail += 1;
@@ -794,12 +803,11 @@ public class NonPoServerImpl implements NonPoServer {
             McException.assertAccessException(result.isEmpty(), "Sap接口请求异常, 返回空集合, 需重新推送.");
             return result.get(0);
 
-        }catch (Exception e){
-            return  new HashMap<>();
+        } catch (Exception e) {
+            return new HashMap<>();
         }
 
 
-
     }