diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java index 538d1dc..f2ded4f 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java @@ -95,22 +95,24 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement @Override public void beforeF7Select(BeforeF7SelectEvent beforeF7SelectEvent) { String propertyName = beforeF7SelectEvent.getProperty().getName(); - Object project = this.getModel().getValue("project");//项目 +// Object project = this.getModel().getValue("project");//项目 Object fiaccountorg = this.getModel().getValue("fiaccountorg");//财务记账组织 if (fiaccountorg == null) { this.getView().showErrorNotification("请先填写财务记账组织!!"); beforeF7SelectEvent.setCancel(true); } - if (project != null && fiaccountorg != null) { - DynamicObject project1 = (DynamicObject) project;// 项目 - DynamicObject fiaccountorg1 = (DynamicObject) fiaccountorg;//财务记账组织 - ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); - List qFilters = new ArrayList<>(); - qFilters.add(new QFilter("project.id", QCP.in, project1.get("id")));// 项目 +// if (project != null && fiaccountorg != null) { +// DynamicObject project1 = (DynamicObject) project;// 项目 + DynamicObject fiaccountorg1 = (DynamicObject) fiaccountorg;//财务记账组织 + ListShowParameter formShowParameter = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter(); + List qFilters = new ArrayList<>(); +// qFilters.add(new QFilter("project.id", QCP.in, project1.get("id")));// 项目 + if (fiaccountorg1 != null) { qFilters.add(new QFilter("fiaccountorg.id", QCP.in, fiaccountorg1.get("id")));//财务记账组织 - formShowParameter.getListFilterParameter().setQFilters(qFilters); } + formShowParameter.getListFilterParameter().setQFilters(qFilters); } +// } public void beforeDoOperation(BeforeDoOperationEventArgs args) { super.beforeDoOperation(args);