diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractHelperExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractHelperExt.java index 1529381..f9cd1a7 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractHelperExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/ContractHelperExt.java @@ -12,6 +12,9 @@ import kd.bos.orm.query.QFilter; import kd.ec.basedata.common.enums.ContractStatusEnum; import kd.ec.basedata.common.enums.PayDirectionEnum; +/** + * 扩展系统标准代码:用于优化出库单中合同编码过滤逻辑 + */ public class ContractHelperExt { private static final String PAYDIRECTION = "paydirection"; private static final String CONTSTATUS = "contstatus"; @@ -72,6 +75,7 @@ public class ContractHelperExt { return contStatusFilter; } } else if (StringUtils.equals(paydirection, PayDirectionEnum.OUT.getValue())) { + //支出合同 if (!StringUtils.equals(formid, "ec_paymentapply") && !StringUtils.equals(formid, "ec_payment_register") && !StringUtils.equals(formid, "ec_in_invoice") && !StringUtils.equals(formid, "ec_out_contfundplan") && !StringUtils.equals(formid, "ec_out_finalsettle")) { if (!StringUtils.equals(formid, "ecma_materialinbill") && !StringUtils.equals(formid, "ecma_materialoutbill") && !StringUtils.equals(formid, "ecma_compmatout") && !StringUtils.equals(formid, "ecma_purchaseorderbill") && !StringUtils.equals(formid, "ec_out_contract_settle") && !StringUtils.equals(formid, "ec_outclaimbill") && !StringUtils.equals(formid, "ec_outrevision") && !StringUtils.equals(formid, "ec_out_performrecords") && !StringUtils.equals(formid, "ecma_materialapplybill") && !StringUtils.equals(formid, "ec_outcontractmeasure")) { return null; diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java index f9699a3..30b1e44 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialOutBillEditPluginExt.java @@ -1124,7 +1124,7 @@ public class MaterialOutBillEditPluginExt extends AbstractEcmaBillPlugin impleme formShowParameter.getListFilterParameter().getQFilters().add(new QFilter("project", "=", project.getPkValue())); } - ContractHelper.getContractByStatus("ecma_materialoutbill", formShowParameter, PayDirectionEnum.OUT.getValue()); + ContractHelperExt.getContractByStatus("ecma_materialoutbill", formShowParameter, PayDirectionEnum.OUT.getValue()); } public void closedCallBack(ClosedCallBackEvent closedcallbackevent) {