diff --git a/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java b/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java index ee1866f3..6f933fc1 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/receivable/export/ArBillWorkbookWriterTest.java @@ -187,12 +187,23 @@ class ArBillWorkbookWriterTest { assertEquals(1, workbook.getAllPictures().size()); XSSFSheet sheet = workbook.getSheetAt(0); assertEquals(21, sheet.getRow(4).getLastCellNum()); + assertEquals(original.getSheetAt(0).getRow(5).getCell(18).getCellStyle().getBorderBottom(), + sheet.getRow(4).getCell(18).getCellStyle().getBorderBottom()); + assertEquals(original.getSheetAt(0).getRow(5).getCell(18).getCellStyle().getFont().getFontHeight(), + sheet.getRow(4).getCell(18).getCellStyle().getFont().getFontHeight()); assertEquals(1, sheet.getRow(4).getCell(18).getNumericCellValue()); assertEquals("备注 & <快照>", sheet.getRow(4).getCell(19).getStringCellValue()); assertEquals(0, sheet.getRow(5).getPhysicalNumberOfCells()); assertEquals("银行信息", sheet.getRow(6).getCell(1).getStringCellValue()); assertEquals("收款账户快照", sheet.getRow(7).getCell(2).getStringCellValue()); } + try (InputStream input = getClass().getResourceAsStream("/" + template.getStorageKey()); + XSSFWorkbook original = new XSSFWorkbook(input)) { + if (original.getNumberOfSheets() > 1) { + assertArrayEquals(zipPart(getClass().getResourceAsStream("/" + template.getStorageKey()), "xl/worksheets/sheet2.xml"), + zipPart(Files.newInputStream(target), "xl/worksheets/sheet2.xml")); + } + } } @Test diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java b/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java index c0222299..df29fd04 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/export/DefaultArBillWorkbookWriter.java @@ -49,7 +49,6 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { private static final double MIN_TRACKING_NO_COLUMN_WIDTH = MIN_CUSTOMER_ORDER_NO_COLUMN_WIDTH; private static final double MIN_FORMULA_COLUMN_WIDTH = 17.0; private static final double MIN_FEE_TYPE_COLUMN_WIDTH = 10.0; - private static final int TEMPLATE_DETAIL_STYLE_INDEX = 31; private static final String TEMPLATE_SHEET_XML = "xl/worksheets/sheet1.xml"; private static final String TEMPLATE_SHEET_RELATIONSHIPS_XML = "xl/worksheets/_rels/sheet1.xml.rels"; private static final String TEMPLATE_STYLES_XML = "xl/styles.xml"; @@ -81,8 +80,8 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport { StylesTable styles = readExportStyles(template); boolean preserveTemplatePayee = ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE.equals(template.getTemplateCode()) || ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE.equals(template.getTemplateCode()); - // 固定收款信息的模板使用自身合计单元格样式,不依赖默认模板的样式编号。 - int detailStyleIndex = preserveTemplatePayee ? readTemplateDetailStyleIndex(template) : TEMPLATE_DETAIL_STYLE_INDEX; + // 所有模板都从实际单元格读取样式,兼容新增 Sheet 或重新保存后变化的样式编号。 + int detailStyleIndex = readTemplateDetailStyleIndex(template); if (detailStyleIndex >= styles.getNumCellStyles()) { throw new IOException("应收账单导出模板明细样式不存在: " + detailStyleIndex); } diff --git a/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx index df730b35..f57b0a15 100644 Binary files a/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx and b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx differ diff --git a/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_gz.xlsx b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_gz.xlsx index 415b0f68..84dff267 100644 Binary files a/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_gz.xlsx and b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template_gz.xlsx differ