From 2828519f1c5636697cd1d51ecfef80c0f5ca92f0 Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Tue, 14 Jul 2026 15:58:27 +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 --- .../oms/service/saleorder/SaleOrderServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 b789763..bddcf95 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 @@ -483,15 +483,15 @@ public class SaleOrderServiceImpl implements SaleOrderService { SaleContractDO saleContract = saleContractService.getSaleContract(saleContractId); List saleContractEntrys = saleContractService.getSaleContractEntryListByParentId(saleContractId); List> split = ListUtil.split(saleContractEntrys, 6); - int i = 1; + int pageIndex = 1; for (List saleContractEntryDOS : split) { - String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,i); + String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,pageIndex); //docker生成路径 String pathUrl = System.getProperty("user.dir") + "/pdffile"; - String fileName = StrUtil.format(pathUrl + "/SaleContract_{}0", saleOrder.getBillno()+"_"+i); + String fileName = StrUtil.format(pathUrl + "/SaleContract_{}0", saleOrder.getBillno()+"_"+pageIndex); //主宿机生成路径 - String fileName2 = StrUtil.format(pdfPath + "/SaleContract_{}0", saleOrder.getBillno()+"_"+i); + String fileName2 = StrUtil.format(pdfPath + "/SaleContract_{}0", saleOrder.getBillno()+"_"+pageIndex); String templatePath = fileName + ".html"; String pdfPath = fileName + ".pdf"; @@ -512,7 +512,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { files.add(file); delFiles.add(pdfPath); delFiles.add(templatePath); - i++; + pageIndex++; } String pathUrl = System.getProperty("user.dir") + "/pdffile"; @@ -747,7 +747,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { List> split = ListUtil.split(saleContractEntrys, 6); int pageIndex = 1; for (List saleContractEntryDOS : split) { - String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,1); + String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,pageIndex); //docker生成路径 String pathUrl = System.getProperty("user.dir") + "/pdffile";