From 7fe01461eca13b48ac4f89574973464186c25a36 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Tue, 30 Dec 2025 15:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=80=BB=E8=AE=A1=E5=8F=96tt?= =?UTF-8?q?l=5Famount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ecss/service/impl/CoDelExcelServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java index 95ae2bdd..1c55e442 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java @@ -2578,9 +2578,8 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { eorder.put("designation", eorder.get("part_description") + "\n" + "PO：" + eorder.get("customerPO") + (data.getSo()!=null && data.getSo()?" SO:"+eorder.get("so"):"") + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"\nHS Code：" + eorder.get("hsCode"):"")+hsCodeDesc+ lossratio); - eorder.put("totalPrice", (((BigDecimal) eorder.get("qty")).multiply((BigDecimal) eorder.get("unitPrice"))). - setScale(2, RoundingMode.HALF_UP)); - allPrice = allPrice.add(((BigDecimal) eorder.get("qty")).multiply((BigDecimal) eorder.get("unitPrice"))); + eorder.put("totalPrice", ((BigDecimal)eorder.get("ttl_amount")).setScale(2, RoundingMode.HALF_UP)); + allPrice = allPrice.add( ((BigDecimal)eorder.get("ttl_amount"))); if (data.getShowWeight()!=null && data.getShowWeight()) { // 根据发货通知单明细查找装箱明细，获取重量和净重，保留2位小数 eorder.put("grossWeight", pm != null && pm.get("gross_weight") != null ? @@ -2919,7 +2918,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { StringBuilder orderNos = new StringBuilder(); poNoMap.forEach((key, value) -> ponos.append(key + " ")); template.addVar("poNo", ponos); - + // orderNos每10个换行 int[] counter = {0}; // 使用数组来在lambda中修改计数器 orderNoMap.forEach((key, value) -> {