楚江ERP：打印，增加规格导出

@@ -40,6 +40,13 @@
             <version>2.11.0</version>
             <version>2.11.0</version>
         </dependency>
         </dependency>
 
 
+        <!-- JLaTeXMath 用于将LaTeX渲染为图片 -->
+        <dependency>
+            <groupId>org.scilab.forge</groupId>
+            <artifactId>jlatexmath</artifactId>
+            <version>1.0.7</version>
+        </dependency>
+
         <!-- Lombok（可选） -->
         <!-- Lombok（可选） -->
         <dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <groupId>org.projectlombok</groupId>

@@ -165,7 +165,7 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
      * 发货状态
      * 发货状态
      */
      */
     @ApiModelProperty(value = "发货状态")
     @ApiModelProperty(value = "发货状态")
-    private String shippingStatus;
+    private String shippingStatusName;
 
 
     public QueryContractDistributorStandardBo() {
     public QueryContractDistributorStandardBo() {
 
 

@@ -38,6 +38,7 @@ import com.lframework.xingyun.sc.entity.ContractFramework;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
+import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
@@ -66,6 +67,7 @@ import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
+import java.util.List;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -139,6 +141,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
             }
             }
 
 
             vo.setDeptIdList(sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList()));
             vo.setDeptIdList(sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList()));
+            vo.setCreateById(SecurityUtil.getCurrentUser().getId());
         }
         }
 
 
         PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<ContractDistributorStandard> pageResult = contractDistributorStandardService.query(getPageIndex(vo), getPageSize(vo), vo);
@@ -443,6 +446,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
         Wrapper<ContractFramework> contractFrameworkWrapper = Wrappers.lambdaQuery(ContractFramework.class)
         Wrapper<ContractFramework> contractFrameworkWrapper = Wrappers.lambdaQuery(ContractFramework.class)
                 .eq(ContractFramework::getCustomerId, data.getBuyer())
                 .eq(ContractFramework::getCustomerId, data.getBuyer())
                 .ge(ContractFramework::getValidityTime, LocalDate.now())
                 .ge(ContractFramework::getValidityTime, LocalDate.now())
+                .ge(ContractFramework::getCompany, data.getSupplier())
                 .eq(ContractFramework::getHasFrameworkAgreement, true);
                 .eq(ContractFramework::getHasFrameworkAgreement, true);
         List<ContractFramework> contractFrameworkList = contractFrameworkService.list(contractFrameworkWrapper);
         List<ContractFramework> contractFrameworkList = contractFrameworkService.list(contractFrameworkWrapper);
         List<String> productNameList = new ArrayList<>();
         List<String> productNameList = new ArrayList<>();
@@ -483,7 +487,38 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
 
                             setCellValue(sheet, startRow, 1, contractDistributorLineBo.getProductName()); // B列
                             setCellValue(sheet, startRow, 1, contractDistributorLineBo.getProductName()); // B列
                             setCellValue(sheet, startRow, 4, contractDistributorLineBo.getBrand()); // D列
                             setCellValue(sheet, startRow, 4, contractDistributorLineBo.getBrand()); // D列
-//                            setCellValue(sheet, startRow, 5, contractDistributorLineBo.getSpecification()); // E列
+//                            setCellValue(sheet, startRow, 5, convertToSimpleLatex(components)); // E列
+
+                            List<LatexFormulaExcelExporterUtil.FormulaComponent> formulaComponentList = new ArrayList<>(3);
+                            if (contractDistributorLineBo.getThickness() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(contractDistributorLineBo.getThickness());
+                                formulaComponent.setSup(contractDistributorLineBo.getThicknessTolPos());
+                                formulaComponent.setSub(contractDistributorLineBo.getThicknessTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            if (contractDistributorLineBo.getWidth() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(contractDistributorLineBo.getWidth());
+                                formulaComponent.setSup(contractDistributorLineBo.getWidthTolPos());
+                                formulaComponent.setSub(contractDistributorLineBo.getWidthTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            if (contractDistributorLineBo.getLength() != null) {
+                                LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                                formulaComponent.setBase(contractDistributorLineBo.getLength());
+                                formulaComponent.setSup(contractDistributorLineBo.getLengthTolPos());
+                                formulaComponent.setSub(contractDistributorLineBo.getLengthTolNeg());
+                                formulaComponentList.add(formulaComponent);
+                            }
+
+                            String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                            if (StringUtils.isNotBlank(latex)) {
+                                LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 5);// E列
+                            }
+
                             setCellValue(sheet, startRow, 6, contractDistributorLineBo.getStatus()); // F列
                             setCellValue(sheet, startRow, 6, contractDistributorLineBo.getStatus()); // F列
                             setCellValue(sheet, startRow, 7, contractDistributorLineBo.getQuantity()); // G列
                             setCellValue(sheet, startRow, 7, contractDistributorLineBo.getQuantity()); // G列
                             setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
                             setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列

+package com.lframework.xingyun.sc.utils;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.scilab.forge.jlatexmath.TeXConstants;
+import org.scilab.forge.jlatexmath.TeXFormula;
+import org.scilab.forge.jlatexmath.TeXIcon;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Slf4j
+public class LatexFormulaExcelExporterUtil {
+
+    public static String convertToLatex(List<FormulaComponent> componentList) {
+        if (CollectionUtils.isEmpty(componentList)) {
+            return "";
+        }
+
+
+        StringBuilder latex = new StringBuilder();
+        latex.append("\\mathbf{");
+        for (int i = 0; i < componentList.size(); i++) {
+            FormulaComponent comp = componentList.get(i);
+            if (comp.getBase() == null) {
+                continue;
+            }
+
+            latex.append(comp.getBase().stripTrailingZeros());
+            if (comp.getSup() != null) {
+                latex.append("^{+").append(comp.getSup().stripTrailingZeros()).append("}");
+            }
+
+            if (comp.getSub() != null) {
+                latex.append("_{-").append(comp.getSub().stripTrailingZeros()).append("}");
+            }
+
+            if (i < componentList.size() - 1) {
+                latex.append(" \\times ");
+            }
+        }
+
+        latex.append("}");
+        return latex.toString();
+    }
+
+    /**
+     * 将LaTeX公式字符串渲染为图片字节数组
+     *
+     * @param latex    LaTeX公式字符串，如 "\\frac{-b \\pm \\sqrt{b^2-4ac}}{2a}"
+     * @param fontSize 渲染的字体大小
+     * @return 图片的字节数组 (PNG格式)
+     * @throws IOException 如果渲染或转换失败
+     */
+    public static byte[] latexToImageBytes(String latex, int fontSize) throws IOException {
+        try {
+            // 1. 创建TeXFormula对象，解析LaTeX字符串
+            TeXFormula formula = new TeXFormula(latex);
+
+            // 2. 创建TeXIcon，指定样式和大小
+            TeXIcon icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, fontSize);
+
+            // 3. 创建一个BufferedImage，用于绘制公式
+            BufferedImage image = new BufferedImage(
+                    icon.getIconWidth(),
+                    icon.getIconHeight(),
+                    BufferedImage.TYPE_INT_ARGB
+            );
+
+            // 4. 获取Graphics2D进行绘制
+            Graphics2D g2 = image.createGraphics();
+
+            // 设置最高质量的渲染提示
+            g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+            g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
+            g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+            g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+            g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+            g2.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+            g2.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+            g2.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
+
+            // 设置背景为白色
+            g2.setColor(Color.WHITE);
+            g2.fillRect(0, 0, icon.getIconWidth(), icon.getIconHeight());
+
+            // 设置公式颜色为黑色
+            JLabel label = new JLabel();
+            label.setForeground(Color.BLACK);
+
+            // 5. 将公式绘制到BufferedImage上
+            icon.paintIcon(label, g2, 0, 0);
+            g2.dispose();
+
+            // 6. 将BufferedImage转换为字节数组
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.write(image, "png", baos);
+
+            return baos.toByteArray();
+
+        } catch (Exception e) {
+            throw new IOException("LaTeX渲染失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 将LaTeX公式作为图片插入到指定单元格
+     */
+    public static void insertLatexImageToCell(Workbook workbook, Sheet sheet, String latex, int rowIndex, int colIndex) throws IOException {
+        // 1. 将LaTeX渲染为图片字节
+        byte[] imageBytes = latexToImageBytes(latex, 48);
+
+        // 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 + 1); // 结束于D列
+        anchor.setRow2(rowIndex + 1); // 结束于下一行
+
+        // 设置较小的起始偏移
+        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;
+        BigDecimal sup;
+        BigDecimal sub;
+    }
+}

@@ -79,5 +79,8 @@ public class QueryContractDistributorStandardVo extends PageVo implements BaseVo
      */
      */
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     @ApiModelProperty(value = "标准合同是否审核完成(AUDIT:审核中,PASS:审核通过,REFUSE:已驳回,CANCEL:已取消)")
     private String standardApproved;
     private String standardApproved;
+
+    @ApiModelProperty("创建人ID")
+    private String createById;
 }
 }
 
 

@@ -143,15 +143,18 @@
             </if>
             </if>
             <if test="vo.status != null">
             <if test="vo.status != null">
                 AND tb.status LIKE CONCAT(#{vo.status}, '%')
                 AND tb.status LIKE CONCAT(#{vo.status}, '%')
+                <if test="vo.status == 'DRAFT' and vo.createById != null">
+                    AND tb.create_by_id = #{vo.createById}
+                </if>
             </if>
             </if>
             <if test="vo.type != null">
             <if test="vo.type != null">
                 AND tb.type = #{vo.type}
                 AND tb.type = #{vo.type}
             </if>
             </if>
             <if test="vo.formalApproved != null">
             <if test="vo.formalApproved != null">
-                AND tb.formalApproved = #{vo.formalApproved}
+                AND tb.formal_approved = #{vo.formalApproved}
             </if>
             </if>
             <if test="vo.standardApproved != null">
             <if test="vo.standardApproved != null">
-                AND tb.standardApproved = #{vo.standardApproved}
+                AND tb.standard_approved = #{vo.standardApproved}
             </if>
             </if>
         </where>
         </where>
         order by tb.create_time desc
         order by tb.create_time desc