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

yuan

2026-04-23 833a285ef00a84fc1a88464eb3d7d1934cf71ff6

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

@@ -257,8 +257,16 @@
                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);
@@ -305,70 +313,81 @@
                    }
                }

                // 查询商品
                // 查询产品
                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());

                    // 第7列：共四联区域
                    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("导出失败");
        }
    }