diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index b506029b..2a709995 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -2643,7 +2643,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { } eorder.put("artNo", artNoContent); // 计算artNo内容的行数,动态设置行高 - int lineCount = calculateLineCount(artNoContent); + int lineCount = calculateLineCount(artNoContent, 60); // 基础行高16点 + 每额外行增加15点(可根据实际字体大小调整) int rowHeight = 16 + (lineCount - 1) * 15; // 设置当前行的行高(exportList的当前索引) @@ -3743,7 +3743,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { * @return 行数 */ private int calculateLineCount(String content) { - return calculateLineCount(content, 45); + return calculateLineCount(content, 55); } /** diff --git a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx index 8ee7a457..818ba3ad 100644 Binary files a/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/ALPHA/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx index f6724427..60430f5f 100644 Binary files a/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/TX/declaration-all-template-pdf.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx index ba6e60cc..2009cc59 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-invoice-pdf.xlsx differ diff --git a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx index 7eaa2eeb..7019ee12 100644 Binary files a/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx and b/src/main/resources/templates/YB/declaration-all-template-pdf.xlsx differ