From fefb200142430a568a113f14573bb3bc9638ce79 Mon Sep 17 00:00:00 2001 From: zzs Date: Mon, 14 Oct 2024 10:55:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(version1011):=E6=95=B4=E6=9C=BA=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java | 1 + src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index ba8ae375..e79496da 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -308,6 +308,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo ClientUtils.countRealCatAmountZJ(model, rowIndex);//整机合同整机非赠品行实际整车金额 ClientUtils.calculateSalesFCAStandardQingdaoUnitAmount(model, rowIndex);//销售FCA标配青岛金额 ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费 + ClientUtils.calcInlandTransportationAmt(model, rowIndex);//计算内陆运费 break; case "yem_saamtpriceclause"://销售金额（价格条款） ClientUtils.totalSaFobAmount(model, "yem_es_materialinfo", "yem_ifgift", "yem_saamtpriceclause", "yem_offeramount");//销售金额（价格条款）汇总表头 金额价格条款 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 cf4ae13c..0424b023 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 @@ -2063,7 +2063,7 @@ public class ClientUtils { price = queryIntervalPrice(subC, tonsqty); } BigDecimal calc = price.multiply(tonsqty); - model.setValue("yem_inlandfreight", calc, idx); + model.setValue("yem_inlandtransportation", calc, idx); } }