diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PaymentApplyExtEditUI.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PaymentApplyExtEditUI.java index f7f21fb..6104077 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PaymentApplyExtEditUI.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/PaymentApplyExtEditUI.java @@ -20,6 +20,10 @@ import org.apache.commons.lang3.StringUtils; import java.util.HashSet; import java.util.Set; +/** + * 付款申请单(项目资金)继承系统源码修改 + * 说明:去除点击选择合同按钮过滤多币别的逻辑 + */ public class PaymentApplyExtEditUI extends PaymentApplyEditUI { @Override public void beforeDoOperation(BeforeDoOperationEventArgs args) { @@ -70,7 +74,7 @@ public class PaymentApplyExtEditUI extends PaymentApplyEditUI { parameter.setShowApproved(true); DynamicObject orgId = (DynamicObject)this.getModel().getValue("org"); if (orgId != null) { - boolean isMultiCurrency = this.getModel().getDataEntity().getBoolean("ismulticurrency"); +/* boolean isMultiCurrency = this.getModel().getDataEntity().getBoolean("ismulticurrency"); if (isMultiCurrency) { DynamicObject currency = this.getModel().getDataEntity().getDynamicObject("currency"); if (currency != null) { @@ -78,7 +82,7 @@ public class PaymentApplyExtEditUI extends PaymentApplyEditUI { QFilter currencyFilter = new QFilter("currency", "=", currencyId); parameter.getListFilterParameter().getQFilters().add(currencyFilter); } - } + }*///二开注释掉的-去除多币别过滤 QFilter orgFilter; if (project != null) { orgFilter = new QFilter("project", "=", project.getPkValue()); @@ -98,7 +102,7 @@ public class PaymentApplyExtEditUI extends PaymentApplyEditUI { entries.forEach((entry) -> { selectContractIds.add(entry.getDynamicObject("contract").getLong("id")); }); -// parameter.getListFilterParameter().getQFilters().add(new QFilter("id", "not in", selectContractIds)); + parameter.getListFilterParameter().getQFilters().add(new QFilter("id", "not in", selectContractIds)); ContractHelper.getContractByStatus("ec_paymentapply", parameter, PayDirectionEnum.OUT.getValue()); CloseCallBack callBack = new CloseCallBack(this, "ec_out_contract"); parameter.setCloseCallBack(callBack);