Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -498,9 +498,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
             });
         }
 
+
+        String templatePath = "templates/standardContractTemplate.xls";
+        if ("INTL_STD_CONTRACT".equals(data.getType())
+                || "INTL_INVENTORY_AGMT".equals(data.getType())
+                || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) { // 读取外贸合同模版
+            templatePath = "templates/foreignStandardContractTemplate.xls";
+        }
+
         try {
+
             // 加载模板文件
-            ClassPathResource templateResource = new ClassPathResource("templates/standardContractTemplate.xls");
+            ClassPathResource templateResource = new ClassPathResource(templatePath);
             try (InputStream inputStream = templateResource.getStream();
                  Workbook workbook = new HSSFWorkbook(inputStream)) {
                 try {
@@ -551,8 +560,16 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
                             setCellValue(sheet, startRow, 6, contractDistributorLineBo.getStatus()); // F列
                             setCellValue(sheet, startRow, 7, contractDistributorLineBo.getQuantity()); // G列
-                            setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
-                            setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列
+                            if ("INTL_STD_CONTRACT".equals(data.getType())
+                                    || "INTL_INVENTORY_AGMT".equals(data.getType())
+                                    || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
+                                setCellValue(sheet, startRow, 9, contractDistributorLineBo.getProcessingFee()); // I列
+                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getProcessingFee().add(contractDistributorLineBo.getUnitPrice())); // K列
+                            } else {
+                                setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
+                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列
+                            }
+
                             setCellValue(sheet, startRow, 11, contractDistributorLineBo.getTotalAmount()); // L列
                             setCellValue(sheet, startRow, 12, contractDistributorLineBo.getDeliveryDate() != null ?
                                     contractDistributorLineBo.getDeliveryDate().format(dateFormatter) : ""); // L列
@@ -566,8 +583,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     dataMap.put("orderDate", data.getOrderDate().format(dateFormatter));
                     dataMap.put("supplierName", data.getSupplierName());
                     dataMap.put("buyerName", data.getBuyerName());
-//                    dataMap.put("unitName", data.getUnitName());
-                    dataMap.put("unitName", "元、公斤、元/公斤");
+                    dataMap.put("unitName", data.getUnit());
+//                    dataMap.put("unitName", "元、公斤、元/公斤");
 
                     dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
                     dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
@@ -600,9 +617,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 }
 
             } catch (FileNotFoundException e) {
-                throw new RuntimeException("模板文件不存在: templates/standardContractTemplate.xls", e);
+                throw new RuntimeException("模板文件不存在:" + templatePath, e);
             } catch (IOException e) {
-                throw new RuntimeException("无法读取模板文件: templates/standardContractTemplate.xls", e);
+                throw new RuntimeException("无法读取模板文件:" + templatePath, e);
             }
         } catch (Exception e) {
             log.error("标准合同模版打印: {}", e.getMessage(), e);

 package com.lframework.xingyun.sc.controller.order;
 
+import cn.hutool.core.io.resource.ClassPathResource;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
-import com.lframework.starter.web.core.components.resp.PageResult;
-import com.lframework.starter.web.core.components.resp.InvokeResult;
-
-import javax.annotation.Resource;
-import javax.validation.constraints.NotBlank;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
-import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
-import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
-import com.lframework.starter.common.utils.CollectionUtil;
-import io.swagger.annotations.Api;
-import org.springframework.security.core.parameters.P;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -38,6 +62,7 @@ import java.util.stream.Collectors;
  *
  */
 @Api(tags = "订货单表")
+@Slf4j
 @Validated
 @RestController
 @RequestMapping("/purchaseOrderInfo")
@@ -47,6 +72,9 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Autowired
+    private SysUserService sysUserService;
+
     /**
      * 查询列表
      */
@@ -152,4 +180,346 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
 
         return InvokeResultBuilder.success();
     }
+
+    @ApiOperation("订购单打印")
+    @GetMapping("/printPurchaseOrder")
+    public void printPurchaseOrder(@NotBlank(message = "id不能为空") String id, HttpServletResponse response) throws IOException {
+        PurchaseOrderInfo data = purchaseOrderInfoService.findById(id);
+
+        // 设置响应头
+        setupResponse(response, data.getOrderNo() + "-订购单打印.xls");
+
+        Wrapper<PurchaseOrderLine> purchaseOrderLineWrapper = Wrappers.lambdaQuery(PurchaseOrderLine.class)
+                .eq(PurchaseOrderLine::getPurchaseOrderId, id);
+        List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.list(purchaseOrderLineWrapper);
+
+
+        try {
+            // 加载模板文件
+            ClassPathResource templateResource = new ClassPathResource("templates/purchaseOrderTemplate.xlsx");
+            try (InputStream inputStream = templateResource.getStream();
+                 Workbook workbook = new XSSFWorkbook(inputStream)) {
+                try {
+                    Sheet sheet = workbook.getSheetAt(0);
+                    DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                    int startRow = 7; // 产品开始行
+                    BigDecimal totalQuantity=BigDecimal.ZERO;
+                    if (CollectionUtils.isNotEmpty(purchaseOrderLineList)) {
+
+                        for (int i = startRow + 1; i < startRow + purchaseOrderLineList.size(); i++) {
+                            copyRow(workbook, sheet, startRow, i);
+                        }
+
+                        for (PurchaseOrderLine currentOrderLine : purchaseOrderLineList) {
+                            setCellValue(sheet, startRow, 1, currentOrderLine.getIndustry());
+                            setCellValue(sheet, startRow, 2, currentOrderLine.getQuality());
+                            setCellValue(sheet, startRow, 3, currentOrderLine.getBrand());
+
+                            List<LatexFormulaExcelExporterUtil.FormulaComponent> formulaComponentList = new ArrayList<>(3);
+                            if (currentOrderLine.getThickness() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(currentOrderLine.getThickness());
+                                formulaComponent.setSup(currentOrderLine.getThicknessTolPos());
+                                formulaComponent.setSub(currentOrderLine.getThicknessTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            if (currentOrderLine.getWidth() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(currentOrderLine.getWidth());
+                                formulaComponent.setSup(currentOrderLine.getWidthTolPos());
+                                formulaComponent.setSub(currentOrderLine.getWidthTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            if (currentOrderLine.getLength() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(currentOrderLine.getLength());
+                                formulaComponent.setSup(currentOrderLine.getLengthTolPos());
+                                formulaComponent.setSub(currentOrderLine.getLengthTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            if (StringUtils.isNotBlank(latex)) {
+                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7);
+                            }
+
+                            setCellValue(sheet, startRow, 11, currentOrderLine.getStatus());
+                            setCellValue(sheet, startRow, 13, currentOrderLine.getQuantity());
+                            setCellValue(sheet, startRow, 14, currentOrderLine.getSalesPrice());
+                            setCellValue(sheet, startRow, 16, currentOrderLine.getDeliveryDate());
+                            setCellValue(sheet, startRow, 17, currentOrderLine.getAssessmentExceedsAgreement());
+                            totalQuantity = totalQuantity.add(currentOrderLine.getQuantity());
+                            startRow++;
+                        }
+                    }
+
+                    Map<String, Object> dataMap = new HashMap<>();
+                    dataMap.put("supplyUnit", data.getSupplyUnit());
+                    dataMap.put("orderNo", data.getOrderNo());
+                    dataMap.put("orderingUnitName", data.getOrderingUnitName());
+                    dataMap.put("orderDate", data.getOrderDate() == null ? "" : data.getOrderDate().format(dateFormatter));
+
+                    dataMap.put("totalQuantity", totalQuantity.setScale(1, RoundingMode.HALF_UP));
+                    dataMap.put("executionStandard", data.getExecutionStandard());
+                    dataMap.put("deliveryMethod", data.getDeliveryMethod());
+                    dataMap.put("invoicingStatus", data.getInvoicingStatus());
+                    dataMap.put("pieceWeightHeader", data.getPieceWeightHeader());
+                    dataMap.put("surface", data.getSurface());
+                    dataMap.put("tolerance", data.getTolerance());
+                    dataMap.put("performanceance", data.getPerformance());
+                    dataMap.put("packaging", data.getPackaging());
+                    dataMap.put("shippingCost", data.getShippingCost());
+                    dataMap.put("remarks", data.getRemarks());
+                    dataMap.put("createUser", data.getCreateBy());
+                    dataMap.put("element", data.getElement());
+
+
+
+                    processTemplate(workbook, dataMap);
+
+                    // 写入响应流
+                    workbook.write(response.getOutputStream());
+                    response.getOutputStream().flush();
+                } finally {
+                    IOUtils.closeQuietly(workbook);
+                }
+
+            } catch (FileNotFoundException e) {
+                throw new RuntimeException("模板文件不存在: templates/purchaseOrderTemplate.xlsx", e);
+            } catch (IOException e) {
+                throw new RuntimeException("无法读取模板文件: templates/purchaseOrderTemplate.xlsx", e);
+            }
+        } catch (Exception e) {
+            log.error("标准合同模版打印: {}", e.getMessage(), e);
+            throw e;
+        }
+    }
+
+    /**
+     * 设置HTTP响应头
+     */
+    private void setupResponse(HttpServletResponse response, String fileName) throws IOException {
+        String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + encodedFileName);
+        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+    }
+
+    /**
+     * 复制行并处理合并单元格
+     */
+    public static void copyRow(Workbook workbook, Sheet sheet,
+                                                int sourceRowIndex, int targetRowIndex) {
+
+        // 获取源行的所有合并区域
+        List<CellRangeAddress> mergedRegions = getMergedRegionsInRow(sheet, sourceRowIndex);
+
+        // 移动目标行及之后的行
+        if (targetRowIndex <= sheet.getLastRowNum()) {
+            sheet.shiftRows(targetRowIndex, sheet.getLastRowNum(), 1, true, false);
+        }
+
+        // 复制行内容
+        Row sourceRow = sheet.getRow(sourceRowIndex);
+        Row newRow = sheet.createRow(targetRowIndex);
+        newRow.setHeight(sourceRow.getHeight());
+
+        // 复制单元格
+        for (int i = 0; i < sourceRow.getLastCellNum(); i++) {
+            Cell oldCell = sourceRow.getCell(i);
+            Cell newCell = newRow.createCell(i);
+
+            if (oldCell != null) {
+                copyCell(workbook, oldCell, newCell);
+            }
+        }
+
+        // 处理合并单元格
+        handleMergedRegions(sheet, mergedRegions, sourceRowIndex, targetRowIndex);
+    }
+
+    /**
+     * 获取行中涉及的合并区域
+     */
+    private static List<CellRangeAddress> getMergedRegionsInRow(Sheet sheet, int rowIndex) {
+        List<CellRangeAddress> result = new ArrayList<>();
+        for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
+            CellRangeAddress mergedRegion = sheet.getMergedRegion(i);
+            if (mergedRegion.getFirstRow() == rowIndex) {
+                result.add(mergedRegion);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 处理合并单元格的复制
+     */
+    private static void handleMergedRegions(Sheet sheet, List<CellRangeAddress> mergedRegions,
+                                            int sourceRowIndex, int targetRowIndex) {
+
+        for (CellRangeAddress oldRegion : mergedRegions) {
+            // 创建新的合并区域
+            CellRangeAddress newRegion = new CellRangeAddress(
+                    targetRowIndex,
+                    targetRowIndex + (oldRegion.getLastRow() - oldRegion.getFirstRow()),
+                    oldRegion.getFirstColumn(),
+                    oldRegion.getLastColumn()
+            );
+
+            sheet.addMergedRegion(newRegion);
+
+            // 设置合并区域的边框样式
+            setMergedRegionBorderStyle(sheet, newRegion);
+        }
+    }
+
+    /**
+     * 设置合并单元格的边框样式
+     */
+    private static void setMergedRegionBorderStyle(Sheet sheet, CellRangeAddress region) {
+        Row firstRow = sheet.getRow(region.getFirstRow());
+        if (firstRow != null) {
+            Cell firstCell = firstRow.getCell(region.getFirstColumn());
+            if (firstCell != null && firstCell.getCellStyle() != null) {
+                CellStyle style = firstCell.getCellStyle();
+
+                // 为合并区域的所有单元格设置样式
+                for (int i = region.getFirstRow(); i <= region.getLastRow(); i++) {
+                    Row row = sheet.getRow(i);
+                    if (row == null) {
+                        row = sheet.createRow(i);
+                    }
+                    for (int j = region.getFirstColumn(); j <= region.getLastColumn(); j++) {
+                        Cell cell = row.getCell(j);
+                        if (cell == null) {
+                            cell = row.createCell(j);
+                        }
+                        cell.setCellStyle(style);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 复制单元格内容和样式
+     */
+    private static void copyCell(Workbook workbook, Cell oldCell, Cell newCell) {
+        if (oldCell.getCellStyle() != null) {
+            newCell.setCellStyle(oldCell.getCellStyle());
+        }
+
+        switch (oldCell.getCellTypeEnum()) {
+            case STRING:
+                newCell.setCellValue(oldCell.getStringCellValue());
+                break;
+            case NUMERIC:
+                newCell.setCellValue(oldCell.getNumericCellValue());
+                break;
+            case BOOLEAN:
+                newCell.setCellValue(oldCell.getBooleanCellValue());
+                break;
+            case FORMULA:
+                newCell.setCellFormula(oldCell.getCellFormula());
+                break;
+            default:
+                newCell.setCellValue(oldCell.getStringCellValue());
+                break;
+        }
+    }
+
+    /**
+     * 检查指定区域是否存在合并单元格
+     */
+    public static boolean hasMergedRegionsInRange(Sheet sheet, int firstRow, int lastRow,
+                                                  int firstCol, int lastCol) {
+
+        for (int i = 0; i < sheet.getNumMergedRegions(); i++) {
+            CellRangeAddress mergedRegion = sheet.getMergedRegion(i);
+            if (mergedRegion.getFirstRow() >= firstRow &&
+                    mergedRegion.getLastRow() <= lastRow &&
+                    mergedRegion.getFirstColumn() >= firstCol &&
+                    mergedRegion.getLastColumn() <= lastCol) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 设置单元格值
+     */
+    private static void setCellValue(Sheet sheet, int rowNum, int colNum, Object value) {
+        Row row = sheet.getRow(rowNum);
+        if (row == null) {
+            row = sheet.createRow(rowNum);
+        }
+
+        Cell cell = row.getCell(colNum);
+        if (cell == null) {
+            cell = row.createCell(colNum);
+        }
+
+        if (value == null) {
+            cell.setCellValue("");
+        } else if (value instanceof String) {
+            cell.setCellValue((String) value);
+        } else if (value instanceof Integer) {
+            cell.setCellValue((Integer) value);
+        } else if (value instanceof Double) {
+            cell.setCellValue((Double) value);
+        } else if (value instanceof BigDecimal) {
+            cell.setCellValue(((BigDecimal) value).doubleValue());
+        } else if (value instanceof LocalDate) {
+            cell.setCellValue(((LocalDate) value).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        }
+    }
+
+    private void processTemplate(Workbook workbook, Map<String, Object> dataMap) {
+        Sheet sheet = workbook.getSheetAt(0);
+
+        for (Row row : sheet) {
+            for (Cell cell : row) {
+                if (cell.getCellTypeEnum() == CellType.STRING) {
+                    String cellValue = cell.getStringCellValue();
+                    String newValue = replacePlaceholders(cellValue, dataMap);
+                    if (!cellValue.equals(newValue)) {
+                        cell.setCellValue(newValue);
+                    }
+                }
+            }
+        }
+    }
+
+    private String replacePlaceholders(String text, Map<String, Object> dataMap) {
+        if (text == null || text.isEmpty()) {
+            return text;
+        }
+
+        String result = text;
+        for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+            String placeholder = "${" + entry.getKey() + "}";
+            String value = entry.getValue() != null ? entry.getValue().toString() : "";
+            // 将数据库中的 \n 转换为 Excel 识别的换行符
+            value = value.replace("\\n", "\n");
+
+            result = result.replace(placeholder, value);
+        }
+
+        for (Map.Entry<String, Object> entry : dataMap.entrySet()) {
+            String placeholder = "#{" + entry.getKey() + "}";
+            String value = entry.getValue() != null ? entry.getValue().toString() : "";
+            // 将数据库中的 \n 转换为 Excel 识别的换行符
+            value = value.replace("\\n", "\n");
+
+            result = result.replace(placeholder, value);
+        }
+
+        return result;
+    }
 }

@@ -168,6 +168,40 @@ public class LatexFormulaExcelExporterUtil {
 //        pict.resize(0.95); // 缩小到90%，自然产生边距
     }
 
+    /**
+     * 将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);
+
+        // 2. 将图片添加到工作簿
+        int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG);
+
+        // 3. 创建绘图对象
+        Drawing<?> drawing = sheet.createDrawingPatriarch();
+
+        // 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); // 结束于下一行
+
+        // 设置较小的起始偏移
+        anchor.setDx1(50);   // 水平偏移（建议值：10-100）
+        anchor.setDy1(25);   // 垂直偏移（建议值：10-50）
+
+
+        // 5. 创建图片并插入
+        Picture pict = drawing.createPicture(anchor, pictureIdx);
+
+        // 6. 自动调整图片大小以适应单元格 (可选)
+        // 取消注释此行使图片自动适应锚点区域
+//        pict.resize(0.95); // 缩小到90%，自然产生边距
+    }
+
     @Data
     public static class FormulaComponent {
         BigDecimal base;