From 14347d83e43d2b6d384d5abe541fe86b35c5a297 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 26 Nov 2024 19:48:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=8D=95=E5=8F=B0=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E9=87=91=E9=A2=9D=20=20=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E8=A1=8C=E7=9A=84=E6=95=B0=E9=87=8F=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/salesorder/utils/SalesOrderUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java index 65ad8e4c..1148cba4 100644 --- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java +++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java @@ -1229,9 +1229,12 @@ public class SalesOrderUtils { BigDecimal qty = BigDecimal.ZERO; BigDecimal singlepartgiftmat = BigDecimal.ZERO; for (DynamicObject dynamicObject : value) { - qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); + BigDecimal yemSinglepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); + if (yemSinglepartgiftmat.compareTo(BigDecimal.ZERO) != 0) { + qty = qty.add(dynamicObject.getBigDecimal("yem_qty")); + } if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) { - singlepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); + singlepartgiftmat = yemSinglepartgiftmat ; } } BigDecimal amount = qty.multiply(singlepartgiftmat);