From a5bafa64d987a626bc2d1c59342d7a652f8559e0 Mon Sep 17 00:00:00 2001 From: ljw Date: Mon, 11 Nov 2024 16:11:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=88=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/SalesOrderSubmitValidator.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java b/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java index 1b59a214..778c0cba 100644 --- a/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java +++ b/src/main/java/com/yem/wm/es/salesorder/validator/SalesOrderSubmitValidator.java @@ -250,11 +250,32 @@ public class SalesOrderSubmitValidator extends AbstractValidator { long groupcustomers = customer.getLong("yem_groupcustomers.id"); // 贷记单使用金额 BigDecimal debcuseamt = dynamicObject.getBigDecimal("yem_debcuseamt"); + DynamicObject yemBdProducts = dataEntity.getDynamicObject("yem_bd_products"); + Long along = 0L; + if (yemBdProducts!=null){ + String number = yemBdProducts.getString("number"); + if ("CC".equals(number)||"CCPJ".equals(number)){ + DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_bd_productsgroup", "id,number" + , new QFilter[]{new QFilter("number", QCP.equals, "CC")}); + along = loadSingle.getLong("id"); + } + if ("TLJ".equals(number)||"TLJPJ".equals(number)){ + DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_bd_productsgroup", "id,number" + , new QFilter[]{new QFilter("number", QCP.equals, "TLJ")}); + along = loadSingle.getLong("id"); + } + if ("ZZJ".equals(number)||"ZZJPJ".equals(number)){ + DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_bd_productsgroup", "id,number" + , new QFilter[]{new QFilter("number", QCP.equals, "ZZJ")}); + along = loadSingle.getLong("id"); + } + } if (debcuseamt.compareTo(BigDecimal.ZERO) == 0) continue; QFilter qFilter = new QFilter("yem_spcapitalpool_a.yem_curr.id", QCP.equals, currId) .and("yem_spcapitalpool_a.yem_debcredtype", QCP.equals, debcred) .and("yem_spcapitalpool_a.yem_creditype.id", QCP.equals, debcredtype) - .and("yem_customer.id", QCP.equals, groupcustomers); + .and("yem_customer.id", QCP.equals, groupcustomers) + .and("yem_bd_products.id",QCP.equals,along); DynamicObject single = BusinessDataServiceHelper.loadSingle("yem_spcapitalpool", qFilter.toArray()); if (single == null) return; DynamicObjectCollection singleCollection = single.getDynamicObjectCollection("yem_spcapitalpool_a"); @@ -346,6 +367,7 @@ public class SalesOrderSubmitValidator extends AbstractValidator { } } } + sb.append("测试"); if (sb.length() > 0) { sb.append("不允许提交！"); this.addErrorMessage(dataEntitie, sb.toString());