From ef755a24517a15e602b137820a3c60e19b288a9d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 23 四月 2026 14:16:27 +0800
Subject: [PATCH] 导出销售台账送货单
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 3b6ea8c..86dca57 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -240,7 +240,6 @@
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
- // 鍥哄畾浣跨敤 XSSFWorkbook
XSSFWorkbook workbook = new XSSFWorkbook();
for (SalesLedger ledger : ledgerList) {
@@ -252,9 +251,8 @@
sheet.setColumnWidth(3, 2500);
sheet.setColumnWidth(4, 3000);
sheet.setColumnWidth(5, 4500);
- sheet.setColumnWidth(6, 3500);
+ sheet.setColumnWidth(6, 2000);
- // 鏍峰紡
CellStyle companyTitle = createBaseStyle(workbook, "瀹嬩綋", (short) 20, true, true);
CellStyle billTitle = createBaseStyle(workbook, "瀹嬩綋", (short) 18, true, true);
CellStyle headerStyle = createBorderStyle(workbook, "瀹嬩綋", (short) 12, true, true);
@@ -294,17 +292,20 @@
Row row7 = sheet.createRow(7);
row7.createCell(0).setCellValue("璐х墿璇︾粏淇℃伅锛�");
- // 琛ㄥご
+ // 琛ㄥご锛氬叡鍥涜仈 + 铏氱嚎
int tableStart = 8;
Row headerRow = sheet.createRow(tableStart);
String[] headers = {"搴忓彿", "鐗╂枡缂栧彿", "鍝佸悕/瑙勬牸", "鍗曚綅", "鏁伴噺", "璁㈠崟鍙�", "鍏卞洓鑱�"};
for (int i = 0; i < headers.length; i++) {
Cell hc = headerRow.createCell(i);
hc.setCellValue(headers[i]);
- hc.setCellStyle(i == 6 ? noBorder : headerStyle);
+ if (i == 6) {
+ hc.setCellStyle(dashStyle); // 鍏卞洓鑱� 鈫� 铏氱嚎
+ } else {
+ hc.setCellStyle(headerStyle);
+ }
}
- // 鏌ヨ鍟嗗搧
SalesLedgerProduct cond = new SalesLedgerProduct();
cond.setSalesLedgerId(ledger.getId());
List<SalesLedgerProduct> productList = salesLedgerProductServiceImpl.selectSalesLedgerProductList(cond);
@@ -319,7 +320,6 @@
int minDataRow = 5;
int totalNeedRow = Math.max(minDataRow, fourNames.length);
- // 鏁版嵁琛� + 鍥哄畾鍥涜仈琛�
for (int i = 0; i < totalNeedRow; i++) {
SalesLedgerProduct p = i < productList.size() ? productList.get(i) : null;
Row dataRow = sheet.createRow(currentRow);
@@ -354,7 +354,12 @@
Cell fourCell = dataRow.createCell(6);
if (i < fourNames.length) {
fourCell.setCellValue(fourNames[i]);
- fourCell.setCellStyle(dashStyle);
+
+ if (i == 0 || i == 1 || i == 2) {
+ fourCell.setCellStyle(dashStyle);
+ } else {
+ fourCell.setCellStyle(noBorder);
+ }
} else {
fourCell.setCellStyle(noBorder);
}
@@ -392,7 +397,7 @@
} catch (Exception e) {
log.error("鎵归噺瀵煎嚭閫佽揣鍗曞紓甯�", e);
- throw new BaseException("鎵归噺瀵煎嚭澶辫触");
+ throw new BaseException("瀵煎嚭澶辫触");
}
}
--
Gitblit v1.9.3