This commit is contained in:
wwb 2026-07-14 15:58:27 +08:00
parent b9cf88a537
commit 2828519f1c
1 changed files with 6 additions and 6 deletions

View File

@ -483,15 +483,15 @@ public class SaleOrderServiceImpl implements SaleOrderService {
SaleContractDO saleContract = saleContractService.getSaleContract(saleContractId);
List<SaleContractEntryDO> saleContractEntrys = saleContractService.getSaleContractEntryListByParentId(saleContractId);
List<List<SaleContractEntryDO>> split = ListUtil.split(saleContractEntrys, 6);
int i = 1;
int pageIndex = 1;
for (List<SaleContractEntryDO> 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<List<SaleContractEntryDO>> split = ListUtil.split(saleContractEntrys, 6);
int pageIndex = 1;
for (List<SaleContractEntryDO> saleContractEntryDOS : split) {
String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,1);
String htmlContent = generateHtmlContent(saleContract, saleContractEntryDOS,pageIndex);
//docker生成路径
String pathUrl = System.getProperty("user.dir") + "/pdffile";