NPO问题处理

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

@@ -61,17 +61,9 @@ public class NonPoServerImpl implements NonPoServer {
         String payAmt = getNumberValue(dataForm, "numberField_mejfoool_value");//Payment Amount / 支付总额(含税)
 
 
-        String PD = formatDate(dataForm, "selectField_mj1cq2oz");
-        String SAPID = formatDate(dataForm, "textField_mejezfwk");
-        //校验：支付金额 = 发票金额 + 预付款） - 不推送sap
-        if ("100%清预付款".equals(paymentType)) {
-            //预付款金额
-            double YFKJE = Double.parseDouble(getNumberValue(dataForm, "numberField_l9nwaike_value"));//预付款金额
-            if ( Double.parseDouble(payAmt) == Double.parseDouble(invoiceAmt) +YFKJE) {
-                PD = "否";
-            }
+        String PD = formatDate(dataForm, "selectField_mj1cq2oz_id");//
+        String SAPID = formatDate(dataForm, "textField_mejezfwk").equals("")? formatDate(dataForm, "textField_mj2gpdiu"): formatDate(dataForm, "textField_mejezfwk");
 
-        }
         // 若不需要生成 SAP 凭证，但已有 SAPID，则执行发票勾选
         if ("否".equals(PD) && !SAPID.isEmpty()) {
             FPGX(InstanceId, SAPID, getString(dataForm, "textField_mi73dy3n", ""));
@@ -180,11 +172,11 @@ public class NonPoServerImpl implements NonPoServer {
     }
 
     private String formatDate(Map map, String dateKey) {
-        Object val = map.get(dateKey);
-        if (val instanceof Long) {
-            return CusutUtil.getFormatDate((Long) val);
-        }
-        return "";
+       // Object val = map.get(dateKey);
+//        if (val instanceof Long) {
+//            return CusutUtil.getFormatDate((Long) val);
+//        }
+        return (String) map.get(dateKey);
     }
 
     @SuppressWarnings("unchecked")