🐛 修正应收账单汇总导出并新增广州模板

This commit is contained in:
caojia
2026-11-19 16:39:05 +08:00
parent 837633be3c
commit daf36e39e1
5 changed files with 118 additions and 63 deletions
@@ -6,6 +6,7 @@ import static org.mockito.Mockito.*;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.file.Path;
import java.sql.Date;
import java.util.ArrayList;
@@ -60,7 +61,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(17).getStringCellValue());
assertEquals("20261001-20261031", 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());
@@ -68,28 +69,29 @@ class ArBillWorkbookWriterTest {
assertEquals(9.5, freight.getRow(4).getCell(8).getNumericCellValue());
assertEquals("ROUND(J5*L5,2)", freight.getRow(4).getCell(13).getCellFormula());
assertEquals(2.81, freight.getRow(4).getCell(13).getNumericCellValue(), 0.00001);
assertEquals(CellType.NUMERIC, freight.getRow(4).getCell(15).getCellType());
assertEquals(10.12, freight.getRow(4).getCell(15).getNumericCellValue(), 0.00001);
assertEquals(-2.22, freight.getRow(5).getCell(15).getNumericCellValue(), 0.00001);
assertEquals(20, freight.getRow(4).getLastCellNum());
assertEquals("说明", freight.getRow(3).getCell(19).getStringCellValue());
assertEquals("备注 & <快照>", freight.getRow(4).getCell(18).getStringCellValue());
assertEquals(CellType.FORMULA, freight.getRow(4).getCell(16).getCellType());
assertEquals("N5+K5+M5+P5+O5", freight.getRow(4).getCell(16).getCellFormula());
assertEquals(10.12, freight.getRow(4).getCell(16).getNumericCellValue(), 0.00001);
assertEquals(-2.22, freight.getRow(5).getCell(16).getNumericCellValue(), 0.00001);
assertEquals(21, freight.getRow(4).getLastCellNum());
assertEquals("说明", freight.getRow(3).getCell(20).getStringCellValue());
assertEquals("", freight.getRow(4).getCell(19).getStringCellValue());
for (int column : new int[]{10, 14}) {
assertEquals("", freight.getRow(4).getCell(20).getStringCellValue());
for (int column : new int[]{10, 14, 15}) {
assertEquals(0.0, freight.getRow(4).getCell(column).getNumericCellValue());
assertEquals("0.00", freight.getRow(4).getCell(column).getCellStyle().getDataFormatString());
}
for (int column : new int[]{7, 16, 17}) {
for (int column : new int[]{7, 17, 18}) {
assertEquals("", freight.getRow(4).getCell(column).getStringCellValue());
}
assertEquals("SUM(P5:P7)", freight.getRow(8).getCell(15).getCellFormula());
assertEquals(13.20, freight.getRow(8).getCell(15).getNumericCellValue(), 0.00001);
assertEquals("SUM(Q5:Q7)", freight.getRow(8).getCell(16).getCellFormula());
assertEquals(13.20, freight.getRow(8).getCell(16).getNumericCellValue(), 0.00001);
FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
assertEquals(13.20, evaluator.evaluate(summary.getRow(6).getCell(4)).getNumberValue(), 0.00001);
assertEquals(13.20, evaluator.evaluate(freight.getRow(8).getCell(15)).getNumberValue(), 0.00001);
assertEquals(13.20, evaluator.evaluate(freight.getRow(8).getCell(16)).getNumberValue(), 0.00001);
assertEquals(2.81, evaluator.evaluate(freight.getRow(4).getCell(13)).getNumberValue(), 0.00001);
assertFalse(workbook.getPrintArea(0).contains("#REF!"));
assertTrue(workbook.getPrintArea(1).contains("$T$9"));
assertTrue(workbook.getPrintArea(1).contains("$U$9"));
}
}
@@ -114,8 +116,8 @@ class ArBillWorkbookWriterTest {
assertEquals(2, workbook.getNumberOfSheets());
XSSFSheet sheet = workbook.getSheetAt(1);
assertEquals("ROUND(J4005*L4005,2)", sheet.getRow(4004).getCell(13).getCellFormula());
assertEquals("SUM(P5:P4005)", sheet.getRow(4006).getCell(15).getCellFormula());
assertEquals(4001, sheet.getRow(4006).getCell(15).getNumericCellValue());
assertEquals("SUM(Q5:Q4005)", sheet.getRow(4006).getCell(16).getCellFormula());
assertEquals(4001, sheet.getRow(4006).getCell(16).getNumericCellValue());
assertEquals(4001, workbook.getSheetAt(0).getRow(7).getCell(4).getNumericCellValue());
}
}
@@ -129,6 +131,7 @@ class ArBillWorkbookWriterTest {
withoutRemark.setCurrency("USD");
withoutRemark.setBillingFailStatus(2);
withoutRemark.setRemark(null);
withoutRemark.setGoodsDescription("仅供内部使用的品名描述");
ArBillDetail success = detail(3, "P1", "1.00");
success.setCurrency("USD");
success.setBillingFailStatus(0);
@@ -136,21 +139,21 @@ class ArBillWorkbookWriterTest {
summaryWriter(List.of(detail, withoutRemark, success)).write(bill(3, "3.00", "USD"), summaryTemplate(), target);
try (XSSFWorkbook workbook = new XSSFWorkbook(target.toFile())) {
XSSFSheet freight = workbook.getSheetAt(1);
for (int column : new int[]{11, 12, 13, 14, 15}) {
for (int column : new int[]{11, 12, 13, 15, 16}) {
String title = freight.getRow(3).getCell(column).getStringCellValue();
assertTrue(title.contains("USD"));
assertFalse(title.contains("CNY"));
}
assertEquals("USD", workbook.getSheetAt(0).getRow(5).getCell(5).getStringCellValue());
for (int column = 0; column < 20; column++) {
for (int column = 0; column < 21; column++) {
assertEquals(IndexedColors.YELLOW.getIndex(), freight.getRow(4).getCell(column).getCellStyle().getFillForegroundColor());
}
assertEquals("备注 & <快照>", freight.getRow(4).getCell(18).getStringCellValue());
assertEquals("销售价未匹配国家", freight.getRow(4).getCell(19).getStringCellValue());
assertEquals("", freight.getRow(5).getCell(18).getStringCellValue());
assertEquals("销售价未匹配国家", freight.getRow(5).getCell(19).getStringCellValue());
assertEquals("备注 & <快照>", freight.getRow(6).getCell(18).getStringCellValue());
assertEquals("", freight.getRow(4).getCell(19).getStringCellValue());
assertEquals("销售价未匹配国家", freight.getRow(4).getCell(20).getStringCellValue());
assertEquals("", freight.getRow(5).getCell(19).getStringCellValue());
assertEquals("销售价未匹配国家", freight.getRow(5).getCell(20).getStringCellValue());
assertEquals("", freight.getRow(6).getCell(19).getStringCellValue());
assertEquals("", freight.getRow(6).getCell(20).getStringCellValue());
}
}
@@ -179,6 +182,7 @@ class ArBillWorkbookWriterTest {
XSSFSheet sheet = workbook.getSheetAt(0);
assertEquals(21, sheet.getRow(4).getLastCellNum());
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());
@@ -243,7 +247,9 @@ class ArBillWorkbookWriterTest {
detail.setActualWeight(new BigDecimal("8.5"));
detail.setChargeWeight(new BigDecimal("1.125"));
detail.setFreightRate(new BigDecimal("2.5"));
detail.setRegistrationFee(new BigDecimal("3.25"));
// 公式导出要求费用组成与账单快照一致,保留运费样例,其余金额作为操作费。
BigDecimal freight = detail.getChargeWeight().multiply(detail.getFreightRate()).setScale(2, RoundingMode.HALF_UP);
detail.setRegistrationFee(new BigDecimal(amount).subtract(freight));
detail.setTotalAmount(new BigDecimal(amount));
detail.setCurrency("CNY");
detail.setRemark("备注 & <快照>");