入库单添加资源清单过滤逻辑优化和付款申请单提交去除校验逻辑优化

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/kd/ec/ecpf/opplugin/PaymentApplyInvoiceValidateOp.java

@@ -5,11 +5,13 @@
 
 package kd.ec.ecpf.opplugin;
 
-import kd.bos.entity.plugin.AbstractOperationServicePlugIn;
 import kd.bos.entity.plugin.AddValidatorsEventArgs;
 import kd.bos.entity.plugin.PreparePropertysEventArgs;
 
-public class PaymentApplyInvoiceValidateOp extends AbstractOperationServicePlugIn {
+/**
+ * 付款申请单提交操作插件：去除校验逻辑
+ */
+public class PaymentApplyInvoiceValidateOp extends PaymentApplyInvoiceValidator {
     public PaymentApplyInvoiceValidateOp() {
     }
 

code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ResourceFilterExtPlugin.java

@@ -96,46 +96,6 @@ public class ResourceFilterExtPlugin extends ResourceItemListPlugin {
         }
     }
 
-/*    public void setFilter(SetFilterEvent e) {
-        IPageCache pageCache = this.getPageCache();
-        String nodeid = pageCache.get("focusnode_text_key");
-        String resourceType = pageCache.get("selected_tag_key");
-        QFilter resourceTypeFilter = null;
-        if (resourceType != null) {
-            resourceTypeFilter = new QFilter("resourcetype", "=", ResourceTypeEnum.valueOf(resourceType).value);
-        } else {
-            resourceTypeFilter = new QFilter("resourcetype", "!=", ResourceTypeEnum.COMPOSITE.getValue());
-        }
-        FormShowParameter formShowParameter = this.getView().getFormShowParameter();
-        Map<String, Object> customParams = formShowParameter.getCustomParams();
-        Object originFormId = customParams.get("originFormId");//源表单ID
-        if (originFormId != null && originFormId.equals("ecma_purchaseapply")) {
-            //采购申请单
-            resourceTypeFilter = new QFilter("resourcetype", "=", "03");
-        }
-
-        QFilter resourceFilter = null;
-        if (nodeid != null) {
-            resourceFilter = new QFilter("resource", "in", this.getChildrenNodes(nodeid));
-        }
-
-        e.getQFilters().add(resourceFilter);
-        e.getQFilters().add(resourceTypeFilter);
-        TreeNode focusNode = new TreeNode();
-        if (nodeid == null) {
-            nodeid = "1";
-        }
-
-        focusNode.setId(nodeid);
-        TreeView treeView = (TreeView) this.getControl("treeview");
-        treeView.focusNode(focusNode);
-    }*/
-
-    @Override
-    public void buildTreeListFilter(BuildTreeListFilterEvent e) {
-        super.buildTreeListFilter(e);
-    }
-
     @Override
     public void registerListener(EventObject e) {
         Image subLabel = (Image) this.getView().getControl("sub");