From b9cf88a537f9782613048ddeef4fae57463afe29 Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Tue, 14 Jul 2026 15:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeliveryOrderServiceImpl.java | 25 +++++++++++-------- .../saleorder/SaleOrderServiceImpl.java | 23 +++++++++-------- .../templates/sendorder_pdf_template.html | 3 ++- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java index 026b98e..29af64f 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/deliveryorder/DeliveryOrderServiceImpl.java @@ -26,6 +26,7 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; +import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; import cn.hutool.http.HttpUtil; @@ -213,15 +214,15 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { for (DeliveryOrderDO deliveryOrder : deliveryOrders) { List entrys = getDeliveryOrderEntryListByParentId(deliveryOrder.getId()); List> split = ListUtil.split(entrys, 6); - int i = 1; + int pageIndex = 1; for (List entrys2 : split) { - String htmlContent = generateHtmlContent(deliveryOrder, entrys2); + String htmlContent = generateHtmlContent(deliveryOrder, entrys2,pageIndex); //docker生成路径 String pathUrl = System.getProperty("user.dir") + "/pdffile"; - String fileName = StrUtil.format(pathUrl + "/DeliveryOrder_{}", deliveryOrder.getBillno() + "_" + i); + String fileName = StrUtil.format(pathUrl + "/DeliveryOrder_{}", deliveryOrder.getBillno() + "_" + pageIndex); //主宿机生成路径 - String fileName2 = StrUtil.format(pdfPath + "/DeliveryOrder_{}", deliveryOrder.getBillno() + "_" + i); + String fileName2 = StrUtil.format(pdfPath + "/DeliveryOrder_{}", deliveryOrder.getBillno() + "_" + pageIndex); String templatePath = fileName + ".html"; String pdfPath = fileName + ".pdf"; @@ -242,7 +243,7 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { files.add(file); delFiles.add(pdfPath); delFiles.add(templatePath); - i++; + pageIndex++; } } String pathUrl = System.getProperty("user.dir") + "/pdffile"; @@ -278,16 +279,16 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { private String generateHtmlContent(Long deliveryOrderId) { DeliveryOrderDO deliveryOrder = getDeliveryOrder(deliveryOrderId); List deliveryOrderEntrys = getDeliveryOrderEntryListByParentId(deliveryOrderId); - Context context = generateHtmlContents(deliveryOrder, deliveryOrderEntrys); + Context context = generateHtmlContents(deliveryOrder, deliveryOrderEntrys,1); return templateEngine.process("sendorder_pdf_template", context); } - private String generateHtmlContent(DeliveryOrderDO deliveryOrder, List deliveryOrderEntrys) { - Context context = generateHtmlContents(deliveryOrder, deliveryOrderEntrys); + private String generateHtmlContent(DeliveryOrderDO deliveryOrder, List deliveryOrderEntrys, int pageIndex) { + Context context = generateHtmlContents(deliveryOrder, deliveryOrderEntrys, pageIndex); return templateEngine.process("sendorder_pdf_template", context); } - private Context generateHtmlContents(DeliveryOrderDO deliveryOrder, List deliveryOrderEntrys) { + private Context generateHtmlContents(DeliveryOrderDO deliveryOrder, List deliveryOrderEntrys, int pageIndex) { CustomerDO customer = customerService.getCustomer(deliveryOrder.getCustomerId()); Context context = new Context(); context.setVariable("title", "送货单");//标题 @@ -350,9 +351,11 @@ public class DeliveryOrderServiceImpl implements DeliveryOrderService { specBuilder.append(thickness); } String spec = specBuilder.toString(); - int j = i + 1; - Map items = new LinkedHashMap<>(); + int j = i + 1; + PageUtil.setFirstPageNo(1); + int start = PageUtil.getStart(pageIndex, 6); + items.put("itemIndex", start+j + ""); items.put("productDesc1", productInfo.getCode()); items.put("productDesc2", productInfo.getName()); items.put("productDesc3", deliveryOrder.getSaleContractNo()); diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index 24ab1a6..b789763 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -79,6 +79,7 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; import cn.hutool.http.HttpUtil; @@ -484,7 +485,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { List> split = ListUtil.split(saleContractEntrys, 6); int i = 1; for (List saleContractEntryDOS : split) { - String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS); + String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,i); //docker生成路径 String pathUrl = System.getProperty("user.dir") + "/pdffile"; @@ -658,12 +659,12 @@ public class SaleOrderServiceImpl implements SaleOrderService { } } - private String generateHtmlContent(SaleContractDO saleContract, List saleContractEntrys) { - Context context = generateHtmlContents(saleContract, saleContractEntrys); + private String generateHtmlContent(SaleContractDO saleContract, List saleContractEntrys,int pageIndex) { + Context context = generateHtmlContents(saleContract, saleContractEntrys, pageIndex); return templateEngine.process("pdf_template", context); } - private Context generateHtmlContents(SaleContractDO saleContract, List saleContractEntrys) { + private Context generateHtmlContents(SaleContractDO saleContract, List saleContractEntrys,int pageIndex) { CustomerDO customer = customerService.getCustomer(saleContract.getCustomerId()); Context context = new Context(); context.setVariable("title", "销售合约"); @@ -716,7 +717,9 @@ public class SaleOrderServiceImpl implements SaleOrderService { } String spec = specBuilder.toString(); int j = i + 1; - context.setVariable("item" + j, j + ""); + PageUtil.setFirstPageNo(1); + int start = PageUtil.getStart(pageIndex, 6); + context.setVariable("item" + j, start+j + ""); context.setVariable("explain" + j, code); context.setVariable("qty" + j, saleContractEntryDO.getQty()); context.setVariable("price" + j, saleContractEntryDO.getPrice()); @@ -742,15 +745,15 @@ public class SaleOrderServiceImpl implements SaleOrderService { List saleContractEntrys = BeanUtils.toBean(saleContractVO.getSaleContractEntrys(), SaleContractEntryDO.class); List> split = ListUtil.split(saleContractEntrys, 6); - int i = 1; + int pageIndex = 1; for (List saleContractEntryDOS : split) { - String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS); + String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,1); //docker生成路径 String pathUrl = System.getProperty("user.dir") + "/pdffile"; - String fileName = StrUtil.format(pathUrl + "/SaleContract_{}", saleOrder.getBillno()+"_"+i); + String fileName = StrUtil.format(pathUrl + "/SaleContract_{}", saleOrder.getBillno()+"_"+pageIndex); //主宿机生成路径 - String fileName2 = StrUtil.format(pdfPath + "/SaleContract_{}", saleOrder.getBillno()+"_"+i); + String fileName2 = StrUtil.format(pdfPath + "/SaleContract_{}", saleOrder.getBillno()+"_"+pageIndex); String templatePath = fileName + ".html"; String pdfPath = fileName + ".pdf"; @@ -770,7 +773,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { files.add(file); delFiles.add(pdfPath); delFiles.add(templatePath); - i++; + pageIndex++; } } String pathUrl = System.getProperty("user.dir") + "/pdffile"; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html index 499a836..4bc6c76 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/sendorder_pdf_template.html @@ -148,7 +148,8 @@ - 1 + + 1