Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

2026-04-23 833a285ef00a84fc1a88464eb3d7d1934cf71ff6

Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java

@@ -189,6 +189,19 @@
    }

    /**
     * å¯¼å‡ºé”€å”®å°è´¦å‘货单
     */
    @Log(title = "导出销售台账发货单", businessType = BusinessType.EXPORT)
    @PostMapping("/exportShippingNote")
    public void exportShippingNote(HttpServletResponse response, @RequestParam("ids") String idsStr) throws Exception {
        // å°†é€—号分隔的字符串转换为List<Long>
        List<Long> ids = Arrays.stream(idsStr.split(","))
                .map(Long::parseLong)
                .collect(Collectors.toList());
        salesLedgerService.exportShippingNote(response, ids);
    }

    /**
     * åˆ é™¤é”€å”®å°è´¦
     */
    @Log(title = "销售台账", businessType = BusinessType.DELETE)
@@ -349,4 +362,4 @@
    public R getSalesLedgerWithProductsLoss(Long salesLedgerId) {
        return R.ok(salesLedgerService.getSalesLedgerWithProductsLoss(salesLedgerId));
    }
}
}

 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java

@@ -10,6 +10,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;

/**
 * é”€å”®å°è´¦å¯¹è±¡ sales_ledger
@@ -172,6 +173,9 @@
    @TableField(exist = false)
    private String companyPhone;

    @TableField(exist = false)
    private List<SalesLedgerProduct> productList;

    /**
     * æ˜¯å¦ç”Ÿäº§
     */

 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java

@@ -13,6 +13,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;

/**
 * äº§å“ä¿¡æ¯å¯¹è±¡ sales_ledger_product
@@ -248,6 +249,16 @@
    @TableField(exist = false)
    private Integer hasSufficientStock;

    @ApiModelProperty("序号")
    @TableField(exist = false)
    @Excel(name = "序号")
    private Integer serialNumber;

    @ApiModelProperty("订单号")
    @Excel(name = "订单号")
    @TableField(exist = false)
    private String orderNo;

    @ApiModelProperty("批号")
    private String batchNo;
}

 src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java

@@ -10,6 +10,7 @@
import com.ruoyi.sales.pojo.SalesLedger;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;

@@ -43,4 +44,5 @@

    List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);

    void exportShippingNote(HttpServletResponse response, List<Long> ids);
}

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -1,5 +1,10 @@
package com.ruoyi.sales.service.impl;

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;
@@ -8,6 +13,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
@@ -17,9 +25,11 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.mapper.TempFileMapper;
@@ -34,11 +44,17 @@
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.*;
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;
@@ -48,11 +64,13 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.io.InputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -60,11 +78,14 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.YearMonth;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

/**
 * é”€å”®å°è´¦Service业务层处理
@@ -129,6 +150,8 @@
    private final QualityInspectMapper qualityInspectMapper;

    private final StockInventoryMapper stockInventoryMapper;

    private ISalesLedgerProductService salesLedgerProductService;


    @Autowired
@@ -206,6 +229,317 @@
            resultDto.setSalesLedgerFiles(salesLedgerFiles);
        }
        return resultDto;
    }

    @Override
    public void exportShippingNote(HttpServletResponse response, List<Long> 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");

            XSSFWorkbook workbook = new XSSFWorkbook();

            for (SalesLedger ledger : ledgerList) {
                XSSFSheet sheet = workbook.createSheet(ledger.getSalesContractNo());

                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);

                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);

                // æ ·å¼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);
                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++) {
                    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);
                    }
                }

                // 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(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("收货人：");
            }

            workbook.write(response.getOutputStream());
            workbook.close();

        } catch (Exception e) {
            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);
            }
        }
    }

    public static String formatDate(LocalDate date) {
        if (date == null) {
            return null;
        }
        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
@@ -868,4 +1202,4 @@
            throw new RuntimeException("动态更新主表金额失败", e);
        }
    }
}
}

 src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.ruoyi.sales.vo;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
public class ShippingNoteVo {
    @Excel(name = "客户名称", cellType = Excel.ColumnType.STRING)
    private String customerName;

    @Excel(name = "送货地址", cellType = Excel.ColumnType.STRING)
    private String companyAddress;

    @Excel(name = "联系人", cellType = Excel.ColumnType.STRING)
    private String contactPerson;

    @Excel(name = "联系电话", cellType = Excel.ColumnType.STRING)
    private String contactPhone;

    @Excel(name = "公司电话", cellType = Excel.ColumnType.STRING)
    private String companyPhone;

    @Excel(name = "单据编号", cellType = Excel.ColumnType.STRING)
    private String salesContractNo;

    @Excel(name = "送货日期", cellType = Excel.ColumnType.STRING)
    private String deliveryDate;

    @Excel(name = "产品信息", type = Excel.Type.EXPORT)
    private List<SalesLedgerProductVo> products;

    @Excel(name = "合计数量", cellType = Excel.ColumnType.NUMERIC)
    private BigDecimal totalQuantity;

    @Data
    public static class SalesLedgerProductVo {
        @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC)
        private Integer serialNumber;

        @Excel(name = "物料编号", cellType = Excel.ColumnType.STRING)
        private String materialCode;

        @Excel(name = "产品类别", cellType = Excel.ColumnType.STRING)
        private String productCategory;

        @Excel(name = "规格型号", cellType = Excel.ColumnType.STRING)
        private String specificationModel;

        @Excel(name = "单位", cellType = Excel.ColumnType.STRING)
        private String unit;

        @Excel(name = "数量", cellType = Excel.ColumnType.NUMERIC)
        private BigDecimal quantity;

        @Excel(name = "订单号", cellType = Excel.ColumnType.STRING)
        private String orderNo;
    }
}

 src/main/resources/static/shipping-note.xlsx

Binary files differ