From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |  343 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 284 insertions(+), 59 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 c09ccd0..6ebc49c 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -3,6 +3,8 @@
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillConfig;
+import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -44,10 +46,15 @@
 import com.ruoyi.sales.pojo.*;
 import com.ruoyi.sales.service.ISalesLedgerProductService;
 import com.ruoyi.sales.service.ISalesLedgerService;
+import com.ruoyi.sales.vo.ShippingNoteVo;
 import com.ruoyi.stock.mapper.StockInventoryMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -226,87 +233,229 @@
 
     @Override
     public void exportShippingNote(HttpServletResponse response, List<Long> ids) {
-        log.info("寮�濮嬪鍑洪�佽揣鍗曪紝鍙拌处ID鍒楄〃: {}", ids);
+        try {
+            List<SalesLedger> ledgerList = salesLedgerMapper.selectBatchIds(ids);
+            String fileName = "閫佽揣鍗�.xlsx";
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
 
-        // 鍙傛暟鏍¢獙
-        if (ids == null || ids.isEmpty()) {
-            throw new BaseException("璇烽�夋嫨瑕佸鍑虹殑閿�鍞彴璐�");
-        }
+            XSSFWorkbook workbook = new XSSFWorkbook();
 
-        List<SalesLedger> salesLedgerList = salesLedgerMapper.selectList(
-                Wrappers.<SalesLedger>lambdaQuery()
-                        .in(SalesLedger::getId, ids)
-        );
+            for (SalesLedger ledger : ledgerList) {
+                XSSFSheet sheet = workbook.createSheet(ledger.getSalesContractNo());
 
-        if (salesLedgerList.isEmpty()) {
-            throw new BaseException("鏈壘鍒板搴旈攢鍞彴璐︽暟鎹�");
-        }
+                sheet.setColumnWidth(0, 2500);
+                sheet.setColumnWidth(1, 4000);
+                sheet.setColumnWidth(2, 9000);
+                sheet.setColumnWidth(3, 2500);
+                sheet.setColumnWidth(4, 3000);
+                sheet.setColumnWidth(5, 4500);
+                sheet.setColumnWidth(6, 2000);
 
-        response.setContentType("application/zip");
-        response.setHeader("Content-Disposition", "attachment;filename=閫佽揣鍗�.zip");
-        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+                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);
 
-        // 鐩存帴鍐呭瓨鎵撳寘锛屾姏寮冧复鏃舵枃浠�
-        try (ZipOutputStream zos = new ZipOutputStream(response.getOutputStream())) {
+                // 鏍峰紡1锛氬甫铏氱嚎 + 灞呬腑
+                CellStyle dashStyle = createDashBottomStyle(workbook);
+                dashStyle.setAlignment(HorizontalAlignment.CENTER);
+                dashStyle.setVerticalAlignment(VerticalAlignment.CENTER);
 
-            for (SalesLedger ledger : salesLedgerList) {
-                log.info("澶勭悊鍚堝悓鍙�: {}", ledger.getSalesContractNo());
+                // 鏍峰紡2锛氭棤杈规 + 灞呬腑锛堢粰浠撳簱鐢級
+                CellStyle centerNoBorder = createNoBorderStyle(workbook);
+                centerNoBorder.setAlignment(HorizontalAlignment.CENTER);
+                centerNoBorder.setVerticalAlignment(VerticalAlignment.CENTER);
 
-                // 鏌ヨ鏄庣粏
+                // 鏍囬
+                Row row0 = sheet.createRow(0);
+                row0.createCell(0).setCellValue("婀栧崡楣忓垱鐢靛瓙鏈夐檺鍏徃");
+                sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
+                fillMergeRange(sheet, 0, 0, 0, 6, companyTitle);
+
+                Row row1 = sheet.createRow(1);
+                row1.createCell(0).setCellValue("閫� 璐� 鍗�");
+                sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 6));
+                fillMergeRange(sheet, 1, 1, 0, 6, billTitle);
+
+                Customer customer = customerMapper.selectById(ledger.getCustomerId());
+
+                Row row2 = sheet.createRow(2);
+                row2.createCell(0).setCellValue("瀹㈡埛鍚嶇О锛�" + ledger.getCustomerName());
+                row2.createCell(4).setCellValue("鍗曟嵁缂栧彿锛�" + ledger.getSalesContractNo());
+
+                Row row3 = sheet.createRow(3);
+                row3.createCell(0).setCellValue("閫佽揣鍦板潃锛�" + customer.getCompanyAddress());
+                row3.createCell(4).setCellValue("閫佽揣鏃ユ湡锛�" + formatDate(LocalDate.now()));
+
+                Row row4 = sheet.createRow(4);
+                row4.createCell(0).setCellValue("鑱旂郴鏂瑰紡锛�" + customer.getContactPerson() + " " + customer.getContactPhone());
+                row4.createCell(4).setCellValue("鑱旂郴鐢佃瘽锛�" + customer.getCompanyPhone());
+
+                Row row5 = sheet.createRow(5);
+                row5.createCell(0).setCellValue("閫佽揣鍗曚綅锛氭箹鍗楅箯鍒涚數瀛愭湁闄愬叕鍙�");
+                Row row6 = sheet.createRow(6);
+                row6.createCell(0).setCellValue("鍦板潃锛氭箹鍗楃渷鑰掗槼甯傚垱鏂板垱涓氬洯A1鏍�");
+                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]);
+                    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 p : productList) {
+                    if (p.getQuantity() != null) totalQuantity = totalQuantity.add(p.getQuantity());
+                }
+
+                int currentRow = tableStart + 1;
+                String[] fourNames = {"瀛樻牴", "鍥炲崟", "瀹㈡埛", "浠撳簱"};
+
+                // 1. 鎵�鏈変骇鍝�
                 for (int i = 0; i < productList.size(); i++) {
-                    productList.get(i).setSerialNumber(i + 1);
+                    SalesLedgerProduct p = productList.get(i);
+                    Row dataRow = sheet.createRow(currentRow++);
+
+                    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());
+
+                    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]);
+                        if (i <= 2) {
+                            fourCell.setCellStyle(dashStyle);
+                        } else {
+                            fourCell.setCellStyle(centerNoBorder);
+                        }
+                    } else {
+                        fourCell.setCellStyle(centerNoBorder);
+                    }
                 }
 
-                // 鍏宠仈鏌ヨ瀹㈡埛淇℃伅
-                Customer customer = customerMapper.selectById(ledger.getCustomerId());
-                // 缁勮鏁版嵁
-                Map<String, Object> dataMap = new HashMap<>();
-                dataMap.put("customerName", ledger.getCustomerName());
-                dataMap.put("companyAddress", customer.getCompanyAddress());
-                dataMap.put("contactPerson", customer.getContactPerson());
-                dataMap.put("contactPhone", customer.getContactPhone());
-                dataMap.put("companyPhone", customer.getCompanyPhone());
-                dataMap.put("salesContractNo", ledger.getSalesContractNo());
-                dataMap.put("deliveryDate", formatDate(LocalDate.now()));
-                // 鏀惧叆鍟嗗搧闆嗗悎
-                dataMap.put("products", productList);
+                // 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++);
 
-                // 姣忔寰幆鍏ㄦ柊璇诲彇妯℃澘锛屽交搴曡В鍐虫祦闂
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                try (InputStream templateIs = this.getClass().getResourceAsStream("/static/shipping-note.xlsx")) {
-                    if (templateIs == null) throw new BaseException("妯℃澘鏂囦欢涓嶅瓨鍦�");
+                    for (int c = 0; c <= 5; c++) dataRow.createCell(c).setCellStyle(dataCenterStyle);
 
-                    // EasyExcel濉厖
-                    ExcelWriter writer = EasyExcel.write(bos).withTemplate(templateIs).build();
-                    WriteSheet sheet = EasyExcel.writerSheet().build();
-                    writer.fill(dataMap, sheet);
-                    writer.finish();
+                    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);
+                    }
                 }
 
-                // 鎵撳寘杩沍IP
-                String excelName = String.format("閫佽揣鍗昣%s.xlsx",
-                        Optional.ofNullable(ledger.getSalesContractNo()).orElse(String.valueOf(ledger.getId())));
-                ZipEntry entry = new ZipEntry(excelName);
-                zos.putNextEntry(entry);
-                zos.write(bos.toByteArray());
-                zos.closeEntry();
-                bos.close();
+                // 鍚堣
+                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(centerNoBorder);
+
+                // 澶囨敞
+                currentRow++;
+                Row remarkRow = sheet.createRow(currentRow);
+                remarkRow.createCell(0).setCellValue("澶囨敞锛氳吹鍙稿湪鏀惰揣鍚庤鍗冲埢鏍稿疄鏁伴噺鍙婂搧璐紝鑻ユ湁寮傝锛岃鍦�3鏃ュ唴鎻愬嚭锛屽惁鍒欒涓烘敹鍙椼��");
+                sheet.addMergedRegion(new CellRangeAddress(currentRow, currentRow, 0, 6));
+
+                currentRow++;
+                Row sign1 = sheet.createRow(currentRow);
+                sign1.createCell(0).setCellValue("閫佽揣鍗曚綅锛堢绔狅級锛�");
+                sign1.createCell(5).setCellValue("鏀惰揣鍗曚綅锛�");
+
+                currentRow++;
+                Row sign2 = sheet.createRow(currentRow);
+                sign2.createCell(0).setCellValue("閫佽揣浜猴細");
+                sign2.createCell(5).setCellValue("鏀惰揣浜猴細");
             }
 
-            zos.finish();
-            log.info("鎵归噺瀵煎嚭瀹屾垚锛屽叡{}浠介�佽揣鍗�", salesLedgerList.size());
+            workbook.write(response.getOutputStream());
+            workbook.close();
 
-        } catch (BaseException e) {
-            log.error("瀵煎嚭澶辫触:{}", e.getMessage(), e);
-            throw e;
         } catch (Exception e) {
-            log.error("瀵煎嚭寮傚父", e);
-            throw new BaseException("瀵煎嚭澶辫触锛�" + e.getMessage());
+            log.error("鎵归噺瀵煎嚭閫佽揣鍗曞紓甯�", e);
+            throw new RuntimeException("瀵煎嚭澶辫触");
+        }
+    }
+
+    // 宸ュ叿绫讳笉鍔�
+    private CellStyle createBaseStyle(Workbook workbook, String fontName, short fontSize, boolean bold, boolean center) {
+        CellStyle style = workbook.createCellStyle();
+        Font font = workbook.createFont();
+        font.setFontName(fontName);
+        font.setFontHeightInPoints(fontSize);
+        font.setBold(bold);
+        style.setFont(font);
+        if (center) {
+            style.setAlignment(HorizontalAlignment.CENTER);
+            style.setVerticalAlignment(VerticalAlignment.CENTER);
+        }
+        return style;
+    }
+
+    private CellStyle createBorderStyle(Workbook workbook, String fontName, short fontSize, boolean bold, boolean center) {
+        CellStyle style = createBaseStyle(workbook, fontName, fontSize, bold, center);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        return style;
+    }
+
+    private CellStyle createNoBorderStyle(Workbook workbook) {
+        return createBaseStyle(workbook, "瀹嬩綋", (short) 11, false, false);
+    }
+
+    private CellStyle createDashBottomStyle(Workbook workbook) {
+        CellStyle style = createNoBorderStyle(workbook);
+        style.setBorderBottom(BorderStyle.DASHED);
+        return style;
+    }
+
+    private void fillMergeRange(Sheet sheet, int startR, int endR, int startC, int endC, CellStyle style) {
+        for (int r = startR; r <= endR; r++) {
+            Row row = sheet.getRow(r) == null ? sheet.createRow(r) : sheet.getRow(r);
+            for (int c = startC; c <= endC; c++) {
+                Cell cell = row.getCell(c) == null ? row.createCell(c) : row.getCell(c);
+                cell.setCellStyle(style);
+            }
         }
     }
 
@@ -316,6 +465,82 @@
         }
         return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
     }
+    
+    /**
+     * 璁剧疆鍗曞厓鏍兼牱寮�
+     */
+    private void setCellStyle(Cell cell, boolean isHeader, boolean isTitle) {
+        Workbook workbook = cell.getSheet().getWorkbook();
+        CellStyle style = workbook.createCellStyle();
+        
+        // 璁剧疆瀵归綈鏂瑰紡
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        
+        // 璁剧疆杈规
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        
+        // 璁剧疆瀛椾綋
+        Font font = workbook.createFont();
+        font.setFontName("瀹嬩綋");
+        if (isTitle) {
+            font.setFontHeightInPoints((short) 16);
+            font.setBold(true);
+        } else if (isHeader) {
+            font.setFontHeightInPoints((short) 12);
+            font.setBold(true);
+        } else {
+            font.setFontHeightInPoints((short) 11);
+        }
+        style.setFont(font);
+        
+        cell.setCellStyle(style);
+    }
+    
+    
+    /**
+     * 閫佽揣鍗曟牱寮忓鐞嗗櫒
+     */
+    public static class ShippingNoteStyleHandler implements com.alibaba.excel.write.handler.CellWriteHandler {
+        @Override
+        public void beforeCellCreate(com.alibaba.excel.write.metadata.holder.WriteSheetHolder writeSheetHolder, com.alibaba.excel.write.metadata.holder.WriteTableHolder writeTableHolder, org.apache.poi.ss.usermodel.Row row, com.alibaba.excel.metadata.Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {
+        }
+        
+//        @Override
+//        public void afterCellDispose(com.alibaba.excel.write.metadata.holder.WriteSheetHolder writeSheetHolder, com.alibaba.excel.write.metadata.holder.WriteTableHolder writeTableHolder, org.apache.poi.ss.usermodel.Cell cell, com.alibaba.excel.metadata.Head head, Integer relativeRowIndex, Boolean isHead) {
+//            org.apache.poi.ss.usermodel.Workbook workbook = writeSheetHolder.getSheet().getWorkbook();
+//            org.apache.poi.ss.usermodel.Sheet sheet = writeSheetHolder.getSheet();
+//
+//            // 璁剧疆鍒楀
+//            sheet.setColumnWidth(0, 6000); // 搴忓彿
+//            sheet.setColumnWidth(1, 6000); // 鐗╂枡缂栧彿
+//            sheet.setColumnWidth(2, 10000); // 鍝佸悕/瑙勬牸
+//            sheet.setColumnWidth(3, 4000); // 鍗曚綅
+//            sheet.setColumnWidth(4, 4000); // 鏁伴噺
+//            sheet.setColumnWidth(5, 6000); // 璁㈠崟鍙�
+//            sheet.setColumnWidth(6, 4000); // 鍏卞洓鑱�
+//
+//            // 璁剧疆鍗曞厓鏍兼牱寮�
+//            org.apache.poi.ss.usermodel.CellStyle style = workbook.createCellStyle();
+//            style.setAlignment(org.apache.poi.ss.usermodel.HorizontalAlignment.CENTER);
+//            style.setVerticalAlignment(org.apache.poi.ss.usermodel.VerticalAlignment.CENTER);
+//            style.setBorderTop(org.apache.poi.ss.usermodel.BorderStyle.THIN);
+//            style.setBorderBottom(org.apache.poi.ss.usermodel.BorderStyle.THIN);
+//            style.setBorderLeft(org.apache.poi.ss.usermodel.BorderStyle.THIN);
+//            style.setBorderRight(org.apache.poi.ss.usermodel.BorderStyle.THIN);
+//
+//            // 璁剧疆瀛椾綋
+//            org.apache.poi.ss.usermodel.Font font = workbook.createFont();
+//            font.setFontName("瀹嬩綋");
+//            font.setFontHeightInPoints((short) 11);
+//            style.setFont(font);
+//
+//            cell.setCellStyle(style);
+//        }
+    }
 
     @Override
     public List<Map<String, Object>> getSalesNo() {

--
Gitblit v1.9.3