Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
liuminghui
2026-11-20 10:54:57 +08:00
7 changed files with 126 additions and 18 deletions
@@ -5,14 +5,18 @@ import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.Date;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.IntStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import com.bms.receivable.domain.ArBill;
import com.bms.receivable.domain.ArBillDetail;
@@ -176,17 +180,98 @@ class ArBillWorkbookWriterTest {
template.setStorageKey("templates/receivable/ar_bill_template.xlsx");
Path target = temporary.resolve("default.xlsx");
writer.write(bill(1, "1.00", "CNY"), template, target);
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
assertEquals(1, workbook.getNumberOfSheets());
try (InputStream input = getClass().getResourceAsStream("/" + template.getStorageKey());
XSSFWorkbook original = new XSSFWorkbook(input);
XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
assertEquals(original.getNumberOfSheets(), workbook.getNumberOfSheets());
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
void fixedPayeeTemplatesKeepTheirOwnBankDetailsAndSecondSheetWhileFillingOrders() throws Exception {
for (String code : List.of(ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE,
ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE)) {
String suffix = ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE.equals(code) ? "jy" : "gz";
ArExportTemplate template = new ArExportTemplate();
template.setTemplateCode(code);
template.setStorageKey("templates/receivable/ar_bill_template_" + suffix + ".xlsx");
DefaultArBillWorkbookWriter writer = new DefaultArBillWorkbookWriter();
ArBillDetail success = detail(1, "P1", "1.00");
ArBillDetail failed = detail(2, "P2", "2.25");
failed.setBillingFailStatus(2);
writer.detailMapper = mapper(List.of(success, failed));
when(writer.detailMapper.selectReceiveTimeRangeByBillId(7L)).thenReturn(Map.of(
"minReceiveTime", Date.valueOf("2026-11-05"), "maxReceiveTime", Date.valueOf("2026-11-05")));
writer.detailFeeMapper = mock(ArBillDetailFeeMapper.class);
when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of());
ArBill bill = bill(2, "3.25", "CNY");
bill.setWrittenOffAmount(BigDecimal.ONE);
bill.setUnwrittenAmount(new BigDecimal("2.25"));
Path target = temporary.resolve(suffix + ".xlsx");
writer.write(bill, template, target);
try (InputStream input = getClass().getResourceAsStream("/" + template.getStorageKey());
XSSFWorkbook original = new XSSFWorkbook(input);
XSSFWorkbook exported = new XSSFWorkbook(target.toFile())) {
assertEquals(2, exported.getNumberOfSheets());
assertEquals("运费", exported.getSheetName(0));
assertEquals("汇总表", exported.getSheetName(1));
assertEquals(original.getAllPictures().size(), exported.getAllPictures().size());
XSSFSheet source = original.getSheetAt(0);
XSSFSheet freight = exported.getSheetAt(0);
assertEquals(source.getRow(0).getCell(0).getStringCellValue(), freight.getRow(0).getCell(0).getStringCellValue());
for (int row = 6; row <= 8; row++) {
assertEquals(source.getRow(row).getCell(2).getStringCellValue(),
freight.getRow(row + 2).getCell(2).getStringCellValue());
}
assertEquals("客户 & <测试>", freight.getRow(2).getCell(2).getStringCellValue());
assertEquals("2026-11-05 至 2026-11-05", freight.getRow(2).getCell(14).getStringCellValue());
assertEquals("ORDER1", freight.getRow(4).getCell(2).getStringCellValue());
assertEquals("001234567890123456789", freight.getRow(4).getCell(3).getStringCellValue());
assertEquals(1.00, freight.getRow(4).getCell(18).getNumericCellValue(), 0.00001);
assertEquals(2.25, freight.getRow(5).getCell(18).getNumericCellValue(), 0.00001);
assertEquals("备注 & <快照>", freight.getRow(4).getCell(19).getStringCellValue());
assertEquals("销售价未匹配国家", freight.getRow(5).getCell(20).getStringCellValue());
assertEquals(IndexedColors.YELLOW.getIndex(), freight.getRow(5).getCell(18).getCellStyle().getFillForegroundColor());
assertEquals(0, freight.getRow(6).getPhysicalNumberOfCells());
assertEquals("银行信息", freight.getRow(7).getCell(1).getStringCellValue());
assertEquals(3.25, freight.getRow(7).getCell(18).getNumericCellValue(), 0.00001);
assertEquals(1.00, freight.getRow(8).getCell(18).getNumericCellValue(), 0.00001);
assertEquals("S8-S9", freight.getRow(9).getCell(18).getCellFormula());
assertEquals(2.25, freight.getRow(9).getCell(18).getNumericCellValue(), 0.00001);
assertTrue(freight.getMergedRegions().stream().anyMatch(region -> "C9:E9".equals(region.formatAsString())));
}
assertArrayEquals(zipPart(getClass().getResourceAsStream("/" + template.getStorageKey()), "xl/worksheets/sheet2.xml"),
zipPart(Files.newInputStream(target), "xl/worksheets/sheet2.xml"));
}
}
private byte[] zipPart(InputStream input, String path) throws IOException {
try (ZipInputStream zip = new ZipInputStream(input)) {
for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) {
if (path.equals(entry.getName())) return zip.readAllBytes();
}
}
throw new IOException("Missing ZIP entry: " + path);
}
private SummaryArBillWorkbookWriter summaryWriter(List<ArBillDetail> details) {
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
public class ArBillWorkbookWriters {
public static final String SUMMARY_TEMPLATE_CODE = "AR_BILL_SUMMARY";
public static final String GUANGZHOU_TEMPLATE_CODE = "AR_BILL_GZ";
public static final String JIYUN_TEMPLATE_CODE = "AR_BILL_JY";
private final DefaultArBillWorkbookWriter defaultWriter;
private final SummaryArBillWorkbookWriter summaryWriter;
@@ -31,7 +31,7 @@ import com.bms.receivable.domain.ArBillDetail;
import com.bms.receivable.domain.ArBillDetailFee;
import com.bms.receivable.domain.ArExportTemplate;
/** 默认及广州应收账单模板共用的 21 列明细和银行页脚排版。 */
/** 默认、广州及集运应收账单模板共用的 21 列明细和银行页脚排版。 */
@Component
public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
private static final int TEMPLATE_DATA_START_ROW = 5;
@@ -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";
@@ -79,9 +78,10 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
public void write(ArBill bill, ArExportTemplate template, Path target) throws IOException {
// 样式表单独读取;不加载整张工作簿,且不依赖 styles.xml 和 sheet1.xml 在 ZIP 中的先后顺序。
StylesTable styles = readExportStyles(template);
boolean guangzhouTemplate = ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE.equals(template.getTemplateCode());
// 广州模板的样式编号与默认模板不同,使用其明细合计单元格的完整边框样式。
int detailStyleIndex = guangzhouTemplate ? readGuangzhouDetailStyleIndex(template) : TEMPLATE_DETAIL_STYLE_INDEX;
boolean preserveTemplatePayee = ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE.equals(template.getTemplateCode())
|| ArBillWorkbookWriters.JIYUN_TEMPLATE_CODE.equals(template.getTemplateCode());
// 所有模板都从实际单元格读取样式,兼容新增 Sheet 或重新保存后变化的样式编号。
int detailStyleIndex = readTemplateDetailStyleIndex(template);
if (detailStyleIndex >= styles.getNumCellStyles()) {
throw new IOException("应收账单导出模板明细样式不存在: " + detailStyleIndex);
}
@@ -157,7 +157,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
}
if (TEMPLATE_SHEET_XML.equals(entry.getName())) {
output.putNextEntry(new ZipEntry(entryName));
int rowOffset = writeOoxmlSheet(readUtf8(templateZip), bill, output, exportStyleIndexes, guangzhouTemplate);
int rowOffset = writeOoxmlSheet(readUtf8(templateZip), bill, output, exportStyleIndexes, preserveTemplatePayee);
output.closeEntry();
replaced = true;
drawingRowOffset = Integer.valueOf(rowOffset);
@@ -184,7 +184,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
}
}
private int readGuangzhouDetailStyleIndex(ArExportTemplate template) throws IOException {
private int readTemplateDetailStyleIndex(ArExportTemplate template) throws IOException {
try (InputStream input = openTemplateStream(template); ZipInputStream zip = new ZipInputStream(input)) {
for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) {
if (TEMPLATE_SHEET_XML.equals(entry.getName())) {
@@ -199,12 +199,12 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
}
}
}
throw new IOException("广州应收账单模板缺少 S6 合计单元格样式");
throw new IOException("应收账单模板缺少 S6 合计单元格样式: " + template.getTemplateCode());
}
zip.closeEntry();
}
}
throw new IOException("广州应收账单模板缺少运费工作表");
throw new IOException("应收账单模板缺少运费工作表: " + template.getTemplateCode());
}
private String readTemplateDrawingPartPath(ArExportTemplate template) throws IOException {
@@ -274,7 +274,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
}
private int writeOoxmlSheet(String templateXml, ArBill bill, OutputStream output,
ExportStyleIndexes styleIndexes, boolean guangzhouTemplate) throws IOException {
ExportStyleIndexes styleIndexes, boolean preserveTemplatePayee) throws IOException {
int sheetDataStart = templateXml.indexOf("<sheetData");
int sheetDataOpenEnd = templateXml.indexOf('>', sheetDataStart);
int sheetDataEnd = templateXml.indexOf("</sheetData>", sheetDataOpenEnd);
@@ -288,7 +288,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
removeSheetDimension(templateXml.substring(0, sheetDataOpenEnd + 1)));
writeUtf8(output, prefix);
String headerRow = guangzhouTemplate ? templateRows.get(1) : replaceCellXml(templateRows.get(1), "A1",
String headerRow = preserveTemplatePayee ? templateRows.get(1) : replaceCellXml(templateRows.get(1), "A1",
StringUtils.isEmpty(bill.getBankAccountName()) ? "威狮国际供应链(深圳)有限公司" : bill.getBankAccountName(), false);
writeUtf8(output, headerRow);
writeUtf8(output, templateRows.get(2));
@@ -316,7 +316,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
int rowOffset = lastDetailRow - TEMPLATE_LAST_DETAIL_ROW + EXPORT_FOOTER_GAP_ROWS;
writeUtf8(output, "<row r=\"" + (lastDetailRow + 1) + "\" ht=\""
+ EXPORT_DETAIL_ROW_HEIGHT + "\" customHeight=\"true\"/>");
writeOoxmlFooter(output, templateRows, rowOffset, bill, styleIndexes.generalNumber(), guangzhouTemplate);
writeOoxmlFooter(output, templateRows, rowOffset, bill, styleIndexes.generalNumber(), preserveTemplatePayee);
String suffix = shiftFooterMerges(templateXml.substring(sheetDataEnd), rowOffset);
writeUtf8(output, suffix);
return rowOffset;
@@ -419,7 +419,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
}
private void writeOoxmlFooter(OutputStream output, Map<Integer, String> templateRows, int rowOffset,
ArBill bill, int generalNumberStyleIndex, boolean guangzhouTemplate) throws IOException {
ArBill bill, int generalNumberStyleIndex, boolean preserveTemplatePayee) throws IOException {
String totalAmountFormula = "SUM(S" + TEMPLATE_DATA_START_ROW + ":INDEX(S:S,ROW()-1))";
for (int offset = 0; offset < 4; offset++) {
int sourceRowNumber = TEMPLATE_LAST_DETAIL_ROW + offset + 1;
@@ -432,7 +432,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
nvl(bill.getTotalAmount()), generalNumberStyleIndex);
} else if (offset == 1) {
row = replaceCellXml(row, "B" + targetRowNumber, "开户名", false);
if (!guangzhouTemplate) {
if (!preserveTemplatePayee) {
row = replaceCellXml(row, "C" + targetRowNumber, bill.getBankAccountName(), false);
}
row = replaceCellXml(row, "P" + targetRowNumber, "本期已核销金额", false);
@@ -440,7 +440,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
generalNumberStyleIndex);
} else if (offset == 2) {
row = replaceCellXml(row, "B" + targetRowNumber, "账号", false);
if (!guangzhouTemplate) {
if (!preserveTemplatePayee) {
row = replaceCellXml(row, "C" + targetRowNumber, exportBankAccountNo(bill.getBankAccountNo()), false);
}
row = replaceCellXml(row, "P" + targetRowNumber, "本期未核销金额", false);
@@ -449,7 +449,7 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
nvl(bill.getUnwrittenAmount()), generalNumberStyleIndex);
} else {
row = replaceCellXml(row, "B" + targetRowNumber, "开户行", false);
if (!guangzhouTemplate) {
if (!preserveTemplatePayee) {
row = replaceCellXml(row, "C" + targetRowNumber, bill.getBankName(), false);
}
}
@@ -0,0 +1,22 @@
-- 集运应收账单模板 v1:适用于已存在 ar_export_template 表的数据库。
-- 执行一次;相同业务类型、模板编码和版本已存在时,唯一索引报错,不覆盖已有配置。
-- 配套部署支持 AR_BILL_JY 的后端代码,导出时保留模板固定公司抬头及收款信息。
INSERT INTO `ar_export_template` (
`template_code`, `template_name`, `business_type`, `template_version`,
`storage_type`, `storage_key`, `file_hash`, `status`, `is_default`,
`effective_start`, `effective_end`, `remark`, `create_by`, `create_time`
) VALUES (
'AR_BILL_JY', '应收账单集运模板', 'AR_BILL', '1.0',
'CLASSPATH', 'templates/receivable/ar_bill_template_jy.xlsx', NULL, 'ENABLED', '0',
NULL, NULL, '威狮国际集运物流(深圳)有限公司应收账单模板',
SUBSTRING_INDEX(CURRENT_USER(), '@', 1), NOW()
);
-- 核对新增记录,正常应返回一条。
SELECT `template_id`, `template_code`, `template_name`, `business_type`,
`template_version`, `storage_type`, `storage_key`, `status`, `is_default`,
`effective_start`, `effective_end`
FROM `ar_export_template`
WHERE `business_type` = 'AR_BILL'
AND `template_code` = 'AR_BILL_JY'
AND `template_version` = '1.0';