From e306f813080117f778f417b54234ba480b79dc76 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 10 Dec 2024 20:53:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=8F=91=E8=BF=90=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8D=95=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 --- .../ShippingDetailSubmitValidator.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java b/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java index 87088f00..f42a496f 100644 --- a/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java +++ b/src/main/java/com/yem/wm/es/shippingdetails/validator/ShippingDetailSubmitValidator.java @@ -41,29 +41,32 @@ public class ShippingDetailSubmitValidator extends AbstractValidator { } DynamicObjectCollection materialInfos = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); BigDecimal qty = BigDecimal.ZERO;//发运数量 - BigDecimal sumcost = dataEntity.getBigDecimal("yem_offeramount");//发运金额 + BigDecimal sumcost = BigDecimal.ZERO;//发运金额 + BigDecimal sumcosts = BigDecimal.ZERO;//发运金额 for (int i = 0; i < materialInfos.size(); i++) { DynamicObject materialInfo = materialInfos.get(i); - qty = qty.add(materialInfo.getBigDecimal("yem_qty")); + sumcost = sumcost.add(materialInfo.getBigDecimal("yem_saamtpriceclause")); + sumcosts = sumcosts.add(materialInfo.getBigDecimal("yem_saamtpriceclause")); + qty = qty.add(materialInfo.getBigDecimal("yem_qty")); } String yemShippingdetails = DynamicObjectUtil.getSelectfields("yem_shippingdetails", false); - String yemShippingdetail = DynamicObjectUtil.getEntrySelectfields(yemShippingdetails,"yem_shippingdetails","yem_es_materialinfo", false); - DynamicObject[] yem_shippingdetails = BusinessDataServiceHelper.load("yem_shippingdetails", yemShippingdetail, new QFilter[]{new QFilter("id" + String yemShippingdetail = DynamicObjectUtil.getEntrySelectfields(yemShippingdetails, "yem_shippingdetails", "yem_es_materialinfo", false); + DynamicObject[] yem_shippingdetails = BusinessDataServiceHelper.load("yem_shippingdetails", yemShippingdetail, new QFilter[]{new QFilter("id" , QCP.not_equals, dataEntity.getLong("id")), new QFilter("yem_sourcebillid", QCP.equals, yemEsSaleorder.getLong("id"))}); - if (YEM.isNotEmpty(yem_shippingdetails)){ + if (YEM.isNotEmpty(yem_shippingdetails)) { for (DynamicObject yem_shippingdetail : yem_shippingdetails) { DynamicObjectCollection yemEsMaterialinfo = yem_shippingdetail.getDynamicObjectCollection("yem_es_materialinfo"); - sumcost = sumcost.add(yem_shippingdetail.getBigDecimal("yem_offeramount")); for (int i = 0; i < yemEsMaterialinfo.size(); i++) { DynamicObject materialInfo = yemEsMaterialinfo.get(i); + sumcost = sumcost.add(materialInfo.getBigDecimal("yem_saamtpriceclause")); qty = qty.add(materialInfo.getBigDecimal("yem_qty")); } } } - if (yemQty.compareTo(qty) == 0){ - if (sumcost.compareTo(yemSumcost)!=0){ - this.addMessage(dataEntitie,"历史发运金额："+sumcost.subtract(dataEntity.getBigDecimal("yem_offeramount"))+"元+当前发运金额："+ - dataEntity.getBigDecimal("yem_offeramount")+"元，不等于合同金额："+yemSumcost+"元，请自行修改发运金额！"); + if (yemQty.compareTo(qty) == 0) { + if (sumcost.compareTo(yemSumcost) != 0) { + this.addMessage(dataEntitie, "历史发运金额：" + sumcost.subtract(sumcosts) + "元+当前发运金额：" + + sumcosts + "元，不等于合同金额：" + yemSumcost + "元，请自行修改发运金额！"); } } vehicleNoSingle(dataEntitie);