md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java

@@ -167,9 +167,6 @@ public class EmisCommonController extends EmisBaseController
                 err_msg	String	错误消息
          */
 
-
-
-
         JSONObject jobjRst = JSONObject.parseObject(data);
         String payId = jobjRst.getString("order_no");
         if(StringUtils.isEmpty(payId)){

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java

@@ -225,6 +225,11 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
             return 1;
         }
 
+        // 未确认，不允许收款
+//        if (  "0".equals(oldBill.getBlConfirmSite())   ) {
+//            return 1;
+//        }
+
         // 其他不允许支付
         return 0;