导出：规格大小时大时小问题修改

@@ -820,7 +820,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                                 formulaComponentList.add(formulaComponent);
                             }
 
-                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatex(formulaComponentList);
                             if (StringUtils.isNotBlank(latex)) {
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 5);// E列
                             }
@@ -879,7 +879,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                                 formulaComponentList.add(formulaComponent);
                             }
 
-                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatex(formulaComponentList);
                             if (StringUtils.isNotBlank(latex)) {
                                 LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 9);// E列
                             }
@@ -1067,6 +1067,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
                 try {
                     Sheet sheet = workbook.getSheetAt(0);
+                    List<SpecImageCell> specImageCells = new ArrayList<>();
                     DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     int startRow = 6;
                     String contractTitle = "销售订单（经销）";
@@ -1099,9 +1100,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             addFormulaComponent(formulaComponentList, line.getWidth(), line.getWidthTolPos(), line.getWidthTolNeg());
                             addFormulaComponent(formulaComponentList, line.getLength(), line.getLengthTolPos(), line.getLengthTolNeg());
 
-                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatexSingleLineFixed3(formulaComponentList);
                             if (StringUtils.isNotBlank(latex)) {
-                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 5);
+                                specImageCells.add(new SpecImageCell(startRow, 5, latex));
                             }
 
                             setCellValue(sheet, startRow, 6, line.getMaterialCode());
@@ -1143,9 +1144,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
                             addFormulaComponent(formulaComponentList, line.getWidth(), line.getWidthTolPos(), line.getWidthTolNeg());
                             addFormulaComponent(formulaComponentList, line.getLength(), line.getLengthTolPos(), line.getLengthTolNeg());
 
-                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatexSingleLineFixed3(formulaComponentList);
                             if (StringUtils.isNotBlank(latex)) {
-                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 9);
+                                specImageCells.add(new SpecImageCell(startRow, 9, latex));
                             }
                             setCellValue(sheet, startRow, 10, line.getMaterialCode());
                             setCellValue(sheet, startRow, 11, line.getProductStatus());
@@ -1158,6 +1159,15 @@ public class ContractDistributorStandardController extends DefaultBaseController
                         }
                     }
 
+                    double specMinScale = 1.0;
+                    for (SpecImageCell specCell : specImageCells) {
+                        double scale = LatexFormulaExcelExporterUtil.calculateFitScale(workbook, sheet, specCell.latex, specCell.rowIndex, specCell.colIndex);
+                        specMinScale = Math.min(specMinScale, scale);
+                    }
+                    for (SpecImageCell specCell : specImageCells) {
+                        LatexFormulaExcelExporterUtil.insertLatexImageToCellWithMaxScale(workbook, sheet, specCell.latex, specCell.rowIndex, specCell.colIndex, specMinScale);
+                    }
+
                     // --- 填充全局变量 ---
                     Map<String, Object> dataMap = buildDataMap(data, contractTitle, dateFormatter);
                     processTemplate(workbook, dataMap);
@@ -1210,6 +1220,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
         }
     }
 
+    private static class SpecImageCell {
+        private final int rowIndex;
+        private final int colIndex;
+        private final String latex;
+
+        private SpecImageCell(int rowIndex, int colIndex, String latex) {
+            this.rowIndex = rowIndex;
+            this.colIndex = colIndex;
+            this.latex = latex;
+        }
+    }
+
     private void addFormulaComponent(List<LatexFormulaExcelExporterUtil.FormulaComponent> list,
                                      BigDecimal base, BigDecimal sup, BigDecimal sub) {
         if (base != null) {

@@ -4,6 +4,8 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.scilab.forge.jlatexmath.TeXConstants;
 import org.scilab.forge.jlatexmath.TeXFormula;
 import org.scilab.forge.jlatexmath.TeXIcon;
@@ -60,6 +62,85 @@ public class LatexFormulaExcelExporterUtil {
         return latex.toString();
     }
 
+    public static String convertToContractSpecLatex(List<FormulaComponent> componentList) {
+        if (CollectionUtils.isEmpty(componentList)) {
+            return "";
+        }
+        if (componentList.size() <= 2) {
+            return convertToLatex(componentList);
+        }
+        String line1 = buildLatexLine(componentList, 0, 2);
+        String line2 = buildLatexLine(componentList, 2, componentList.size());
+        if (line2.isEmpty()) {
+            return "\\mathbf{" + line1 + "}";
+        }
+        return "\\begin{array}{c}\\mathbf{" + line1 + "}\\\\\\mathbf{" + line2 + "}\\end{array}";
+    }
+
+    public static String convertToContractSpecLatexSingleLineFixed3(List<FormulaComponent> componentList) {
+        if (CollectionUtils.isEmpty(componentList)) {
+            return "";
+        }
+
+        int nonNullCount = 0;
+        for (FormulaComponent comp : componentList) {
+            if (comp != null && comp.getBase() != null) {
+                nonNullCount++;
+            }
+        }
+        if (nonNullCount <= 0) {
+            return "";
+        }
+
+        String actual = buildLatexLine(componentList, 0, componentList.size());
+        if (actual.isEmpty()) {
+            return "";
+        }
+
+        int missing = Math.max(0, 3 - nonNullCount);
+        if (missing > 0) {
+            StringBuilder phantom = new StringBuilder();
+            for (int i = 0; i < missing; i++) {
+                phantom.append(" \\times 000^{+00}_{+00}");
+            }
+            actual = actual + "\\phantom{" + phantom + "}";
+        }
+
+        return "\\mathbf{" + actual + "}";
+    }
+
+    private static String buildLatexLine(List<FormulaComponent> componentList, int startIndex, int endIndexExclusive) {
+        StringBuilder latex = new StringBuilder();
+        boolean first = true;
+        int end = Math.min(componentList.size(), endIndexExclusive);
+        for (int i = startIndex; i < end; i++) {
+            FormulaComponent comp = componentList.get(i);
+            if (comp == null || comp.getBase() == null) {
+                continue;
+            }
+            if (!first) {
+                latex.append(" \\times ");
+            }
+            first = false;
+
+            latex.append(formatScientificNotation(comp.getBase()));
+            if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) >= 0) {
+                latex.append("^{+").append(formatScientificNotation(comp.getSup())).append("}");
+            }
+            if (comp.getSup() != null && comp.getSup().compareTo(BigDecimal.ZERO) < 0) {
+                latex.append("^{").append(formatScientificNotation(comp.getSup())).append("}");
+            }
+
+            if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) >= 0) {
+                latex.append("_{+").append(formatScientificNotation(comp.getSub())).append("}");
+            }
+            if (comp.getSub() != null && comp.getSub().compareTo(BigDecimal.ZERO) < 0) {
+                latex.append("_{").append(formatScientificNotation(comp.getSub())).append("}");
+            }
+        }
+        return latex.toString();
+    }
+
 
     /**
      * 处理科学计数法表示的大数字
@@ -141,25 +222,142 @@ public class LatexFormulaExcelExporterUtil {
      * 将LaTeX公式作为图片插入到指定单元格
      */
     public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
-        // 设置固定30像素行高
-        Row row = sheet.getRow(rowIndex);
-        if (row == null) {
-            row = sheet.createRow(rowIndex);
+        int fontSize = resolveCellFontSize(workbook, sheet, rowIndex, colIndex);
+
+        CellRangeAddress mergedRegion = findMergedRegion(sheet, rowIndex, colIndex);
+        if (mergedRegion != null) {
+            insertLatexImageToRegion(
+                    workbook,
+                    sheet,
+                    latex,
+                    mergedRegion.getFirstRow(),
+                    mergedRegion.getFirstColumn(),
+                    mergedRegion.getLastRow() - mergedRegion.getFirstRow() + 1,
+                    mergedRegion.getLastColumn() - mergedRegion.getFirstColumn() + 1,
+                    fontSize,
+                    null
+            );
+            return;
         }
 
-        row.setHeightInPoints(22.5f); // 30像素
+        insertLatexImageToRegion(workbook, sheet, latex, rowIndex, colIndex, 1, 1, fontSize, null);
+    }
 
-        byte[] imageBytes = latexToImageBytes(latex, 48);
-        ByteArrayInputStream bais = new ByteArrayInputStream(imageBytes);
-        BufferedImage image = ImageIO.read(bais);
-        bais.close();
+    /**
+     * 将LaTeX公式作为图片插入到指定单元格
+     */
+    public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex, int rowRange, int colRange) throws IOException {
+        insertLatexImageToRegion(workbook, sheet, latex, rowIndex, colIndex, rowRange, colRange, 16, null);
+    }
 
-        // 如果图片高度超过30像素，按比例缩小
-        double scale = 1.0;
-        if (image.getHeight() > 30) {
-            scale = 30.0 / image.getHeight();
-            System.out.println("图片需要缩放: " + scale);
+    private static final int EMU_PER_PX = 9525;
+
+    public static void insertLatexImageToCellWithMaxScale(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex,
+                                                          double maxScale) throws IOException {
+        int fontSize = resolveCellFontSize(workbook, sheet, rowIndex, colIndex);
+        CellRangeAddress mergedRegion = findMergedRegion(sheet, rowIndex, colIndex);
+        if (mergedRegion != null) {
+            insertLatexImageToRegion(
+                    workbook,
+                    sheet,
+                    latex,
+                    mergedRegion.getFirstRow(),
+                    mergedRegion.getFirstColumn(),
+                    mergedRegion.getLastRow() - mergedRegion.getFirstRow() + 1,
+                    mergedRegion.getLastColumn() - mergedRegion.getFirstColumn() + 1,
+                    fontSize,
+                    maxScale
+            );
+            return;
         }
+        insertLatexImageToRegion(workbook, sheet, latex, rowIndex, colIndex, 1, 1, fontSize, maxScale);
+    }
+
+    public static double calculateFitScale(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
+        int fontSize = resolveCellFontSize(workbook, sheet, rowIndex, colIndex);
+        CellRangeAddress mergedRegion = findMergedRegion(sheet, rowIndex, colIndex);
+        if (mergedRegion != null) {
+            return calculateFitScaleForRegion(
+                    sheet,
+                    latex,
+                    mergedRegion.getFirstRow(),
+                    mergedRegion.getFirstColumn(),
+                    mergedRegion.getLastRow() - mergedRegion.getFirstRow() + 1,
+                    mergedRegion.getLastColumn() - mergedRegion.getFirstColumn() + 1,
+                    fontSize
+            );
+        }
+        return calculateFitScaleForRegion(sheet, latex, rowIndex, colIndex, 1, 1, fontSize);
+    }
+
+    private static double calculateFitScaleForRegion(Sheet sheet, String latex,
+                                                     int rowIndex, int colIndex, int rowRange, int colRange,
+                                                     int fontSize) throws IOException {
+        byte[] imageBytes = latexToImageBytes(latex, fontSize);
+        BufferedImage image;
+        try (ByteArrayInputStream in = new ByteArrayInputStream(imageBytes)) {
+            image = ImageIO.read(in);
+        }
+        if (image == null) {
+            return 1.0;
+        }
+
+        int regionWidthPx = 0;
+        for (int c = colIndex; c < colIndex + colRange; c++) {
+            regionWidthPx += getColumnWidthPx(sheet, c);
+        }
+        int regionHeightPx = 0;
+        for (int r = rowIndex; r < rowIndex + rowRange; r++) {
+            regionHeightPx += getRowHeightPx(sheet, r);
+        }
+
+        int paddingXPx = 6;
+        int paddingYPx = 2;
+        double scale = Math.min(
+                (double) (regionWidthPx - paddingXPx * 2) / Math.max(1, image.getWidth()),
+                (double) (regionHeightPx - paddingYPx * 2) / Math.max(1, image.getHeight())
+        );
+        return Math.min(scale, 1.0);
+    }
+
+    private static void insertLatexImageToRegion(Workbook workbook, Sheet sheet, String latex,
+                                                 int rowIndex, int colIndex, int rowRange, int colRange,
+                                                 int fontSize, Double maxScale) throws IOException {
+        byte[] imageBytes = latexToImageBytes(latex, fontSize);
+        BufferedImage image;
+        try (ByteArrayInputStream in = new ByteArrayInputStream(imageBytes)) {
+            image = ImageIO.read(in);
+        }
+
+        if (image == null) {
+            return;
+        }
+
+        int regionWidthPx = 0;
+        for (int c = colIndex; c < colIndex + colRange; c++) {
+            regionWidthPx += getColumnWidthPx(sheet, c);
+        }
+        int regionHeightPx = 0;
+        for (int r = rowIndex; r < rowIndex + rowRange; r++) {
+            regionHeightPx += getRowHeightPx(sheet, r);
+        }
+
+        int paddingXPx = 6;
+        int paddingYPx = 2;
+        double scale = Math.min(
+                (double) (regionWidthPx - paddingXPx * 2) / Math.max(1, image.getWidth()),
+                (double) (regionHeightPx - paddingYPx * 2) / Math.max(1, image.getHeight())
+        );
+        scale = Math.min(scale, 1.0);
+        if (maxScale != null) {
+            scale = Math.min(scale, maxScale);
+        }
+
+        int scaledWidthPx = Math.max(1, (int) Math.round(image.getWidth() * scale));
+        int scaledHeightPx = Math.max(1, (int) Math.round(image.getHeight() * scale));
+
+        int offsetXPx = Math.max(paddingXPx, (regionWidthPx - scaledWidthPx) / 2);
+        int offsetYPx = Math.max(paddingYPx, (regionHeightPx - scaledHeightPx) / 2);
 
         int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
         Drawing<?> drawing = sheet.createDrawingPatriarch();
@@ -167,59 +365,142 @@ public class LatexFormulaExcelExporterUtil {
         ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
         anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
 
-        anchor.setCol1(colIndex);
-        anchor.setRow1(rowIndex);
-        anchor.setCol2(colIndex);
-        anchor.setRow2(rowIndex);
+        AnchorCoord x1 = resolveAnchorX(sheet, colIndex, colRange, offsetXPx);
+        AnchorCoord x2 = resolveAnchorX(sheet, colIndex, colRange, offsetXPx + scaledWidthPx);
+        AnchorCoord y1 = resolveAnchorY(sheet, rowIndex, rowRange, offsetYPx);
+        AnchorCoord y2 = resolveAnchorY(sheet, rowIndex, rowRange, offsetYPx + scaledHeightPx);
 
-        int scaledWidth = (int) (image.getWidth() * scale);
-        int rate = 1;
-        if (scaledWidth >= 60 && scaledWidth <= 150) {
-            rate = 2;
-        } else if (scaledWidth > 150) {
-            rate = 3;
-        }
+        anchor.setCol1(x1.index);
+        anchor.setCol2(x2.index);
+        anchor.setRow1(y1.index);
+        anchor.setRow2(y2.index);
 
-        anchor.setDx1(25);
-        anchor.setDy1(25);
-        anchor.setDx2(330 * rate);
-        anchor.setDy2(235);
+        if (anchor instanceof org.apache.poi.hssf.usermodel.HSSFClientAnchor) {
+            int dx1 = pxToHssfDx(sheet, x1.index, x1.offsetPx);
+            int dx2 = pxToHssfDx(sheet, x2.index, x2.offsetPx);
+            int dy1 = pxToHssfDy(sheet, y1.index, y1.offsetPx);
+            int dy2 = pxToHssfDy(sheet, y2.index, y2.offsetPx);
+
+            if (x2.index == x1.index && dx2 <= dx1) {
+                dx2 = Math.min(1023, dx1 + 1);
+            }
+            if (y2.index == y1.index && dy2 <= dy1) {
+                dy2 = Math.min(255, dy1 + 1);
+            }
+
+            anchor.setDx1(dx1);
+            anchor.setDx2(dx2);
+            anchor.setDy1(dy1);
+            anchor.setDy2(dy2);
+        } else {
+            int dx1 = x1.offsetPx * EMU_PER_PX;
+            int dx2 = x2.offsetPx * EMU_PER_PX;
+            int dy1 = y1.offsetPx * EMU_PER_PX;
+            int dy2 = y2.offsetPx * EMU_PER_PX;
+
+            if (x2.index == x1.index && dx2 <= dx1) {
+                dx2 = dx1 + 1;
+            }
+            if (y2.index == y1.index && dy2 <= dy1) {
+                dy2 = dy1 + 1;
+            }
+
+            anchor.setDx1(dx1);
+            anchor.setDx2(dx2);
+            anchor.setDy1(dy1);
+            anchor.setDy2(dy2);
+        }
 
         drawing.createPicture(anchor, pictureIdx);
     }
 
-    /**
-     * 将LaTeX公式作为图片插入到指定单元格
-     */
-    public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex, int rowRange, int colRange) throws IOException {
-        // 1. 将LaTeX渲染为图片字节
-        byte[] imageBytes = latexToImageBytes(latex, 36);
+    private static int getColumnWidthPx(Sheet sheet, int colIndex) {
+        int widthUnits = sheet.getColumnWidth(colIndex);
+        return Math.max(1, (int) Math.round(widthUnits / 256.0 * 7.0 + 5));
+    }
 
-        // 2. 将图片添加到工作簿
-        int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
+    private static int getRowHeightPx(Sheet sheet, int rowIndex) {
+        Row row = sheet.getRow(rowIndex);
+        float points = row == null ? sheet.getDefaultRowHeightInPoints() : row.getHeightInPoints();
+        return Math.max(1, (int) Math.round(points * 96.0 / 72.0));
+    }
 
-        // 3. 创建绘图对象
-        Drawing<?> drawing = sheet.createDrawingPatriarch();
+    private static class AnchorCoord {
+        final int index;
+        final int offsetPx;
 
-        // 4. 创建锚点，确定图片位置
-        ClientAnchor anchor = workbook.getCreationHelper().createClientAnchor();
-        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
-        anchor.setCol1(colIndex); // C列 (从0开始计数)
-        anchor.setRow1(rowIndex); // 当前数据行 (表头在第0行)
-        anchor.setCol2(colIndex + colRange); // 结束于D列
-        anchor.setRow2(rowIndex + rowRange); // 结束于下一行
+        private AnchorCoord(int index, int offsetPx) {
+            this.index = index;
+            this.offsetPx = offsetPx;
+        }
+    }
 
-        // 设置较小的起始偏移
-        anchor.setDx1(10000);   // 水平偏移（建议值：10-100）
-        anchor.setDy1(10000);   // 垂直偏移（建议值：10-50）
+    private static AnchorCoord resolveAnchorX(Sheet sheet, int colIndex, int colRange, int offsetPx) {
+        int remaining = offsetPx;
+        for (int c = colIndex; c < colIndex + colRange; c++) {
+            int w = getColumnWidthPx(sheet, c);
+            if (remaining <= w) {
+                return new AnchorCoord(c, Math.max(0, remaining));
+            }
+            remaining -= w;
+        }
+        int lastCol = colIndex + colRange - 1;
+        return new AnchorCoord(lastCol, getColumnWidthPx(sheet, lastCol));
+    }
+
+    private static AnchorCoord resolveAnchorY(Sheet sheet, int rowIndex, int rowRange, int offsetPx) {
+        int remaining = offsetPx;
+        for (int r = rowIndex; r < rowIndex + rowRange; r++) {
+            int h = getRowHeightPx(sheet, r);
+            if (remaining <= h) {
+                return new AnchorCoord(r, Math.max(0, remaining));
+            }
+            remaining -= h;
+        }
+        int lastRow = rowIndex + rowRange - 1;
+        return new AnchorCoord(lastRow, getRowHeightPx(sheet, lastRow));
+    }
+
+    private static int pxToHssfDx(Sheet sheet, int colIndex, int offsetPx) {
+        int w = getColumnWidthPx(sheet, colIndex);
+        int px = Math.min(Math.max(offsetPx, 0), w);
+        return (int) Math.round(px * 1023.0 / Math.max(1, w));
+    }
 
+    private static int pxToHssfDy(Sheet sheet, int rowIndex, int offsetPx) {
+        int h = getRowHeightPx(sheet, rowIndex);
+        int px = Math.min(Math.max(offsetPx, 0), h);
+        return (int) Math.round(px * 255.0 / Math.max(1, h));
+    }
 
-        // 5. 创建图片并插入
-        Picture pict = drawing.createPicture(anchor, pictureIdx);
+    private static CellRangeAddress findMergedRegion(Sheet sheet, int rowIndex, int colIndex) {
+        for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
+            CellRangeAddress region = sheet.getMergedRegion(i);
+            if (region == null) {
+                continue;
+            }
+            if (rowIndex >= region.getFirstRow()
+                    && rowIndex <= region.getLastRow()
+                    && colIndex >= region.getFirstColumn()
+                    && colIndex <= region.getLastColumn()) {
+                return region;
+            }
+        }
+        return null;
+    }
 
-        // 6. 自动调整图片大小以适应单元格 (可选)
-        // 取消注释此行使图片自动适应锚点区域
-        pict.resize(0.95); // 缩小到90%，自然产生边距
+    private static int resolveCellFontSize(Workbook workbook, Sheet sheet, int rowIndex, int colIndex) {
+        Row row = sheet.getRow(rowIndex);
+        Cell cell = row == null ? null : row.getCell(colIndex);
+        CellStyle style = cell == null ? null : cell.getCellStyle();
+        short fontIndex = style == null ? 0 : style.getFontIndex();
+        Font font = workbook.getFontAt(fontIndex);
+        short cellFontSize = font == null ? 11 : font.getFontHeightInPoints();
+
+        int latexFontSize = cellFontSize + 4;
+        latexFontSize = Math.max(14, latexFontSize);
+        latexFontSize = Math.min(20, latexFontSize);
+        return latexFontSize;
     }
 
     @Data