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]));