From 7aa3933a36d4b0ae4d2428f33d1b9c7f16ebe90f Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 18:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CheckOutBillServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 35e53ed97..5bb9aa8ca 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 @@ -2172,6 +2172,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { int shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); // 送货单明细数 if (shd_dtl_num > dtlArr.size()) { + double all_qty = 0; ArrayList> flData = new ArrayList<>(); WriteSheet sheet = EasyExcel.writerSheet().build(); for (int i = 0; i < dtlArr.size(); i++) { @@ -2196,9 +2197,11 @@ 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).toString()); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); flData.add(mapFL); + all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue(); } + oneMap.put("all_qty",all_qty); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet); workBook.finish(); @@ -2207,6 +2210,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { double ceil = Math.ceil(div); Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0))); + double all_qty = 0; ArrayList> flData = new ArrayList<>(); for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) { if (i == dtlArr.size()) { @@ -2234,10 +2238,14 @@ 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).toString()); + mapFL.put("qty", NumberUtil.round(json.getString("qty"), 2).doubleValue()); flData.add(mapFL); + // 计算合计重量 + all_qty = NumberUtil.add(String.valueOf(all_qty), json.getString("qty")).doubleValue(); + } + oneMap.put("all_qty",all_qty); WriteSheet sheet = EasyExcel.writerSheet(0).build(); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet);