From b1d7b678bc412b48d742de9a060d62dec3854c3e Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Wed, 24 Sep 2025 10:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=85=A5=E6=94=AF=E5=87=BA=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=B1=A5=E7=BA=A6=E8=AE=B0=E5=BD=95=E5=8D=95=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8F=8D=E5=AE=A1=E6=A0=B8=E6=93=8D=E4=BD=9C=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=8F=92=E4=BB=B6=E4=BA=8C=E5=BC=80=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=90=8E=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=91=E9=A2=9D=E5=92=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=90=8E=E6=80=BB=E9=87=91=E9=A2=9D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/AbstractContractPerformOpExt.java | 16 ++++++++-------- .../plugin/operate/InContractPerformOpExt.java | 5 ++++- .../plugin/operate/OutContractPerformOpExt.java | 6 ++++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/AbstractContractPerformOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/AbstractContractPerformOpExt.java index ea4730f..e521a95 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/AbstractContractPerformOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/AbstractContractPerformOpExt.java @@ -62,8 +62,8 @@ public abstract class AbstractContractPerformOpExt extends AbstractReverseWritin protected void updateContractPerformAmt(String opkey, DynamicObject performrecords, DynamicObject contract) { BigDecimal contractPerformtaxamt = contract.getBigDecimal("performtaxamount"); BigDecimal performamount = contract.getBigDecimal("performamount"); - BigDecimal totaloftaxamount = contract.getBigDecimal("totaloftaxamount"); - BigDecimal totalamount = contract.getBigDecimal("totalamount"); +/* BigDecimal totaloftaxamount = contract.getBigDecimal("totaloftaxamount"); + BigDecimal totalamount = contract.getBigDecimal("totalamount");*///二开注销系统代码 BigDecimal amount = this.getTotalPerformTaxAmount(performrecords, "amount"); BigDecimal notaxAmount = this.getTotalPerformTaxAmount(performrecords, "notaxamount"); DynamicObject contractCurrency = contract.getDynamicObject("currency"); @@ -74,17 +74,17 @@ public abstract class AbstractContractPerformOpExt extends AbstractReverseWritin if (StringUtils.equalsIgnoreCase("audit", opkey)) { contract.set("performtaxamount", contractPerformtaxamt.add(targetAmount)); contract.set("performamount", performamount.add(targetNotaxAmount)); - contract.set("totaloftaxamount", totaloftaxamount.add(targetAmount)); - contract.set("totalamount", totalamount.add(targetNotaxAmount)); +// contract.set("totaloftaxamount", totaloftaxamount.add(targetAmount));//变更后含税总金额 +// contract.set("totalamount", totalamount.add(targetNotaxAmount));//变更后总金额 } else if (StringUtils.equalsIgnoreCase("unaudit", opkey)) { BigDecimal performtaxamount1 = contractPerformtaxamt.subtract(targetAmount); BigDecimal performamount1 = performamount.subtract(targetNotaxAmount); - BigDecimal totaloftaxamount1 = totaloftaxamount.subtract(targetAmount); - BigDecimal totalamount1 = totalamount.subtract(targetNotaxAmount); +/* BigDecimal totaloftaxamount1 = totaloftaxamount.subtract(targetAmount); + BigDecimal totalamount1 = totalamount.subtract(targetNotaxAmount);*///二开注销系统代码 contract.set("performtaxamount", performtaxamount1.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : performtaxamount1); contract.set("performamount", performamount1.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : performamount1); - contract.set("totaloftaxamount", totaloftaxamount1.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : totaloftaxamount1); - contract.set("totalamount", totalamount1.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : totalamount1); +/* contract.set("totaloftaxamount", totaloftaxamount1.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : totaloftaxamount1);//变更后含税总金额 + contract.set("totalamount", totalamount1.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : totalamount1);//变更后总金额*///二开注销系统代码 } SaveServiceHelper.save(new DynamicObject[]{contract}); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/InContractPerformOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/InContractPerformOpExt.java index 81cf55e..6bf70d8 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/InContractPerformOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/InContractPerformOpExt.java @@ -17,7 +17,10 @@ import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.ec.basedata.common.enums.PayDirectionEnum; import kd.ec.contract.opplugin.AbstractContractPerformOp; -public class InContractPerformOpExt extends AbstractContractPerformOp { +/** + * 收入合同履约记录单审核反审核操作系统插件二开 + **/ +public class InContractPerformOpExt extends AbstractContractPerformOpExt { public InContractPerformOpExt() { } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractPerformOpExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractPerformOpExt.java index f3dc2d1..905ca21 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractPerformOpExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractPerformOpExt.java @@ -12,8 +12,10 @@ import kd.ec.basedata.common.enums.PayDirectionEnum; import kd.ec.contract.opplugin.AbstractContractPerformOp; import kd.ec.contract.opplugin.validator.AfterBillInContractAmtControlValidator; import kd.ec.contract.opplugin.validator.PerformAmountValidator; - -public class OutContractPerformOpExt extends AbstractContractPerformOp { +/** + * 支出合同履约记录单审核反审核操作系统插件二开 + **/ +public class OutContractPerformOpExt extends AbstractContractPerformOpExt { public OutContractPerformOpExt() { }