🐛 统一应收账单汇总模板日期为明细收货日期范围

This commit is contained in:
caojia
2026-11-20 10:33:57 +08:00
parent 4582c94751
commit 6a406df1f4
4 changed files with 101 additions and 46 deletions
@@ -11,6 +11,8 @@ import java.math.RoundingMode;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.sql.Date; import java.sql.Date;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -40,7 +42,7 @@ class ArBillWorkbookWriterTest {
ArBill bill = bill(3, "13.20", "CNY"); ArBill bill = bill(3, "13.20", "CNY");
List<ArBillDetail> details = List.of(detail(1, "P1", "10.12"), detail(2, "P1", "-2.22"), List<ArBillDetail> details = List.of(detail(1, "P1", "10.12"), detail(2, "P1", "-2.22"),
detail(3, "P2", "5.30")); detail(3, "P2", "5.30"));
// 相同名称的不同产品仍需分组;收货日期也不能替代账单所属期。 // 相同名称的不同产品仍需分组;日期范围统一按本账单明细的收货日期展示。
details.forEach(row -> row.setProductName("相同产品名")); details.forEach(row -> row.setProductName("相同产品名"));
Path target = temporary.resolve("summary.xlsx"); Path target = temporary.resolve("summary.xlsx");
SummaryArBillWorkbookWriter writer = summaryWriter(details); SummaryArBillWorkbookWriter writer = summaryWriter(details);
@@ -54,7 +56,7 @@ class ArBillWorkbookWriterTest {
assertEquals("客户 & <测试>", summary.getRow(3).getCell(1).getStringCellValue()); assertEquals("客户 & <测试>", summary.getRow(3).getCell(1).getStringCellValue());
assertEquals("相同产品名", summary.getRow(3).getCell(2).getStringCellValue()); assertEquals("相同产品名", summary.getRow(3).getCell(2).getStringCellValue());
assertEquals("相同产品名", summary.getRow(4).getCell(2).getStringCellValue()); assertEquals("相同产品名", summary.getRow(4).getCell(2).getStringCellValue());
assertEquals("20261001-20261031", summary.getRow(3).getCell(3).getStringCellValue()); assertEquals("20261105-20261105", summary.getRow(3).getCell(3).getStringCellValue());
assertEquals("国际货物运输代理服务费", summary.getRow(4).getCell(6).getStringCellValue()); assertEquals("国际货物运输代理服务费", summary.getRow(4).getCell(6).getStringCellValue());
assertEquals(7.90, summary.getRow(3).getCell(4).getNumericCellValue(), 0.00001); assertEquals(7.90, summary.getRow(3).getCell(4).getNumericCellValue(), 0.00001);
assertEquals(5.30, summary.getRow(4).getCell(4).getNumericCellValue(), 0.00001); assertEquals(5.30, summary.getRow(4).getCell(4).getNumericCellValue(), 0.00001);
@@ -65,7 +67,7 @@ class ArBillWorkbookWriterTest {
assertTrue(summary.getMergedRegions().stream().anyMatch(region -> "A11:B11".equals(region.formatAsString()))); assertTrue(summary.getMergedRegions().stream().anyMatch(region -> "A11:B11".equals(region.formatAsString())));
assertEquals("客户 & <测试>", freight.getRow(2).getCell(1).getStringCellValue()); assertEquals("客户 & <测试>", freight.getRow(2).getCell(1).getStringCellValue());
assertEquals("20261001-20261031", freight.getRow(2).getCell(18).getStringCellValue()); assertEquals("20261105-20261105", freight.getRow(2).getCell(18).getStringCellValue());
assertEquals("0000123", freight.getRow(4).getCell(0).getStringCellValue()); assertEquals("0000123", freight.getRow(4).getCell(0).getStringCellValue());
assertEquals("00000001", freight.getRow(4).getCell(2).getStringCellValue()); assertEquals("00000001", freight.getRow(4).getCell(2).getStringCellValue());
assertEquals("001234567890123456789", freight.getRow(4).getCell(3).getStringCellValue()); assertEquals("001234567890123456789", freight.getRow(4).getCell(3).getStringCellValue());
@@ -206,6 +208,53 @@ class ArBillWorkbookWriterTest {
} }
} }
@Test
void summaryDatesUseTheWholeBillsReceiveRangeInsteadOfItsStoredPeriod() throws Exception {
ArBill bill = bill(3, "3.00", "CNY");
bill.setBillPeriodStart(Date.valueOf("2026-09-29"));
bill.setBillPeriodEnd(Date.valueOf("2026-10-31"));
ArBillDetail middle = detail(1, "P1", "1.00");
middle.setReceiveTime(Date.valueOf("2026-10-20"));
ArBillDetail earliest = detail(2, "P2", "1.00");
earliest.setReceiveTime(Date.valueOf("2026-10-01"));
ArBillDetail latest = detail(3, "P1", "1.00");
latest.setReceiveTime(Date.valueOf("2026-10-30"));
SummaryArBillWorkbookWriter writer = summaryWriter(List.of(middle, earliest, latest));
when(writer.detailMapper.selectReceiveTimeRangeByBillId(7L)).thenReturn(Map.of(
"minReceiveTime", LocalDateTime.of(2026, 10, 1, 8, 30),
"maxReceiveTime", Timestamp.valueOf("2026-10-30 23:50:00")));
Path target = temporary.resolve("receive-dates.xlsx");
writer.write(bill, summaryTemplate(), target);
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
XSSFSheet summary = workbook.getSheetAt(0);
XSSFSheet freight = workbook.getSheetAt(1);
assertEquals("20261001-20261030", summary.getRow(3).getCell(3).getStringCellValue());
assertEquals("20261001-20261030", summary.getRow(4).getCell(3).getStringCellValue());
assertEquals("20261001-20261030", freight.getRow(2).getCell(18).getStringCellValue());
assertEquals("2026-10-20", freight.getRow(4).getCell(1).getStringCellValue());
assertEquals("2026-10-01", freight.getRow(5).getCell(1).getStringCellValue());
assertEquals("2026-10-30", freight.getRow(6).getCell(1).getStringCellValue());
}
verify(writer.detailMapper, times(1)).selectReceiveTimeRangeByBillId(7L);
assertEquals(Date.valueOf("2026-09-29"), bill.getBillPeriodStart());
assertEquals(Date.valueOf("2026-10-31"), bill.getBillPeriodEnd());
}
@Test
void summaryDatesStayBlankWhenReceiveTimesAreMissing() throws Exception {
ArBillDetail detail = detail(1, "P1", "1.00");
detail.setReceiveTime(null);
SummaryArBillWorkbookWriter writer = summaryWriter(List.of(detail));
when(writer.detailMapper.selectReceiveTimeRangeByBillId(7L)).thenReturn(Map.of());
Path target = temporary.resolve("missing-receive-dates.xlsx");
writer.write(bill(1, "1.00", "CNY"), summaryTemplate(), target);
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
assertEquals("", workbook.getSheetAt(0).getRow(3).getCell(3).getStringCellValue());
assertEquals("", workbook.getSheetAt(1).getRow(2).getCell(18).getStringCellValue());
assertEquals("", workbook.getSheetAt(1).getRow(4).getCell(1).getStringCellValue());
}
}
@Test @Test
void fixedPayeeTemplatesKeepTheirOwnBankDetailsAndSecondSheetWhileFillingOrders() throws Exception { void fixedPayeeTemplatesKeepTheirOwnBankDetailsAndSecondSheetWhileFillingOrders() throws Exception {
for (String code : List.of(ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE, for (String code : List.of(ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE,
@@ -277,6 +326,8 @@ class ArBillWorkbookWriterTest {
private SummaryArBillWorkbookWriter summaryWriter(List<ArBillDetail> details) { private SummaryArBillWorkbookWriter summaryWriter(List<ArBillDetail> details) {
SummaryArBillWorkbookWriter writer = new SummaryArBillWorkbookWriter(); SummaryArBillWorkbookWriter writer = new SummaryArBillWorkbookWriter();
writer.detailMapper = mapper(details); writer.detailMapper = mapper(details);
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); writer.detailFeeMapper = mock(ArBillDetailFeeMapper.class);
when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of()); when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of());
return writer; return writer;
@@ -7,7 +7,12 @@ import java.io.OutputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -351,6 +356,40 @@ public abstract class ArBillWorkbookSupport implements ArBillWorkbookWriter {
return detail == null ? null : detail.getRegistrationFee(); return detail == null ? null : detail.getRegistrationFee();
} }
protected String exportReceiveTimeRange(Map<String, Object> receiveTimeRange) {
return exportReceiveTimeRange(receiveTimeRange, "yyyy-MM-dd", " 至 ");
}
/** 所有账单模板使用当前账单明细的收货日期范围,缺失时留空。 */
protected String exportReceiveTimeRange(Map<String, Object> receiveTimeRange, String pattern, String separator) {
if (receiveTimeRange == null) {
return "";
}
String start = formatReceiveDate(receiveTimeRange.get("minReceiveTime"), pattern);
String end = formatReceiveDate(receiveTimeRange.get("maxReceiveTime"), pattern);
return StringUtils.isEmpty(start) || StringUtils.isEmpty(end) ? "" : start + separator + end;
}
private String formatReceiveDate(Object value, String pattern) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
if (value instanceof LocalDateTime) {
return ((LocalDateTime) value).toLocalDate().format(formatter);
}
if (value instanceof LocalDate) {
return ((LocalDate) value).format(formatter);
}
if (value instanceof java.sql.Date) {
return ((java.sql.Date) value).toLocalDate().format(formatter);
}
if (value instanceof Date) {
return new SimpleDateFormat(pattern).format((Date) value);
}
if (value == null) {
return "";
}
throw new IllegalArgumentException("不支持的收货时间类型: " + value.getClass().getName());
}
protected String exportBankAccountNo(String value) { protected String exportBankAccountNo(String value) {
if (StringUtils.isEmpty(value)) { if (StringUtils.isEmpty(value)) {
return ""; return "";
@@ -8,9 +8,6 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -534,34 +531,6 @@ public class DefaultArBillWorkbookWriter extends ArBillWorkbookSupport {
return result.toString(); return result.toString();
} }
private String exportReceiveTimeRange(Map<String, Object> receiveTimeRange) {
if (receiveTimeRange == null) {
return "";
}
String start = formatReceiveDate(receiveTimeRange.get("minReceiveTime"));
String end = formatReceiveDate(receiveTimeRange.get("maxReceiveTime"));
return StringUtils.isEmpty(start) || StringUtils.isEmpty(end) ? "" : start + " 至 " + end;
}
private String formatReceiveDate(Object value) {
if (value instanceof LocalDateTime) {
return ((LocalDateTime) value).toLocalDate().toString();
}
if (value instanceof LocalDate) {
return value.toString();
}
if (value instanceof java.sql.Date) {
return ((java.sql.Date) value).toLocalDate().toString();
}
if (value instanceof Date) {
return new SimpleDateFormat("yyyy-MM-dd").format((Date) value);
}
if (value == null) {
return "";
}
throw new IllegalArgumentException("不支持的收货时间类型: " + value.getClass().getName());
}
private String exportFormula(ArBillDetail detail) { private String exportFormula(ArBillDetail detail) {
String formula = joinFeeText(detail.getFees(), true); String formula = joinFeeText(detail.getFees(), true);
if (!StringUtils.isEmpty(formula)) { if (!StringUtils.isEmpty(formula)) {
@@ -55,7 +55,9 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
Path detailXml = Files.createTempFile("ar-bill-summary-details-", ".xml"); Path detailXml = Files.createTempFile("ar-bill-summary-details-", ".xml");
try (InputStream input = openTemplateStream(template); XSSFWorkbook workbook = new XSSFWorkbook(input)) { try (InputStream input = openTemplateStream(template); XSSFWorkbook workbook = new XSSFWorkbook(input)) {
validateTemplate(workbook); validateTemplate(workbook);
prepareTemplate(workbook, bill); String receiveTimePeriod = exportReceiveTimeRange(
detailMapper.selectReceiveTimeRangeByBillId(bill.getArBillId()), "yyyyMMdd", "-");
prepareTemplate(workbook, bill, receiveTimePeriod);
DetailStyles detailStyles = createDetailStyles(workbook); DetailStyles detailStyles = createDetailStyles(workbook);
byte[] skeleton = serialize(workbook); byte[] skeleton = serialize(workbook);
String summaryPath = partPath(workbook.getSheetAt(0)); String summaryPath = partPath(workbook.getSheetAt(0));
@@ -92,7 +94,7 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) { for (ZipEntry entry; (entry = zip.getNextEntry()) != null; ) {
output.putNextEntry(new ZipEntry(entry.getName())); output.putNextEntry(new ZipEntry(entry.getName()));
if (summaryPath.equals(entry.getName())) { if (summaryPath.equals(entry.getName())) {
writeSummary(summary, bill, groups, result.amount(), output); writeSummary(summary, bill, groups, result.amount(), receiveTimePeriod, output);
} else if (detailPath.equals(entry.getName())) { } else if (detailPath.equals(entry.getName())) {
Files.copy(detailXml, output); Files.copy(detailXml, output);
} else { } else {
@@ -133,7 +135,7 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
return row; return row;
} }
private void prepareTemplate(XSSFWorkbook workbook, ArBill bill) throws IOException { private void prepareTemplate(XSSFWorkbook workbook, ArBill bill, String receiveTimePeriod) throws IOException {
String currency = StringUtils.isEmpty(bill.getCurrency()) ? "CNY" : bill.getCurrency(); String currency = StringUtils.isEmpty(bill.getCurrency()) ? "CNY" : bill.getCurrency();
String company = StringUtils.isEmpty(bill.getBankAccountName()) String company = StringUtils.isEmpty(bill.getBankAccountName())
? "威狮国际供应链(深圳)有限公司" : bill.getBankAccountName(); ? "威狮国际供应链(深圳)有限公司" : bill.getBankAccountName();
@@ -146,7 +148,7 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
textCell(summary, 11, 1, exportBankAccountNo(bill.getBankAccountNo())); textCell(summary, 11, 1, exportBankAccountNo(bill.getBankAccountNo()));
textCell(summary, 12, 1, bill.getBankName()); textCell(summary, 12, 1, bill.getBankName());
textCell(detail, 2, 1, bill.getCustomerName()); textCell(detail, 2, 1, bill.getCustomerName());
textCell(detail, 2, 18, billPeriod(bill)); textCell(detail, 2, 18, receiveTimePeriod);
for (int column : new int[]{11, 12, 13, 15, 16}) { for (int column : new int[]{11, 12, 13, 15, 16}) {
XSSFCell header = detail.getRow(3).getCell(column); XSSFCell header = detail.getRow(3).getCell(column);
header.setCellValue(header.getStringCellValue().replace("CNY", currency)); header.setCellValue(header.getStringCellValue().replace("CNY", currency));
@@ -305,13 +307,13 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
} }
private void writeSummary(SheetXml sheet, ArBill bill, Map<String, ProductSummary> groups, private void writeSummary(SheetXml sheet, ArBill bill, Map<String, ProductSummary> groups,
BigDecimal total, OutputStream output) throws IOException { BigDecimal total, String receiveTimePeriod, OutputStream output) throws IOException {
writeUtf8(output, sheet.prefix()); writeUtf8(output, sheet.prefix());
for (int row = 1; row <= 3; row++) writeUtf8(output, sheet.rows().get(row)); for (int row = 1; row <= 3; row++) writeUtf8(output, sheet.rows().get(row));
int rowNumber = SUMMARY_START_ROW; int rowNumber = SUMMARY_START_ROW;
for (ProductSummary product : groups.values()) { for (ProductSummary product : groups.values()) {
String row = shiftRowXml(sheet.rows().get(4), rowNumber); String row = shiftRowXml(sheet.rows().get(4), rowNumber);
Object[] values = {rowNumber - 3, bill.getCustomerName(), product.name, billPeriod(bill), Object[] values = {rowNumber - 3, bill.getCustomerName(), product.name, receiveTimePeriod,
product.amount, bill.getCurrency(), SUMMARY_REMARK}; product.amount, bill.getCurrency(), SUMMARY_REMARK};
for (int index = 0; index < values.length; index++) { for (int index = 0; index < values.length; index++) {
row = replaceCellXml(row, (char) ('A' + index) + String.valueOf(rowNumber), row = replaceCellXml(row, (char) ('A' + index) + String.valueOf(rowNumber),
@@ -356,12 +358,6 @@ public class SummaryArBillWorkbookWriter extends ArBillWorkbookSupport {
return FILTER.matcher(suffix).replaceAll("$1" + range + "$2"); return FILTER.matcher(suffix).replaceAll("$1" + range + "$2");
} }
private String billPeriod(ArBill bill) {
if (bill.getBillPeriodStart() == null || bill.getBillPeriodEnd() == null) return "";
SimpleDateFormat date = new SimpleDateFormat("yyyyMMdd");
return date.format(bill.getBillPeriodStart()) + "-" + date.format(bill.getBillPeriodEnd());
}
private String partPath(XSSFSheet sheet) { private String partPath(XSSFSheet sheet) {
return sheet.getPackagePart().getPartName().getName().substring(1); return sheet.getPackagePart().getPartName().getName().substring(1);
} }