订购单打印

@@ -18,6 +18,7 @@ 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;
@@ -27,6 +28,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 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;
@@ -213,7 +215,36 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                             setCellValue(sheet, startRow, 2, currentOrderLine.getQuality());
                             setCellValue(sheet, startRow, 3, currentOrderLine.getBrand());
 
-                            //todo 规格
+                            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());
@@ -242,6 +273,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
                     dataMap.put("shippingCost", data.getShippingCost());
                     dataMap.put("remarks", data.getRemarks());
                     dataMap.put("createUser", data.getCreateBy());
+                    dataMap.put("element", data.getElement());
 
 
 
@@ -382,21 +414,17 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
             newCell.setCellStyle(oldCell.getCellStyle());
         }
 
-        switch (oldCell.getCellType()) {
-            case 1:
-                //STRING
+        switch (oldCell.getCellTypeEnum()) {
+            case STRING:
                 newCell.setCellValue(oldCell.getStringCellValue());
                 break;
-            case 0:
-                //NUMERIC
+            case NUMERIC:
                 newCell.setCellValue(oldCell.getNumericCellValue());
                 break;
-            case 4:
-                //BOOLEAN
+            case BOOLEAN:
                 newCell.setCellValue(oldCell.getBooleanCellValue());
                 break;
-            case 2:
-                //FORMULA
+            case FORMULA:
                 newCell.setCellFormula(oldCell.getCellFormula());
                 break;
             default:

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