From e039cda4b44bd3e4e643e38f240ee5f0108cf5b7 Mon Sep 17 00:00:00 2001 From: "zzs01@yunemao.com" Date: Wed, 11 Sep 2024 14:39:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=98=E6=89=A3=E7=8E=87=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=EF=BC=88=E4=BB=B7=E6=A0=BC=E6=9D=A1=E6=AC=BE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java | 4 ++-- .../java/com/yem/wm/im/clientdemand/utils/ClientUtils.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 c245ee87..5bad9f13 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 @@ -320,9 +320,9 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo case "yem_disamt"://折扣金额 ClientUtils.countFrontDisAmt(model, rowIndex);//折扣前金额 ClientUtils.countAfterFrontAmt(model, rowIndex);//计算折扣后销售金额 - ClientUtils.countPoolAmt(view, model, "yem_es_materialinfo");//汇总折扣金额使用金额 - ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别 ClientUtils.calculateDiscountRate(view, model, rowIndex);//计算折扣率 + ClientUtils.addSaAmountTk(model, rowIndex);//销售金额（价格条款）结算币别 + ClientUtils.countPoolAmt(view, model, "yem_es_materialinfo");//汇总折扣金额使用金额 break; case "yem_fundusetype"://资金使用类型 model.setValue("yem_fundpoolamt", BigDecimal.ZERO); diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index 28a3973a..972fb96f 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1589,6 +1589,7 @@ public class ClientUtils { view.updateView("yem_disamt", i); } ClientUtils.countAfterFrontAmt(model, i);//计算折扣后销售金额 + ClientUtils.addSaAmountTk(model, i);//销售金额（价格条款）结算币别 } ClientUtils.calculateDiscountRate(view, model, -1); }