From ddd9abec064f94761466fb1366c56a3ffe8e520b Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Fri, 13 Jun 2025 15:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=87=8F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E9=A2=84=E7=AE=97=E5=8D=95=E6=8D=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B9=B4=E4=BB=BD=E5=92=8C=E9=A2=84=E7=AE=97=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcdev/zcdev/pr/plugin/form/AimCostBoqEditPluginExt.java | 6 +++--- .../zcdev/zcdev/pr/plugin/form/AimCostBoqListPluginExt.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqEditPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqEditPluginExt.java index 971e047..9c98dee 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqEditPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqEditPluginExt.java @@ -235,9 +235,9 @@ public class AimCostBoqEditPluginExt extends AbstractEcBillPlugin implements Bef this.beforeCbsSelected(arg0); } else if (StringUtils.equals("enterpriseca", name)) { this.beforeCaSelected(arg0); - }/* else if (StringUtils.equals("project", name)) { + } else if (StringUtils.equals("project", name)) { this.beforeProjectSelected(arg0);//二开注释掉的 - }*/ + } } @@ -2437,7 +2437,7 @@ public class AimCostBoqEditPluginExt extends AbstractEcBillPlugin implements Bef } protected void setTotalAmount(BigDecimal totalAmount, BigDecimal costControlAmount) { -// this.getModel().setValue("totalamount", totalAmount);//出去的系统逻辑 +// this.getModel().setValue("totalamount", totalAmount);//除去的系统逻辑 this.getModel().setValue("costcontrolamt", costControlAmount); this.getModel().setValue("totalprofit", costControlAmount.subtract(totalAmount)); } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqListPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqListPluginExt.java index 5590781..8e2e0d7 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqListPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimCostBoqListPluginExt.java @@ -93,7 +93,7 @@ public class AimCostBoqListPluginExt extends AbstractListPlugin { } filter.and(new QFilter("vision", ">", vision)); - filter.and(new QFilter("zcgj_periodyear", "=",bills[0].get("zcgj_periodyear")));//年月（二开添加 +// filter.and(new QFilter("zcgj_periodyear", "=",bills[0].get("zcgj_periodyear")));//年月（二开添加 boolean isExist = QueryServiceHelper.exists("ecco_aimcostboqsplitmodel", new QFilter[]{filter}); if (isExist) { this.getView().showTipNotification(ResManager.loadKDString("请在最新的版本上进行调整与编辑。", "AimCostBoqListPlugin_2", "ec-ecco-formplugin", new Object[0]));