From b7f329ab908a26ec8699ad2909e4847cc5f76497 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 00:05:38 +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 Signed-off-by: liuxy --- .../outbill/service/impl/CheckOutBillServiceImpl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 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 f0fbaf271..573d03e2d 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 @@ -2169,7 +2169,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { int shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); // 送货单明细数 - if (shd_dtl_num > dtlArr.size()) { ArrayList> flData = new ArrayList<>(); WriteSheet sheet = EasyExcel.writerSheet().build(); @@ -2194,13 +2193,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { Integer integer = Integer.valueOf(String.valueOf(NumberUtil.round(ceil, 0))); - HashMap mapFL = new HashMap<>(); + ArrayList> flData = new ArrayList<>(); for (int i = j * shd_dtl_num; i < (j + 1) * shd_dtl_num; i++) { if (i == dtlArr.size()) { break; } JSONObject json = dtlArr.getJSONObject(i); + HashMap mapFL = new HashMap<>(); mapFL.put("index", i + 1); mapFL.put("source_bill_code", json.getString("source_bill_code")); mapFL.put("material_name", json.getString("material_name")); @@ -2210,15 +2210,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { flData.add(mapFL); } - WriteSheet sheet = EasyExcel.writerSheet(0).build(); workBook.fill(oneMap, sheet); workBook.fill(new FillWrapper("data", flData), sheet); - + workBook.finish(); } - workBook.finish(); -// workBook.fill(oneMap, sheet); -// workBook.fill(ylData, sheet); } public static void main(String[] args) {