From c51f8b485025864d7f4787ac83f78ee3cac347b2 Mon Sep 17 00:00:00 2001 From: xuhaihui <2098865055@qq.com> Date: Wed, 3 Dec 2025 17:09:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialInBillOrgSubmitValidatorOp.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillOrgSubmitValidatorOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillOrgSubmitValidatorOp.java index 91a4421..b1cb6eb 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillOrgSubmitValidatorOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaterialInBillOrgSubmitValidatorOp.java @@ -10,6 +10,7 @@ import kd.bos.entity.validate.AbstractValidator; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.QueryServiceHelper; import java.math.BigDecimal; @@ -47,10 +48,22 @@ public class MaterialInBillOrgSubmitValidatorOp extends AbstractOperationService if (fiaccountOrg == null) { return; } - QFilter f1 = new QFilter("number", QCP.equals, "ecma_materialinbill"); - QFilter f2 = new QFilter("zcgj_org.fbasedataid", QCP.in, fiaccountOrg.getPkValue()); - DynamicObject zcgj_authorizedcompany = BusinessDataServiceHelper.loadSingle("zcgj_authorizedcompany", - new QFilter[]{f1.and(f2)});//入库单公司过滤 + DynamicObject supplier = ecma_MaterialInBill.getDynamicObject("supplier");//供应商 + if (supplier == null) { + return; + } + QFilter filter1 = new QFilter("zcgj_supplier.fbasedataid", QCP.in, supplier.getPkValue()); + DynamicObject zcgj_groupbuysupplier = QueryServiceHelper.queryOne("zcgj_groupbuysupplier", + "id", new QFilter[]{filter1});//集采供应商 + if (zcgj_groupbuysupplier != null) { + return; + } + + QFilter filter = new QFilter("zcgj_companyblentry.zcgj_org.id", QCP.equals, fiaccountOrg.getPkValue()); + filter.and(new QFilter("zcgj_needcompare", QCP.equals, true)); + DynamicObject zcgj_authorizedcompany = QueryServiceHelper.queryOne("zcgj_companybelong", + "id", new QFilter[]{filter});//公司归属区域 + if (zcgj_authorizedcompany != null) { DynamicObjectCollection entryEntityCollection = ecma_MaterialInBill.getDynamicObjectCollection("entryentity");//入库单分录 boolean isPrice = false;