楚江ERP:规格变更单-打印模板修改

@@ -9,6 +9,7 @@ import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.utils.ExcelUtil;
+import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.utils.ResponseUtil;
 import com.lframework.xingyun.sc.service.order.OrderChangeRecordService;
 import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
@@ -197,9 +198,9 @@ public class OrderChangeRecordController extends DefaultBaseController {
                                             line.getQuantityChange() || line.getSalesPriceChange())))
                     .collect(Collectors.toList());
 
-            // ========== 填充变更前区域（起始行：6）==========
+            // ========== 填充变更前区域（起始行：5）==========
             // ========== 填充变更前区域 ==========
-            int beforeStartRow = 5;
+            int beforeStartRow = 4;
             int beforeRowCount = Math.max(beforeLines.size(), 1);
             for (int i = beforeStartRow + 1; i < beforeStartRow + beforeRowCount; i++) {
                 ExcelUtil.copyRow(workbook, sheet, beforeStartRow, i);
@@ -208,24 +209,53 @@ public class OrderChangeRecordController extends DefaultBaseController {
                 PurchaseOrderLine line = i < beforeLines.size() ? beforeLines.get(i) : null;
                 int rowIdx = beforeStartRow + i;
                 if (line != null) {
-                    ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getBrand());
-                    ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getThickness());
-                    ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getWidth());
-                    ExcelUtil.setCellValue(sheet, rowIdx, 3, line.getLength());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getIndustry());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getQuality());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getBrand());
+                    List<LatexFormulaExcelExporterUtil.FormulaComponent> formulaComponentList = new ArrayList<>(3);
+                    if (line.getThickness() != null) {
+                        LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                        formulaComponent.setBase(line.getThickness());
+                        formulaComponent.setSup(line.getThicknessTolPos());
+                        formulaComponent.setSub(line.getThicknessTolNeg());
+                        formulaComponentList.add(formulaComponent);
+                    }
+
+                    if (line.getWidth() != null) {
+                        LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                        formulaComponent.setBase(line.getWidth());
+                        formulaComponent.setSup(line.getWidthTolPos());
+                        formulaComponent.setSub(line.getWidthTolNeg());
+                        formulaComponentList.add(formulaComponent);
+                    }
+
+                    if (line.getLength() != null) {
+                        LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                        formulaComponent.setBase(line.getLength());
+                        formulaComponent.setSup(line.getLengthTolPos());
+                        formulaComponent.setSub(line.getLengthTolNeg());
+                        formulaComponentList.add(formulaComponent);
+                    }
+
+                    String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                    if (StringUtils.isNotBlank(latex)) {
+                        LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, rowIdx, 3, 1, 1);
+                    }
                     ExcelUtil.setCellValue(sheet, rowIdx, 4, line.getStatus());
                     ExcelUtil.setCellValue(sheet, rowIdx, 5, line.getQuantity());
                     ExcelUtil.setCellValue(sheet, rowIdx, 6, line.getSalesPrice());
                     ExcelUtil.setCellValue(sheet, rowIdx, 7,
                             line.getDeliveryDate() == null ? "" : line.getDeliveryDate().format(dateFormatter));
+                    ExcelUtil.setCellValue(sheet, rowIdx, 8, line.getAssessmentExceedsAgreement());
                 } else {
-                    for (int col = 0; col <= 7; col++) {
+                    for (int col = 0; col <= 8; col++) {
                         ExcelUtil.setCellValue(sheet, rowIdx, col, "");
                     }
                 }
             }
 
             // ========== 填充变更后区域 ==========
-            int afterStartRow = 9 + (beforeRowCount - 1);  //（默认第10行起始行，需要加上复制的行）
+            int afterStartRow = 7 + (beforeRowCount - 1);  //（默认第8行起始行，需要加上复制的行）
             int afterRowCount = Math.max(afterLines.size(), 1);
             for (int i = afterStartRow + 1; i < afterStartRow + afterRowCount; i++) {
                 ExcelUtil.copyRow(workbook, sheet, afterStartRow, i);
@@ -234,17 +264,46 @@ public class OrderChangeRecordController extends DefaultBaseController {
                 PurchaseOrderLine line = i < afterLines.size() ? afterLines.get(i) : null;
                 int rowIdx = afterStartRow + i;
                 if (line != null) {
-                    ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getBrand());
-                    ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getThickness());
-                    ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getWidth());
-                    ExcelUtil.setCellValue(sheet, rowIdx, 3, line.getLength());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 0, line.getIndustry());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 1, line.getQuality());
+                    ExcelUtil.setCellValue(sheet, rowIdx, 2, line.getBrand());
+                    List<LatexFormulaExcelExporterUtil.FormulaComponent> formulaComponentList = new ArrayList<>(3);
+                    if (line.getThickness() != null) {
+                        LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                        formulaComponent.setBase(line.getThickness());
+                        formulaComponent.setSup(line.getThicknessTolPos());
+                        formulaComponent.setSub(line.getThicknessTolNeg());
+                        formulaComponentList.add(formulaComponent);
+                    }
+
+                    if (line.getWidth() != null) {
+                        LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                        formulaComponent.setBase(line.getWidth());
+                        formulaComponent.setSup(line.getWidthTolPos());
+                        formulaComponent.setSub(line.getWidthTolNeg());
+                        formulaComponentList.add(formulaComponent);
+                    }
+
+                    if (line.getLength() != null) {
+                        LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                        formulaComponent.setBase(line.getLength());
+                        formulaComponent.setSup(line.getLengthTolPos());
+                        formulaComponent.setSub(line.getLengthTolNeg());
+                        formulaComponentList.add(formulaComponent);
+                    }
+
+                    String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                    if (StringUtils.isNotBlank(latex)) {
+                        LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, rowIdx, 3, 1, 1);
+                    }
                     ExcelUtil.setCellValue(sheet, rowIdx, 4, line.getStatus());
                     ExcelUtil.setCellValue(sheet, rowIdx, 5, line.getQuantity());
                     ExcelUtil.setCellValue(sheet, rowIdx, 6, line.getSalesPrice());
                     ExcelUtil.setCellValue(sheet, rowIdx, 7,
                             line.getDeliveryDate() == null ? "" : line.getDeliveryDate().format(dateFormatter));
+                    ExcelUtil.setCellValue(sheet, rowIdx, 8, line.getAssessmentExceedsAgreement());
                 } else {
-                    for (int col = 0; col <= 7; col++) {
+                    for (int col = 0; col <= 8; col++) {
                         ExcelUtil.setCellValue(sheet, rowIdx, col, "");
                     }
                 }
@@ -363,14 +422,23 @@ public class OrderChangeRecordController extends DefaultBaseController {
     // 辅助方法：设置所有 change 字段
     private void setAllChangeFields(PurchaseOrderLine item, boolean value) {
         if (item == null) return;
+        item.setIndustryChange(value);
+        item.setQualityChange(value);
         item.setBrandChange(value);
         item.setThicknessChange(value);
+        item.setThicknessTolPosChange(value);
+        item.setThicknessTolNegChange(value);
         item.setWidthChange(value);
+        item.setWidthTolPosChange(value);
+        item.setWidthTolNegChange(value);
         item.setLengthChange(value);
+        item.setLengthTolPosChange(value);
+        item.setLengthTolNegChange(value);
         item.setStatusChange(value);
         item.setQuantityChange(value);
         item.setSalesPriceChange(value);
         item.setDeliveryDateChange(value);
+        item.setAssessmentExceedsAgreementChange(value);
     }
 
     /**
@@ -383,16 +451,36 @@ public class OrderChangeRecordController extends DefaultBaseController {
 
         if (target == null || before == null || after == null) return;
 
+        target.setIndustryChange(!Objects.equals(before.getIndustry(), after.getIndustry()));
+        target.setQualityChange(!Objects.equals(before.getQuality(), after.getQuality()));
         target.setBrandChange(!Objects.equals(before.getBrand(), after.getBrand()));
         target.setThicknessChange(before.getThickness() != null && after.getThickness() != null
                 ? before.getThickness().compareTo(after.getThickness()) != 0
                 : !Objects.equals(before.getThickness(), after.getThickness()));
+        target.setThicknessTolPosChange(before.getThicknessTolPos() != null && after.getThicknessTolPos() != null
+                ? before.getThicknessTolPos().compareTo(after.getThicknessTolPos()) != 0
+                : !Objects.equals(before.getThicknessTolPos(), after.getThicknessTolPos()));
+        target.setThicknessTolNegChange(before.getThicknessTolNeg() != null && after.getThicknessTolNeg() != null
+                ? before.getThicknessTolNeg().compareTo(after.getThicknessTolNeg()) != 0
+                : !Objects.equals(before.getThicknessTolNeg(), after.getThicknessTolNeg()));
         target.setWidthChange(before.getWidth() != null && after.getWidth() != null
                 ? before.getWidth().compareTo(after.getWidth()) != 0
                 : !Objects.equals(before.getWidth(), after.getWidth()));
+        target.setWidthTolPosChange(before.getWidthTolPos() != null && after.getWidthTolPos() != null
+                ? before.getWidthTolPos().compareTo(after.getWidthTolPos()) != 0
+                : !Objects.equals(before.getWidthTolPos(), after.getWidthTolPos()));
+        target.setWidthTolNegChange(before.getWidthTolNeg() != null && after.getWidthTolNeg() != null
+                ? before.getWidthTolNeg().compareTo(after.getWidthTolNeg()) != 0
+                : !Objects.equals(before.getWidthTolNeg(), after.getWidthTolNeg()));
         target.setLengthChange(before.getLength() != null && after.getLength() != null
                 ? before.getLength().compareTo(after.getLength()) != 0
                 : !Objects.equals(before.getLength(), after.getLength()));
+        target.setLengthTolPosChange(before.getLengthTolPos() != null && after.getLengthTolPos() != null
+                ? before.getLengthTolPos().compareTo(after.getLengthTolPos()) != 0
+                : !Objects.equals(before.getLengthTolPos(), after.getLengthTolPos()));
+        target.setLengthTolNegChange(before.getLengthTolNeg() != null && after.getLengthTolNeg() != null
+                ? before.getLengthTolNeg().compareTo(after.getLengthTolNeg()) != 0
+                : !Objects.equals(before.getLengthTolNeg(), after.getLengthTolNeg()));
         target.setStatusChange(!Objects.equals(before.getStatus(), after.getStatus()));
         target.setQuantityChange(before.getQuantity() != null && after.getQuantity() != null
                 ? before.getQuantity().compareTo(after.getQuantity()) != 0
@@ -401,6 +489,7 @@ public class OrderChangeRecordController extends DefaultBaseController {
                 ? before.getSalesPrice().compareTo(after.getSalesPrice()) != 0
                 : !Objects.equals(before.getSalesPrice(), after.getSalesPrice()));
         target.setDeliveryDateChange(!Objects.equals(before.getDeliveryDate(), after.getDeliveryDate()));
+        target.setAssessmentExceedsAgreementChange(!Objects.equals(before.getAssessmentExceedsAgreement(), after.getAssessmentExceedsAgreement()));
     }
 
 }

@@ -45,11 +45,23 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String industry;
 
     /**
+     * 行业是否变更
+     */
+    @TableField(exist = false)
+    private Boolean industryChange;
+
+    /**
      * 品质
      */
     private String quality;
 
     /**
+     * 品质是否变更
+     */
+    @TableField(exist = false)
+    private Boolean qualityChange;
+
+    /**
      * 牌号
      */
     private String brand;
@@ -77,11 +89,23 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal thicknessTolPos;
 
     /**
+     * 厚度公差正是否变更
+     */
+    @TableField(exist = false)
+    private Boolean thicknessTolPosChange;
+
+    /**
      * 厚度公差负
      */
     private BigDecimal thicknessTolNeg;
 
     /**
+     * 厚度公差负是否变更
+     */
+    @TableField(exist = false)
+    private Boolean thicknessTolNegChange;
+
+    /**
      * 宽度
      */
     private BigDecimal width;
@@ -98,11 +122,23 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal widthTolPos;
 
     /**
+     * 宽度公差正是否变更
+     */
+    @TableField(exist = false)
+    private Boolean widthTolPosChange;
+
+    /**
      * 宽度公差负
      */
     private BigDecimal widthTolNeg;
 
     /**
+     * 宽度公差负是否变更
+     */
+    @TableField(exist = false)
+    private Boolean widthTolNegChange;
+
+    /**
      * 长度
      */
     private BigDecimal length;
@@ -119,11 +155,23 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal lengthTolPos;
 
     /**
+     * 长度公差正是否变更
+     */
+    @TableField(exist = false)
+    private Boolean lengthTolPosChange;
+
+    /**
      * 长度公差负
      */
     private BigDecimal lengthTolNeg;
 
     /**
+     * 长度公差负是否变更
+     */
+    @TableField(exist = false)
+    private Boolean lengthTolNegChange;
+
+    /**
      * 状态
      */
     private String status;
@@ -190,6 +238,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private String assessmentExceedsAgreement;
 
     /**
+     * 考核超协是否变更
+     */
+    @TableField(exist = false)
+    private Boolean assessmentExceedsAgreementChange;
+
+    /**
      * 父类ID
      * 拆分时使用
      */