🐛 统一应收账单汇总模板日期为明细收货日期范围
This commit is contained in:
+54
-3
@@ -11,6 +11,8 @@ import java.math.RoundingMode;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.sql.Date;
|
||||
import java.sql.Timestamp;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -40,7 +42,7 @@ class ArBillWorkbookWriterTest {
|
||||
ArBill bill = bill(3, "13.20", "CNY");
|
||||
List<ArBillDetail> details = List.of(detail(1, "P1", "10.12"), detail(2, "P1", "-2.22"),
|
||||
detail(3, "P2", "5.30"));
|
||||
// 相同名称的不同产品仍需分组;收货日期也不能替代账单所属期。
|
||||
// 相同名称的不同产品仍需分组;日期范围统一按本账单明细的收货日期展示。
|
||||
details.forEach(row -> row.setProductName("相同产品名"));
|
||||
Path target = temporary.resolve("summary.xlsx");
|
||||
SummaryArBillWorkbookWriter writer = summaryWriter(details);
|
||||
@@ -54,7 +56,7 @@ class ArBillWorkbookWriterTest {
|
||||
assertEquals("客户 & <测试>", summary.getRow(3).getCell(1).getStringCellValue());
|
||||
assertEquals("相同产品名", summary.getRow(3).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(7.90, summary.getRow(3).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())));
|
||||
|
||||
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("00000001", freight.getRow(4).getCell(2).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
|
||||
void fixedPayeeTemplatesKeepTheirOwnBankDetailsAndSecondSheetWhileFillingOrders() throws Exception {
|
||||
for (String code : List.of(ArBillWorkbookWriters.GUANGZHOU_TEMPLATE_CODE,
|
||||
@@ -277,6 +326,8 @@ class ArBillWorkbookWriterTest {
|
||||
private SummaryArBillWorkbookWriter summaryWriter(List<ArBillDetail> details) {
|
||||
SummaryArBillWorkbookWriter writer = new SummaryArBillWorkbookWriter();
|
||||
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);
|
||||
when(writer.detailFeeMapper.selectByDetailIds(anyList())).thenReturn(List.of());
|
||||
return writer;
|
||||
|
||||
Reference in New Issue
Block a user