Ver Fonte

优惠金额不能大于可用优惠金额判断修改

hxh há 4 meses atrás
pai
commit
f2188b13c9
1 ficheiros alterados com 3 adições e 1 exclusões
  1. 3 1
      src/custom/beans/stockbill/bills/XSCK.java

+ 3 - 1
src/custom/beans/stockbill/bills/XSCK.java

@@ -42,7 +42,9 @@ public class XSCK extends BasicBill {
             }
             }
             BigDecimal discountamount = accountbalancerows.get(0).getBigDecimal("discountamount");
             BigDecimal discountamount = accountbalancerows.get(0).getBigDecimal("discountamount");
             if (billRow.getBigDecimal("paydiscountamount").compareTo(discountamount) > 0) {
             if (billRow.getBigDecimal("paydiscountamount").compareTo(discountamount) > 0) {
-                throw new YosException("优惠金额不能大于可用优惠金额");
+                if(rb==1){
+                    throw new YosException("优惠金额不能大于可用优惠金额");
+                }
             }
             }
             if(billRow.getString("sourceobject").equals("tpartreimbursement")){
             if(billRow.getString("sourceobject").equals("tpartreimbursement")){
                 QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sa_tpartreimbursementdetail", "sa_tpartreimbursementdetailid","isverified","qty","sa_orderitemsid");
                 QuerySQL querySQL = SQLFactory.createQuerySQL(controller, "sa_tpartreimbursementdetail", "sa_tpartreimbursementdetailid","isverified","qty","sa_orderitemsid");