From 8ce5f99495729f7ff16a267506c7e709cd563e43 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 8 Jan 2024 15:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=A8=E6=8D=AE=E6=96=B0=E5=A2=9E=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E9=87=8D=E9=87=8F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../local/ssjygl/order/LocalOrderService.java | 2 +- .../src/main/resources/tpl_bill_full.xlsx | Bin 12367 -> 12306 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java index b2abc5c..7128d8f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/LocalOrderService.java @@ -344,7 +344,7 @@ public class LocalOrderService { goodsGrossWeight = String.format("%." + decimal + "f", second_weight); // 毛重 goodsSetWeight = goodsNetWeight; - goodsNetWeight = String.format("%.2f", second_weight.subtract(first_weight)); // 计算净重 + goodsNetWeight = String.format("%." + decimal + "f", second_weight.subtract(first_weight)); // 计算净重 clientName = StrUtil.getRecordStr(order, "customer_texpayer_name"); diff --git a/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx b/ssjygl-xsx-local/src/main/resources/tpl_bill_full.xlsx index bedd726ac2ef5b56671a5dbfa0a72becf5d3f8a3..82849e26a1c12d640c5c3882f4a72bdb6952ee7c 100644 GIT binary patch delta 4931 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 delta 4995 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 s>~#@_D}U001O$5iOS|*`!#dB6brw-1d5