diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java index f7ec450..5f86b5f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java @@ -69,7 +69,7 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp { DynamicObject paybill = BusinessDataServiceHelper.loadSingle("cas_paybill", "entry,entry.e_corebillentryseq", new QFilter[]{paybillFilter}); Set payBillSer = new HashSet<>(); if(paybill!=null){ - for (DynamicObject dynamicObject : paybill.getDynamicObjectCollection("entry")) { + for (DynamicObject dynamicObject : paybill.getDynamicObjectCollection("entry")) {//付款处理单-付款明细分录 int corebillentryseq = dynamicObject.getInt("e_corebillentryseq");//核心单据行号 payBillSer.add(corebillentryseq); log.info("执行PaymentRegisterFundOpExt:付款处理单涉及核心单据行号:"+corebillentryseq); @@ -109,20 +109,6 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp { } else { paymentEntry.set("completepay", false); } - break; - }else if (StringUtils.equals(payType, applyPayType) && payBillSer.contains(seq)){ - BigDecimal oldRealPayAmt = paymentEntry.getBigDecimal("thisrealpayamt"); - BigDecimal applyOfTaxAmount = paymentEntry.getBigDecimal("applyoftaxamount"); - BigDecimal thisRealPayAmt = oldRealPayAmt.add(thisOfTaxAmt); - BigDecimal thisWaitPayAmt = applyOfTaxAmount.subtract(thisRealPayAmt); - paymentEntry.set("thisrealpayamt", thisRealPayAmt); - paymentEntry.set("thiswaitpayamt", thisWaitPayAmt); - if (thisRealPayAmt.compareTo(applyOfTaxAmount) >= 0) { - paymentEntry.set("completepay", true); - } else { - paymentEntry.set("completepay", false); - } - break; } }