From bc319e7fcf2c3e1d91e5de2e8c421e82b15a359e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 23 四月 2026 14:25:27 +0800
Subject: [PATCH] 导出销售台账送货单

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |  111 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 65 insertions(+), 46 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..6ebc49c 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,15 +251,22 @@
                 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);
                 CellStyle dataCenterStyle = createBorderStyle(workbook, "瀹嬩綋", (short) 11, false, true);
-                CellStyle noBorder = createNoBorderStyle(workbook);
+
+                // 鏍峰紡1锛氬甫铏氱嚎 + 灞呬腑
                 CellStyle dashStyle = createDashBottomStyle(workbook);
+                dashStyle.setAlignment(HorizontalAlignment.CENTER);
+                dashStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+
+                // 鏍峰紡2锛氭棤杈规 + 灞呬腑锛堢粰浠撳簱鐢級
+                CellStyle centerNoBorder = createNoBorderStyle(workbook);
+                centerNoBorder.setAlignment(HorizontalAlignment.CENTER);
+                centerNoBorder.setVerticalAlignment(VerticalAlignment.CENTER);
 
                 // 鏍囬
                 Row row0 = sheet.createRow(0);
@@ -294,81 +300,94 @@
                 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);
 
                 BigDecimal totalQuantity = BigDecimal.ZERO;
-                for (SalesLedgerProduct product : productList) {
-                    totalQuantity = totalQuantity.add(product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity());
+                for (SalesLedgerProduct p : productList) {
+                    if (p.getQuantity() != null) totalQuantity = totalQuantity.add(p.getQuantity());
                 }
 
                 int currentRow = tableStart + 1;
                 String[] fourNames = {"瀛樻牴", "鍥炲崟", "瀹㈡埛", "浠撳簱"};
-                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);
+                // 1. 鎵�鏈変骇鍝�
+                for (int i = 0; i < productList.size(); i++) {
+                    SalesLedgerProduct p = productList.get(i);
+                    Row dataRow = sheet.createRow(currentRow++);
 
-                    // 鍓�6鍒楄祴鍊�
-                    if (p != null) {
-                        String materialCode = "";
-                        if (p.getProductModelId() != null) {
-                            ProductModel m = productModelMapper.selectById(p.getProductModelId());
-                            if (m != null) {
-                                materialCode = m.getMaterialCode();
-                            }
-                        }
-                        dataRow.createCell(0).setCellValue(i + 1);
-                        dataRow.createCell(1).setCellValue(materialCode);
-                        dataRow.createCell(2).setCellValue(p.getProductCategory() + "/" + p.getSpecificationModel());
-                        dataRow.createCell(3).setCellValue(p.getUnit());
-                        dataRow.createCell(4).setCellValue(p.getQuantity() == null ? 0 : p.getQuantity().doubleValue());
-                        dataRow.createCell(5).setCellValue(ledger.getSalesContractNo());
-                    } else {
-                        for (int c = 0; c <= 5; c++) {
-                            dataRow.createCell(c);
-                        }
+                    String materialCode = "";
+                    if (p.getProductModelId() != null) {
+                        ProductModel m = productModelMapper.selectById(p.getProductModelId());
+                        if (m != null) materialCode = m.getMaterialCode();
                     }
 
-                    // 鍓�6鍒楁牱寮�
-                    for (int c = 0; c <= 5; c++) {
-                        dataRow.getCell(c).setCellStyle(dataCenterStyle);
-                    }
+                    dataRow.createCell(0).setCellValue(i + 1);
+                    dataRow.createCell(1).setCellValue(materialCode);
+                    dataRow.createCell(2).setCellValue(p.getProductCategory() + "/" + p.getSpecificationModel());
+                    dataRow.createCell(3).setCellValue(p.getUnit());
+                    dataRow.createCell(4).setCellValue(p.getQuantity() == null ? 0 : p.getQuantity().doubleValue());
+                    dataRow.createCell(5).setCellValue(ledger.getSalesContractNo());
 
-                    // 鍏卞洓鑱斿垪
+                    for (int c = 0; c <= 5; c++) dataRow.getCell(c).setCellStyle(dataCenterStyle);
+
                     Cell fourCell = dataRow.createCell(6);
                     if (i < fourNames.length) {
                         fourCell.setCellValue(fourNames[i]);
-                        fourCell.setCellStyle(dashStyle);
+                        if (i <= 2) {
+                            fourCell.setCellStyle(dashStyle);
+                        } else {
+                            fourCell.setCellStyle(centerNoBorder);
+                        }
                     } else {
-                        fourCell.setCellStyle(noBorder);
+                        fourCell.setCellStyle(centerNoBorder);
                     }
-
-                    currentRow++;
                 }
 
-                // 鍚堣琛�
+                // 2. 涓嶈冻6琛岃ˉ绌�
+                int minRow = 6;
+                int needEmpty = Math.max(0, minRow - productList.size());
+                for (int i = 0; i < needEmpty; i++) {
+                    int seq = productList.size() + i;
+                    Row dataRow = sheet.createRow(currentRow++);
+
+                    for (int c = 0; c <= 5; c++) dataRow.createCell(c).setCellStyle(dataCenterStyle);
+
+                    Cell fourCell = dataRow.createCell(6);
+                    if (seq < fourNames.length) {
+                        fourCell.setCellValue(fourNames[seq]);
+                        if (seq <= 2) {
+                            fourCell.setCellStyle(dashStyle);
+                        } else {
+                            fourCell.setCellStyle(centerNoBorder);
+                        }
+                    } else {
+                        fourCell.setCellStyle(centerNoBorder);
+                    }
+                }
+
+                // 鍚堣
                 Row totalRow = sheet.createRow(currentRow);
                 sheet.addMergedRegion(new CellRangeAddress(currentRow, currentRow, 0, 3));
                 totalRow.createCell(0).setCellValue("鍚堣");
                 totalRow.createCell(4).setCellValue(totalQuantity.doubleValue());
                 fillMergeRange(sheet, currentRow, currentRow, 0, 5, dataCenterStyle);
-                totalRow.createCell(6).setCellStyle(noBorder);
+                totalRow.createCell(6).setCellStyle(centerNoBorder);
 
                 // 澶囨敞
                 currentRow++;
@@ -392,7 +411,7 @@
 
         } catch (Exception e) {
             log.error("鎵归噺瀵煎嚭閫佽揣鍗曞紓甯�", e);
-            throw new BaseException("鎵归噺瀵煎嚭澶辫触");
+            throw new RuntimeException("瀵煎嚭澶辫触");
         }
     }
 

--
Gitblit v1.9.3