From 9cc62548d9331195be8a351a287bd6da22730dcf Mon Sep 17 00:00:00 2001 From: ljw Date: Sun, 29 Sep 2024 16:52:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E4=BB=B6=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java index 5bad9f13..a5e420fb 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java @@ -407,7 +407,8 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo for (Integer i : seq) { BigDecimal safobamount = (BigDecimal) model.getValue("yem_safobamount", i); BigDecimal calc = BigDecimalUtils.div(safobamount, amount, 12).multiply(sumedamount).setScale(2, RoundingMode.HALF_UP); - if (i == seq.size() - 1) { + String yemBilltype = (String) model.getValue("yem_billtype.billno"); + if (i == seq.size() - 1 && ("yem_es_salesorder_nmpj".equals(yemBilltype)||"yem_es_salesorder_PJ".equals(yemBilltype))) { model.setValue("yem_totalamount", sumedamount.subtract(excludeLastRow), i); } else { model.setValue("yem_totalamount", calc, i);