2 次代碼提交 d7a5f80299 ... 3a5547d735

作者 SHA1 備註 提交日期
  hu 3a5547d735 Merge branch 'develop' into develop-green 2 月之前
  hu e084568795 收入凭证金额为正数时不做判断 2 月之前
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/custom/restcontroller/sale/cashbill/cashbill.java

+ 1 - 1
src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -762,7 +762,7 @@ public class cashbill extends Controller {
                     sqlList.add(sqlFactory.getSQL());
                 } else {
                     BigDecimal canuseamount = rowsaccountbalance.get(0).getBigDecimal("creditquota").add(rowsaccountbalance.get(0).getBigDecimal("balance"));
-                    if ((rows.get(0).getBigDecimal("amount").add(canuseamount)).compareTo(BigDecimal.ZERO) == -1) {
+                    if ((rows.get(0).getBigDecimal("amount").add(canuseamount)).compareTo(BigDecimal.ZERO) == -1 && rows.get(0).getBigDecimal("amount").compareTo(BigDecimal.ZERO)<=0) {
                         return getErrReturnObject().setErrMsg("该营销账户可用余额不足,收入凭证无法审核")
                                 .toString();
                     }