diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java index b13fc61..fce5cd6 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/operate/DailyLoanBillSubValidatorOp.java @@ -98,10 +98,20 @@ public class DailyLoanBillSubValidatorOp extends AbstractOperationServicePlugIn filter1.and(new QFilter("applier", QCP.equals, applier.getPkValue()));//申请人 filter1.and(new QFilter("zcgj_impresttype", QCP.not_in, new String[]{"0", "2"}));//备用金类型不为定额备用金和项目筹备备用金 DynamicObject er_dailyLoanBill1 = BusinessDataServiceHelper.loadSingle("er_dailyloanbill", - "id", new QFilter[]{filter1});//借款单 + "id,billstatus,balanceamount", new QFilter[]{filter1});//借款单 if (er_dailyLoanBill1 != null) { - this.addFatalErrorMessage(dataEnt, "您存在未还完的借款!!"); - return; + String billstatus = er_dailyLoanBill1.getString("billstatus");//单据状态 + if (billstatus.equals("G")) { + //已付款查看待还金额,待还金额大于零便提醒 + BigDecimal balanceamount = er_dailyLoanBill1.getBigDecimal("balanceamount");//待还金额 + if (balanceamount.compareTo(BigDecimal.ZERO) > 0) { + this.addFatalErrorMessage(dataEnt, "您存在未还完的借款!!"); + return; + } + } else { + this.addFatalErrorMessage(dataEnt, "您存在未还完的借款!!"); + return; + } } } else if (impRestType.equals("2")) { //项目筹备备用金