diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java index a2f016e..186f21e 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java @@ -136,7 +136,7 @@ public class AimcostcbsbillEditUIExt extends AbstractEccoBillPlugin implements B } else if ("projectboq".equals(name)) { this.beforeBoqSelected(beforef7selectevent); }/* else if ("project".equals(name)) { - this.beforeProjectSelected(beforef7selectevent); + this.beforeProjectSelected(beforef7selectevent);//二开注释掉的 }*/ } @@ -274,7 +274,7 @@ public class AimcostcbsbillEditUIExt extends AbstractEccoBillPlugin implements B newInfo.set("remark", project.get("remark")); newInfo.set("editonunit", project.get("editonunit")); newInfo.set("fiaccountorg", project.get("fiaccountorg")); - newInfo.set("zcgj_periodyear", project.get("zcgj_periodyear")); + newInfo.set("zcgj_periodyear", project.get("zcgj_periodyear"));//二开添加 this.versionNum = TypeUtils.string2Double(project.getString("versionno")) + 1.0; newInfo.set("versionno", this.versionNum); newInfo.set("currency", project.get("currency")); @@ -288,7 +288,7 @@ public class AimcostcbsbillEditUIExt extends AbstractEccoBillPlugin implements B this.getView().updateView("org"); this.getView().updateView("versionno"); this.getView().updateView("currency"); - this.getView().updateView("zcgj_periodyear"); + this.getView().updateView("zcgj_periodyear");//二开添加 Map cbsEntryIdMap = new HashMap(); Map idMap = new HashMap(16); DynamicObjectCollection cbsEntryColl = (DynamicObjectCollection) project.get("treeentryentity"); @@ -356,7 +356,7 @@ public class AimcostcbsbillEditUIExt extends AbstractEccoBillPlugin implements B this.adjustAddNewCbs(project, entryColl, idMap); this.getView().setEnable(false, new String[]{"project"}); this.getView().setEnable(false, new String[]{"editonunit"}); - this.getView().setEnable(false, new String[]{"zcgj_periodyear"}); + this.getView().setEnable(false, new String[]{"zcgj_periodyear"});//二开添加 this.getModel().updateEntryCache(entryColl); this.getView().updateView("treeentryentity"); } @@ -838,7 +838,7 @@ public class AimcostcbsbillEditUIExt extends AbstractEccoBillPlugin implements B boolean exists = QueryServiceHelper.exists("ecco_aimcostbillcbs", new QFilter[]{filter}); // if (exists) { // this.getView().showTipNotification(ResManager.loadKDString("本项目(单位工程)已编制预算,如需修改,请使用调整功能。", "AimcostcbsbillEditUI_5", "ec-ecco-formplugin", new Object[0])); -// beforedooperationeventargs.setCancel(true); +// beforedooperationeventargs.setCancel(true);//二开注释掉的逻辑 // } List graySubEntryIds = (List) EcSerializeHelper.unserialize(this.getPageCache().get("subentry_grayids")); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillListPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillListPluginExt.java index 09fdaf8..23b43e3 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillListPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillListPluginExt.java @@ -77,7 +77,7 @@ public class AimcostcbsbillListPluginExt extends AbstractEccoListPlugin { this.getView().showTipNotification(String.format(ResManager.loadKDString("只有已审核状态的数据才能调整,请重新选择:%s", "AimcostcbsbillListPlugin_2", "ec-ecco-formplugin", new Object[0]), aimcostcbsInfos[0].get("name"))); } else { QFilter filter = new QFilter("versionno", ">", aimcostcbsInfos[0].get("versionno")); - filter.and(new QFilter("zcgj_periodyear", "=", aimcostcbsInfos[0].get("zcgj_periodyear"))); + filter.and(new QFilter("zcgj_periodyear", "=", aimcostcbsInfos[0].get("zcgj_periodyear")));//年月(二开添加 filter.and(new QFilter("project", "=", aimcostcbsInfos[0].getDynamicObject("project").getPkValue())); if (aimcostcbsInfos[0].get("unitproject") != null) { filter.and(new QFilter("unitproject", "=", aimcostcbsInfos[0].getDynamicObject("unitproject").getPkValue()));