From f1abb2901a6d361b58deb0260a6b1cdfa494f422 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 15 Jan 2024 14:18:18 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=9A=E5=8F=91=E8=B4=A7=E5=8D=95=E5=8F=96=E7=90=86?= =?UTF-8?q?=E8=AE=BA=E9=87=8D=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CheckOutBillServiceImpl.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index e39b5bb36..5379c0d4d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -5285,12 +5285,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { mapFL.put("material_spec", material_spec); // mapFL.put("qty_unit_name", "KG"); mapFL.put("box_no", sub_box_no); - mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); // 净重 + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 1).doubleValue()); // 净重 if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) { - mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重 - all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("real_weight")).doubleValue(); + mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重 + all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue(); } else { - mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重 + mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重 all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue(); } @@ -5303,8 +5303,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { }*/ ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build(); - oneMap.put("all_qty", all_qty); // 合计 - oneMap.put("all_real", all_real); // 总毛重 + oneMap.put("all_qty", NumberUtil.round(all_qty, 1)); // 合计 + oneMap.put("all_real", NumberUtil.round(all_real,1)); // 总毛重 workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet); workBook.finish(); @@ -5351,25 +5351,25 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { mapFL.put("material_spec", material_spec); // mapFL.put("qty_unit_name", "KG"); mapFL.put("box_no", sub_box_no); - mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 1).doubleValue()); if (ObjectUtil.isNotEmpty(jsonSub.getString("real_weight"))) { - mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("real_weight"), 2).doubleValue()); // 毛重 - all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("real_weight")).doubleValue(); + mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重 + all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue(); } else { - mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 2).doubleValue()); // 毛重 + mapFL.put("real_weight", NumberUtil.round(jsonSub.getString("box_weight"), 1).doubleValue()); // 毛重 all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue(); } flData.add(mapFL); // 计算合计重量 all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue(); - all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("real_weight")).doubleValue(); + all_real = NumberUtil.add(String.valueOf(all_real), jsonSub.getString("box_weight")).doubleValue(); } // 订单号 ExcelWriter workBook = EasyExcel.write(outputStream, null).withTemplate(code_template).build(); - oneMap.put("all_qty", all_qty); // 合计 - oneMap.put("all_real", all_real); // 总毛重 + oneMap.put("all_qty", NumberUtil.round(all_qty, 1)); // 合计 + oneMap.put("all_real", NumberUtil.round(all_real,1)); // 总毛重 WriteSheet sheet = EasyExcel.writerSheet(0).build(); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet);