diff --git a/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java b/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java
index 773abe338..b23d37a54 100644
--- a/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java
+++ b/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java
@@ -26,10 +26,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Excel相关处理
@@ -353,4 +358,67 @@ public class ExcelUtil {
         return IdUtil.fastSimpleUUID() + "_" + filename + ".xlsx";
     }
 
+    /**
+     * 导出excel（按指定顺序的列导出，使用动态表头）
+     *
+     * @param list           导出数据集合
+     * @param sheetName      工作表的名称
+     * @param orderedFields  按导出顺序排列的Java字段名列表
+     * @param fieldLabelMap  Java字段名 -> Excel列头中文名 映射
+     * @param response       响应体
+     */
+    public static <T> void exportExcelOrdered(List<T> list, String sheetName,
+                                              List<String> orderedFields,
+                                              Map<String, String> fieldLabelMap,
+                                              HttpServletResponse response) {
+        if (orderedFields == null || orderedFields.isEmpty()) {
+            throw new IllegalArgumentException("导出列不能为空");
+        }
+        // 构建动态表头
+        List<List<String>> heads = orderedFields.stream()
+            .map(f -> Collections.singletonList(fieldLabelMap.getOrDefault(f, f)))
+            .collect(Collectors.toList());
+
+        // 构建数据行
+        List<List<Object>> data = new ArrayList<>(list.size());
+        if (!list.isEmpty()) {
+            Map<String, Field> fieldCache = new HashMap<>();
+            Class<?> clazz = list.get(0).getClass();
+            for (T vo : list) {
+                List<Object> row = new ArrayList<>(orderedFields.size());
+                for (String fieldName : orderedFields) {
+                    Field field = fieldCache.computeIfAbsent(fieldName, k -> {
+                        try {
+                            Field f = clazz.getDeclaredField(k);
+                            f.setAccessible(true);
+                            return f;
+                        } catch (NoSuchFieldException e) {
+                            return null;
+                        }
+                    });
+                    try {
+                        row.add(field != null ? field.get(vo) : null);
+                    } catch (IllegalAccessException e) {
+                        row.add(null);
+                    }
+                }
+                data.add(row);
+            }
+        }
+
+        try {
+            resetResponse(sheetName, response);
+            ServletOutputStream os = response.getOutputStream();
+            EasyExcel.write(os)
+                .head(heads)
+                .autoCloseStream(false)
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .registerConverter(new ExcelBigNumberConvert())
+                .sheet(sheetName)
+                .doWrite(data);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常", e);
+        }
+    }
+
 }
diff --git a/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java b/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java
index c8f8bb3ed..fcbc32c0f 100644
--- a/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java
+++ b/klp-cost/src/main/java/com/klp/cost/domain/CostItem.java
@@ -44,6 +44,10 @@ public class CostItem extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 查询条件（JSON格式）
+     */
+    private String queryCondition;
     /**
      * 删除标识 0=正常 2=删除
      */
diff --git a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java
index f1cc05dc0..25d1cf3b2 100644
--- a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java
+++ b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostItemBo.java
@@ -47,5 +47,10 @@ public class CostItemBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 查询条件（JSON格式）
+     */
+    private String queryCondition;
+
 
 }
diff --git a/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java b/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java
index c2f29d4c2..d7aa837ed 100644
--- a/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java
+++ b/klp-cost/src/main/java/com/klp/cost/domain/vo/CostItemVo.java
@@ -55,5 +55,11 @@ public class CostItemVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 查询条件（JSON格式）
+     */
+    @ExcelProperty(value = "查询条件（JSON格式）")
+    private String queryCondition;
+
 
 }
diff --git a/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java b/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java
index 437ff716b..ff2bb8d42 100644
--- a/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java
+++ b/klp-cost/src/main/java/com/klp/cost/service/impl/CostItemServiceImpl.java
@@ -65,6 +65,7 @@ public class CostItemServiceImpl implements ICostItemService {
         lqw.like(StringUtils.isNotBlank(bo.getItemName()), CostItem::getItemName, bo.getItemName());
         lqw.eq(StringUtils.isNotBlank(bo.getCategory()), CostItem::getCategory, bo.getCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getUnit()), CostItem::getUnit, bo.getUnit());
+        lqw.eq(StringUtils.isNotBlank(bo.getQueryCondition()), CostItem::getQueryCondition, bo.getQueryCondition());
         return lqw;
     }
 
diff --git a/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml b/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml
index fe2965c44..c2b63d286 100644
--- a/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml
+++ b/klp-cost/src/main/resources/mapper/cost/CostItemMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="category" column="category"/>
         <result property="unit" column="unit"/>
         <result property="remark" column="remark"/>
+        <result property="queryCondition" column="query_condition"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java
index fd1de9146..4c60e36cd 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java
@@ -37,6 +37,10 @@ public class QcCertificateItem extends BaseEntity {
      * 钢卷号
      */
     private String coilNo;
+    /**
+     * 原料卷号
+     */
+    private String rawCoilNo;
     /**
      * 炉号
      */
@@ -81,10 +85,46 @@ public class QcCertificateItem extends BaseEntity {
      * Als
      */
     private BigDecimal als;
+    /**
+     * 铝(%)
+     */
+    private BigDecimal al;
+    /**
+     * 钛(%)
+     */
+    private BigDecimal ti;
+    /**
+     * 铬(%)
+     */
+    private BigDecimal cr;
+    /**
+     * 镍(%)
+     */
+    private BigDecimal ni;
+    /**
+     * 铜(%)
+     */
+    private BigDecimal cu;
+    /**
+     * 氮(%)
+     */
+    private BigDecimal n;
+    /**
+     * 铁(%)
+     */
+    private BigDecimal fe;
+    /**
+     * 硼(%)
+     */
+    private BigDecimal b;
     /**
      * 拉伸试验-屈服强度(MPa)
      */
     private BigDecimal yieldStrength;
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    private BigDecimal plasticExtensionStrength;
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -109,6 +149,18 @@ public class QcCertificateItem extends BaseEntity {
      * 表面结构
      */
     private String surfaceStructure;
+    /**
+     * 表面处理
+     */
+    private String surfaceTreatment;
+    /**
+     * 镀层表面结构
+     */
+    private String coatingSurfaceStructure;
+    /**
+     * 镀层重量 COATING MASS(g/m²)
+     */
+    private BigDecimal coatingMass;
     /**
      * 边缘状态
      */
@@ -117,6 +169,10 @@ public class QcCertificateItem extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 调质度
+     */
+    private String temperDegree;
     /**
      * 删除标志（0=正常，1=已删除）
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java
index f47e50f2e..760e45ad2 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java
@@ -65,6 +65,38 @@ public class QcChemicalItem extends BaseEntity {
      * 酸溶铝(%)
      */
     private BigDecimal als;
+    /**
+     * 铝(%)
+     */
+    private BigDecimal al;
+    /**
+     * 钛(%)
+     */
+    private BigDecimal ti;
+    /**
+     * 铬(%)
+     */
+    private BigDecimal cr;
+    /**
+     * 镍(%)
+     */
+    private BigDecimal ni;
+    /**
+     * 铜(%)
+     */
+    private BigDecimal cu;
+    /**
+     * 氮(%)
+     */
+    private BigDecimal n;
+    /**
+     * 铁(%)
+     */
+    private BigDecimal fe;
+    /**
+     * 硼(%)
+     */
+    private BigDecimal b;
     /**
      * 备注
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java
index 8cb936794..e44a5b51c 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java
@@ -41,6 +41,10 @@ public class QcPhysicalItem extends BaseEntity {
      * 拉伸试验-屈服强度(MPa)
      */
     private BigDecimal yieldStrength;
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    private BigDecimal plasticExtensionStrength;
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -65,6 +69,14 @@ public class QcPhysicalItem extends BaseEntity {
      * 表面结构
      */
     private String surfaceStructure;
+    /**
+     * 镀层表面结构
+     */
+    private String coatingSurfaceStructure;
+    /**
+     * 镀层重量 COATING MASS(g/m²)
+     */
+    private BigDecimal coatingMass;
     /**
      * 边缘状态
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java
index 40674592a..ef8f320ae 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java
@@ -38,6 +38,11 @@ public class QcCertificateItemBo extends BaseEntity {
      */
     private String coilNo;
 
+    /**
+     * 原料卷号
+     */
+    private String rawCoilNo;
+
     /**
      * 炉号
      */
@@ -93,11 +98,56 @@ public class QcCertificateItemBo extends BaseEntity {
      */
     private BigDecimal als;
 
+    /**
+     * 铝(%)
+     */
+    private BigDecimal al;
+
+    /**
+     * 钛(%)
+     */
+    private BigDecimal ti;
+
+    /**
+     * 铬(%)
+     */
+    private BigDecimal cr;
+
+    /**
+     * 镍(%)
+     */
+    private BigDecimal ni;
+
+    /**
+     * 铜(%)
+     */
+    private BigDecimal cu;
+
+    /**
+     * 氮(%)
+     */
+    private BigDecimal n;
+
+    /**
+     * 铁(%)
+     */
+    private BigDecimal fe;
+
+    /**
+     * 硼(%)
+     */
+    private BigDecimal b;
+
     /**
      * 拉伸试验-屈服强度(MPa)
      */
     private BigDecimal yieldStrength;
 
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    private BigDecimal plasticExtensionStrength;
+
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -128,6 +178,21 @@ public class QcCertificateItemBo extends BaseEntity {
      */
     private String surfaceStructure;
 
+    /**
+     * 表面处理
+     */
+    private String surfaceTreatment;
+
+    /**
+     * 镀层表面结构
+     */
+    private String coatingSurfaceStructure;
+
+    /**
+     * 镀层重量 COATING MASS(g/m²)
+     */
+    private BigDecimal coatingMass;
+
     /**
      * 边缘状态
      */
@@ -138,5 +203,10 @@ public class QcCertificateItemBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 调质度
+     */
+    private String temperDegree;
+
 
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java
index 48a310da4..33ddcb255 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java
@@ -73,6 +73,46 @@ public class QcChemicalItemBo extends BaseEntity {
      */
     private BigDecimal als;
 
+    /**
+     * 铝(%)
+     */
+    private BigDecimal al;
+
+    /**
+     * 钛(%)
+     */
+    private BigDecimal ti;
+
+    /**
+     * 铬(%)
+     */
+    private BigDecimal cr;
+
+    /**
+     * 镍(%)
+     */
+    private BigDecimal ni;
+
+    /**
+     * 铜(%)
+     */
+    private BigDecimal cu;
+
+    /**
+     * 氮(%)
+     */
+    private BigDecimal n;
+
+    /**
+     * 铁(%)
+     */
+    private BigDecimal fe;
+
+    /**
+     * 硼(%)
+     */
+    private BigDecimal b;
+
     /**
      * 备注
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java
index e0e2e945e..2e12e9955 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java
@@ -43,6 +43,11 @@ public class QcPhysicalItemBo extends BaseEntity {
      */
     private BigDecimal yieldStrength;
 
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    private BigDecimal plasticExtensionStrength;
+
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -73,6 +78,16 @@ public class QcPhysicalItemBo extends BaseEntity {
      */
     private String surfaceStructure;
 
+    /**
+     * 镀层表面结构
+     */
+    private String coatingSurfaceStructure;
+
+    /**
+     * 镀层重量 COATING MASS(g/m²)
+     */
+    private BigDecimal coatingMass;
+
     /**
      * 边缘状态
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java
index 8fa915824..563419a96 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java
@@ -43,6 +43,12 @@ public class QcCertificateItemVo {
     @ExcelProperty(value = "钢卷号")
     private String coilNo;
 
+    /**
+     * 原料卷号
+     */
+    @ExcelProperty(value = "原料卷号")
+    private String rawCoilNo;
+
     /**
      * 炉号
      */
@@ -109,12 +115,66 @@ public class QcCertificateItemVo {
     @ExcelProperty(value = "Als")
     private BigDecimal als;
 
+    /**
+     * 铝(%)
+     */
+    @ExcelProperty(value = "铝(%)")
+    private BigDecimal al;
+
+    /**
+     * 钛(%)
+     */
+    @ExcelProperty(value = "钛(%)")
+    private BigDecimal ti;
+
+    /**
+     * 铬(%)
+     */
+    @ExcelProperty(value = "铬(%)")
+    private BigDecimal cr;
+
+    /**
+     * 镍(%)
+     */
+    @ExcelProperty(value = "镍(%)")
+    private BigDecimal ni;
+
+    /**
+     * 铜(%)
+     */
+    @ExcelProperty(value = "铜(%)")
+    private BigDecimal cu;
+
+    /**
+     * 氮(%)
+     */
+    @ExcelProperty(value = "氮(%)")
+    private BigDecimal n;
+
+    /**
+     * 铁(%)
+     */
+    @ExcelProperty(value = "铁(%)")
+    private BigDecimal fe;
+
+    /**
+     * 硼(%)
+     */
+    @ExcelProperty(value = "硼(%)")
+    private BigDecimal b;
+
     /**
      * 拉伸试验-屈服强度(MPa)
      */
     @ExcelProperty(value = "拉伸试验-屈服强度(MPa)")
     private BigDecimal yieldStrength;
 
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    @ExcelProperty(value = "规定塑性延伸强度(MPa)")
+    private BigDecimal plasticExtensionStrength;
+
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -151,6 +211,24 @@ public class QcCertificateItemVo {
     @ExcelProperty(value = "表面结构")
     private String surfaceStructure;
 
+    /**
+     * 表面处理
+     */
+    @ExcelProperty(value = "表面处理")
+    private String surfaceTreatment;
+
+    /**
+     * 镀层表面结构
+     */
+    @ExcelProperty(value = "镀层表面结构")
+    private String coatingSurfaceStructure;
+
+    /**
+     * 镀层重量 COATING MASS(g/m²)
+     */
+    @ExcelProperty(value = "镀层重量 COATING MASS(g/m²)")
+    private BigDecimal coatingMass;
+
     /**
      * 边缘状态
      */
@@ -163,5 +241,11 @@ public class QcCertificateItemVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 调质度
+     */
+    @ExcelProperty(value = "调质度")
+    private String temperDegree;
+
 
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java
index db3ef9cb1..378414eb3 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java
@@ -86,6 +86,54 @@ public class QcChemicalItemVo {
     @ExcelProperty(value = "酸溶铝(%)")
     private BigDecimal als;
 
+    /**
+     * 铝(%)
+     */
+    @ExcelProperty(value = "铝(%)")
+    private BigDecimal al;
+
+    /**
+     * 钛(%)
+     */
+    @ExcelProperty(value = "钛(%)")
+    private BigDecimal ti;
+
+    /**
+     * 铬(%)
+     */
+    @ExcelProperty(value = "铬(%)")
+    private BigDecimal cr;
+
+    /**
+     * 镍(%)
+     */
+    @ExcelProperty(value = "镍(%)")
+    private BigDecimal ni;
+
+    /**
+     * 铜(%)
+     */
+    @ExcelProperty(value = "铜(%)")
+    private BigDecimal cu;
+
+    /**
+     * 氮(%)
+     */
+    @ExcelProperty(value = "氮(%)")
+    private BigDecimal n;
+
+    /**
+     * 铁(%)
+     */
+    @ExcelProperty(value = "铁(%)")
+    private BigDecimal fe;
+
+    /**
+     * 硼(%)
+     */
+    @ExcelProperty(value = "硼(%)")
+    private BigDecimal b;
+
     /**
      * 备注
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java
index 298538438..d79d52642 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java
@@ -51,6 +51,12 @@ public class QcPhysicalItemVo {
     @ExcelProperty(value = "拉伸试验-屈服强度(MPa)")
     private BigDecimal yieldStrength;
 
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    @ExcelProperty(value = "规定塑性延伸强度(MPa)")
+    private BigDecimal plasticExtensionStrength;
+
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -87,6 +93,18 @@ public class QcPhysicalItemVo {
     @ExcelProperty(value = "表面结构")
     private String surfaceStructure;
 
+    /**
+     * 镀层表面结构
+     */
+    @ExcelProperty(value = "镀层表面结构")
+    private String coatingSurfaceStructure;
+
+    /**
+     * 镀层重量 COATING MASS(g/m²)
+     */
+    @ExcelProperty(value = "镀层重量 COATING MASS(g/m²)")
+    private BigDecimal coatingMass;
+
     /**
      * 边缘状态
      */
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java
index 0c68347fe..9ea674322 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java
@@ -64,6 +64,7 @@ public class QcCertificateItemServiceImpl implements IQcCertificateItemService {
         lqw.eq(bo.getCertificateId() != null, QcCertificateItem::getCertificateId, bo.getCertificateId());
         lqw.eq(bo.getCoilId() != null, QcCertificateItem::getCoilId, bo.getCoilId());
         lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcCertificateItem::getCoilNo, bo.getCoilNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getRawCoilNo()), QcCertificateItem::getRawCoilNo, bo.getRawCoilNo());
         lqw.eq(StringUtils.isNotBlank(bo.getHeatNo()), QcCertificateItem::getHeatNo, bo.getHeatNo());
         lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), QcCertificateItem::getMaterialType, bo.getMaterialType());
         lqw.eq(StringUtils.isNotBlank(bo.getSize()), QcCertificateItem::getSize, bo.getSize());
@@ -75,14 +76,27 @@ public class QcCertificateItemServiceImpl implements IQcCertificateItemService {
         lqw.eq(bo.getP() != null, QcCertificateItem::getP, bo.getP());
         lqw.eq(bo.getS() != null, QcCertificateItem::getS, bo.getS());
         lqw.eq(bo.getAls() != null, QcCertificateItem::getAls, bo.getAls());
+        lqw.eq(bo.getAl() != null, QcCertificateItem::getAl, bo.getAl());
+        lqw.eq(bo.getTi() != null, QcCertificateItem::getTi, bo.getTi());
+        lqw.eq(bo.getCr() != null, QcCertificateItem::getCr, bo.getCr());
+        lqw.eq(bo.getNi() != null, QcCertificateItem::getNi, bo.getNi());
+        lqw.eq(bo.getCu() != null, QcCertificateItem::getCu, bo.getCu());
+        lqw.eq(bo.getN() != null, QcCertificateItem::getN, bo.getN());
+        lqw.eq(bo.getFe() != null, QcCertificateItem::getFe, bo.getFe());
+        lqw.eq(bo.getB() != null, QcCertificateItem::getB, bo.getB());
         lqw.eq(bo.getYieldStrength() != null, QcCertificateItem::getYieldStrength, bo.getYieldStrength());
+        lqw.eq(bo.getPlasticExtensionStrength() != null, QcCertificateItem::getPlasticExtensionStrength, bo.getPlasticExtensionStrength());
         lqw.eq(bo.getTensileStrength() != null, QcCertificateItem::getTensileStrength, bo.getTensileStrength());
         lqw.eq(bo.getElongation() != null, QcCertificateItem::getElongation, bo.getElongation());
         lqw.eq(bo.getHardness() != null, QcCertificateItem::getHardness, bo.getHardness());
         lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcCertificateItem::getBendingTest, bo.getBendingTest());
         lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcCertificateItem::getSurfaceQuality, bo.getSurfaceQuality());
         lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcCertificateItem::getSurfaceStructure, bo.getSurfaceStructure());
+        lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatment()), QcCertificateItem::getSurfaceTreatment, bo.getSurfaceTreatment());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoatingSurfaceStructure()), QcCertificateItem::getCoatingSurfaceStructure, bo.getCoatingSurfaceStructure());
+        lqw.eq(bo.getCoatingMass() != null, QcCertificateItem::getCoatingMass, bo.getCoatingMass());
         lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcCertificateItem::getEdgeStatus, bo.getEdgeStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getTemperDegree()), QcCertificateItem::getTemperDegree, bo.getTemperDegree());
         return lqw;
     }
 
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java
index fbb2e8a3c..fb48378f9 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java
@@ -79,6 +79,14 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService {
         lqw.eq(bo.getP() != null, QcChemicalItem::getP, bo.getP());
         lqw.eq(bo.getS() != null, QcChemicalItem::getS, bo.getS());
         lqw.eq(bo.getAls() != null, QcChemicalItem::getAls, bo.getAls());
+        lqw.eq(bo.getAl() != null, QcChemicalItem::getAl, bo.getAl());
+        lqw.eq(bo.getTi() != null, QcChemicalItem::getTi, bo.getTi());
+        lqw.eq(bo.getCr() != null, QcChemicalItem::getCr, bo.getCr());
+        lqw.eq(bo.getNi() != null, QcChemicalItem::getNi, bo.getNi());
+        lqw.eq(bo.getCu() != null, QcChemicalItem::getCu, bo.getCu());
+        lqw.eq(bo.getN() != null, QcChemicalItem::getN, bo.getN());
+        lqw.eq(bo.getFe() != null, QcChemicalItem::getFe, bo.getFe());
+        lqw.eq(bo.getB() != null, QcChemicalItem::getB, bo.getB());
         // 根据创建时间倒叙
         lqw.orderByDesc(QcChemicalItem::getCreateTime);
         return lqw;
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java
index 44f12e695..c18ee3180 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java
@@ -73,12 +73,15 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService {
         lqw.eq(bo.getCoilId() != null, QcPhysicalItem::getCoilId, bo.getCoilId());
         lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcPhysicalItem::getCoilNo, bo.getCoilNo());
         lqw.eq(bo.getYieldStrength() != null, QcPhysicalItem::getYieldStrength, bo.getYieldStrength());
+        lqw.eq(bo.getPlasticExtensionStrength() != null, QcPhysicalItem::getPlasticExtensionStrength, bo.getPlasticExtensionStrength());
         lqw.eq(bo.getTensileStrength() != null, QcPhysicalItem::getTensileStrength, bo.getTensileStrength());
         lqw.eq(bo.getElongation() != null, QcPhysicalItem::getElongation, bo.getElongation());
         lqw.eq(bo.getHardness() != null, QcPhysicalItem::getHardness, bo.getHardness());
         lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcPhysicalItem::getBendingTest, bo.getBendingTest());
         lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcPhysicalItem::getSurfaceQuality, bo.getSurfaceQuality());
         lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcPhysicalItem::getSurfaceStructure, bo.getSurfaceStructure());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoatingSurfaceStructure()), QcPhysicalItem::getCoatingSurfaceStructure, bo.getCoatingSurfaceStructure());
+        lqw.eq(bo.getCoatingMass() != null, QcPhysicalItem::getCoatingMass, bo.getCoatingMass());
         lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcPhysicalItem::getEdgeStatus, bo.getEdgeStatus());
         // 根据创建时间倒叙
         lqw.orderByDesc(QcPhysicalItem::getCreateTime);
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java
index 208ec779f..d28812594 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java
@@ -82,6 +82,9 @@ public class MesRollGrind extends BaseEntity {
     /** 操作者 */
     private String operator;
 
+    /** 备注 */
+    private String remark;
+
     @TableLogic
     private Integer delFlag;
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
index fdae7bfa7..fb9a6345e 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollInfo.java
@@ -71,6 +71,9 @@ public class MesRollInfo extends BaseEntity {
     /** 厂家 */
     private String manufacturer;
 
+    /** 备注 */
+    private String remark;
+
     @TableLogic
     private Integer delFlag;
 }
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java
index d4fad19ea..2f23e9414 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java
@@ -37,4 +37,5 @@ public class MesRollGrindBo extends BaseEntity {
     private String flawResult;
     private BigDecimal hardness;
     private String operator;
+    private String remark;
 }
diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml
index 6974af5a3..e5cc3eee8 100644
--- a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml
@@ -9,6 +9,7 @@
         <result property="certificateId" column="certificate_id"/>
         <result property="coilId" column="coil_id"/>
         <result property="coilNo" column="coil_no"/>
+        <result property="rawCoilNo" column="raw_coil_no"/>
         <result property="heatNo" column="heat_no"/>
         <result property="materialType" column="material_type"/>
         <result property="size" column="size"/>
@@ -20,15 +21,28 @@
         <result property="p" column="p"/>
         <result property="s" column="s"/>
         <result property="als" column="als"/>
+        <result property="al" column="al"/>
+        <result property="ti" column="ti"/>
+        <result property="cr" column="cr"/>
+        <result property="ni" column="ni"/>
+        <result property="cu" column="cu"/>
+        <result property="n" column="n"/>
+        <result property="fe" column="fe"/>
+        <result property="b" column="b"/>
         <result property="yieldStrength" column="yield_strength"/>
+        <result property="plasticExtensionStrength" column="plastic_extension_strength"/>
         <result property="tensileStrength" column="tensile_strength"/>
         <result property="elongation" column="elongation"/>
         <result property="hardness" column="hardness"/>
         <result property="bendingTest" column="bending_test"/>
         <result property="surfaceQuality" column="surface_quality"/>
         <result property="surfaceStructure" column="surface_structure"/>
+        <result property="surfaceTreatment" column="surface_treatment"/>
+        <result property="coatingSurfaceStructure" column="coating_surface_structure"/>
+        <result property="coatingMass" column="coating_mass"/>
         <result property="edgeStatus" column="edge_status"/>
         <result property="remark" column="remark"/>
+        <result property="temperDegree" column="temper_degree"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
diff --git a/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml
index efed952b7..283985aac 100644
--- a/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml
@@ -16,6 +16,14 @@
         <result property="p" column="p"/>
         <result property="s" column="s"/>
         <result property="als" column="als"/>
+        <result property="al" column="al"/>
+        <result property="ti" column="ti"/>
+        <result property="cr" column="cr"/>
+        <result property="ni" column="ni"/>
+        <result property="cu" column="cu"/>
+        <result property="n" column="n"/>
+        <result property="fe" column="fe"/>
+        <result property="b" column="b"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>
diff --git a/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml
index 5f6b932e1..6122459b0 100644
--- a/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml
@@ -10,12 +10,15 @@
         <result property="coilId" column="coil_id"/>
         <result property="coilNo" column="coil_no"/>
         <result property="yieldStrength" column="yield_strength"/>
+        <result property="plasticExtensionStrength" column="plastic_extension_strength"/>
         <result property="tensileStrength" column="tensile_strength"/>
         <result property="elongation" column="elongation"/>
         <result property="hardness" column="hardness"/>
         <result property="bendingTest" column="bending_test"/>
         <result property="surfaceQuality" column="surface_quality"/>
         <result property="surfaceStructure" column="surface_structure"/>
+        <result property="coatingSurfaceStructure" column="coating_surface_structure"/>
+        <result property="coatingMass" column="coating_mass"/>
         <result property="edgeStatus" column="edge_status"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>
diff --git a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
index 0b40255f7..82884e238 100644
--- a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
+++ b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
@@ -25,7 +25,7 @@
           <if test="lineId != null">AND line_id = #{lineId}</if>
           <if test="beginTime != null and beginTime != ''">AND grind_time &gt;= #{beginTime}</if>
           <if test="endTime != null and endTime != ''">AND grind_time &lt;= #{endTime}</if>
-        ORDER BY grind_time ASC, grind_id ASC
+        ORDER BY grind_time DESC, grind_id ASC
     </select>
 
     <select id="selectMonthlyStats" resultType="map">
diff --git a/klp-ui/package.json b/klp-ui/package.json
index 2a2d5e7bb..1aaa8d735 100644
--- a/klp-ui/package.json
+++ b/klp-ui/package.json
@@ -73,6 +73,7 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "three": "^0.160.1",
     "vditor": "^3.11.1",
     "video.js": "^8.23.3",
     "vue": "2.6.12",
diff --git a/klp-ui/src/api/wms/attendance.js b/klp-ui/src/api/wms/attendance.js
index ee4765b65..8de38d68e 100644
--- a/klp-ui/src/api/wms/attendance.js
+++ b/klp-ui/src/api/wms/attendance.js
@@ -45,12 +45,14 @@ export function delRecords(id) {
 }
 
 // 同步考勤记录
-export function syncRecords(starttime) {
+export function syncRecords({ starttime, endtime }) {
   return attendanceRequest({
     url: '/sync_attendance',
     method: 'post',
+    timeout: 60000,
     data: {
-      starttime
+      starttime,
+      endtime
     }
   })
 }
diff --git a/klp-ui/src/assets/images/contractLogo.png b/klp-ui/src/assets/images/contractLogo.png
new file mode 100644
index 000000000..7e438a763
Binary files /dev/null and b/klp-ui/src/assets/images/contractLogo.png differ
diff --git a/klp-ui/src/components/CoilSelector/data.js b/klp-ui/src/components/CoilSelector/data.js
index 9ff3f2f34..bb63d575e 100644
--- a/klp-ui/src/components/CoilSelector/data.js
+++ b/klp-ui/src/components/CoilSelector/data.js
@@ -11,6 +11,12 @@ export const defaultColumns = [
     prop: 'currentCoilNo',
     showOverflowTooltip: true
   },
+  {
+    label: '镀铬卷号',
+    align: 'center',
+    prop: 'chromelCoilNo',
+    showOverflowTooltip: true
+  },
   {
     label: '存储位置',
     align: 'center',
@@ -83,6 +89,12 @@ export const fullPageDefaultColumns = [
     prop: 'currentCoilNo',
     showOverflowTooltip: true
   },
+  {
+    label: '镀铬卷号',
+    align: 'center',
+    prop: 'chromelCoilNo',
+    showOverflowTooltip: true
+  },
   {
     label: '存储位置',
     align: 'center',
@@ -171,6 +183,7 @@ export const fullPageDefaultColumns = [
 export const optionalColumns = [
   { label: '入场卷号', value: 'enterCoilNo' },
   { label: '当前卷号', value: 'currentCoilNo' },
+  { label: '镀铬卷号', value: 'chromelCoilNo' },
   { label: '厂家钢卷号', value: 'supplierCoilNo' },
   { label: '逻辑库区', value: 'warehouseName' },
   { label: '实际库区', value: 'actualWarehouseName' },
@@ -187,7 +200,11 @@ export const optionalColumns = [
   { label: '厂家', value: 'manufacturer' },
   { label: '表面处理', value: 'surfaceTreatmentDesc' },
   { label: '镀层质量', value: 'zincLayer' },
-  { label: '长度', value: 'length' },
+  { label: '实测长度', value: 'actualLength' },
+  { label: '理论长度', value: 'theoreticalLength' },
+  { label: '实测厚度', value: 'actualThickness' },
+  { label: '理论厚度', value: 'theoreticalThickness' },
+  { label: '实测宽度', value: 'actualWidth' },
   { label: '毛重', value: 'grossWeight' },
   { label: '净重', value: 'netWeight' },
   { label: '创建时间', value: 'createTime' },
diff --git a/klp-ui/src/components/KLPService/Renderer/CoilCard.vue b/klp-ui/src/components/KLPService/Renderer/CoilCard.vue
index 303f673be..344a18583 100644
--- a/klp-ui/src/components/KLPService/Renderer/CoilCard.vue
+++ b/klp-ui/src/components/KLPService/Renderer/CoilCard.vue
@@ -64,7 +64,7 @@
                   <span class="param-value">{{ coil.netWeight }}t</span>
                 </div>
                 <div class="param-row" v-if="coil.length">
-                  <span class="param-label">长度：</span>
+                  <span class="param-label">参考长度：</span>
                   <span class="param-value">{{ coil.length }}m</span>
                 </div>
                 <div class="param-row" v-if="coil.actualLength">
diff --git a/klp-ui/src/components/KLPService/SchemeSelect/index.vue b/klp-ui/src/components/KLPService/SchemeSelect/index.vue
index 1ddf97558..cf3a72c72 100644
--- a/klp-ui/src/components/KLPService/SchemeSelect/index.vue
+++ b/klp-ui/src/components/KLPService/SchemeSelect/index.vue
@@ -73,17 +73,56 @@
         </el-form-item>
       </el-form>
       <el-form :model="form" ref="taskForm" label-width="80px" size="small" v-if="form.taskType === '产品检验'">
-        <el-form-item label="入场卷号" prop="enterCoilNos" :rules="[{ required: true, message: '请输入入场卷号', trigger: 'blur' }]">
-          <el-autocomplete
-            v-model="form.enterCoilNos"
-            :fetch-suggestions="queryCoilNo"
-            placeholder="请输入入场卷号（输入2个字符以上自动搜索）"
-            :loading="coilNoLoading"
-            :trigger-on-focus="false"
-            clearable
-            style="width: 280px;"
-          />
-        </el-form-item>
+        <div style="background: #f5f7fa; border: 1px solid #e4e7ed; border-radius: 6px; padding: 12px 16px 8px 16px; margin-bottom: 4px;">
+          <div style="font-size: 12px; color: #909399; margin-bottom: 8px; line-height: 1.6;">
+            <i class="el-icon-info" style="margin-right: 4px;"></i>
+            可输入入场卷号或厂家卷号，两者互通匹配
+          </div>
+          <el-form-item label="入场卷号" prop="enterCoilNos" :rules="[{ required: true, message: '请输入入场卷号', trigger: 'blur' }]">
+            <div style="display: flex; flex-wrap: wrap; gap: 8px; margin-bottom: 8px;">
+              <el-tag
+                v-for="(coilNo, index) in selectedEnterCoilNos"
+                :key="'enter-' + index"
+                closable
+                @close="removeEnterCoilNo(index)"
+              >
+                {{ coilNo }}
+              </el-tag>
+            </div>
+            <el-autocomplete
+              v-model="tempEnterCoilNo"
+              :fetch-suggestions="queryCoilNo"
+              placeholder="输入入场卷号搜索添加"
+              :loading="coilNoLoading"
+              :trigger-on-focus="false"
+              clearable
+              style="width: 280px;"
+              @select="handleSelectCoilNo"
+            />
+            <div style="display: flex; flex-wrap: wrap; gap: 8px; margin-top: 10px;" v-if="selectedSupplierCoilNos.length > 0">
+              <el-tag
+                v-for="(coilNo, index) in selectedSupplierCoilNos"
+                :key="'supplier-' + index"
+                type="info"
+                closable
+                @close="removeSupplierCoilNo(index)"
+              >
+                {{ coilNo }}
+              </el-tag>
+            </div>
+            <el-autocomplete
+              v-model="tempSupplierCoilNo"
+              :fetch-suggestions="querySupplierCoilNo"
+              placeholder="或输入厂家卷号自动匹配"
+              :loading="supplierCoilNoLoading"
+              :trigger-on-focus="false"
+              clearable
+              size="small"
+              style="width: 280px; margin-top: 6px;"
+              @select="handleSelectSupplierCoilNo"
+            />
+          </el-form-item>
+        </div>
       </el-form>
       <!-- <div style="margin-bottom: 8px;">
         <CoilSelector use-trigger multiple @confirm="handleCoilConfirm">
@@ -190,6 +229,11 @@ export default {
       },
       coilNoOptions: [],
       coilNoLoading: false,
+      selectedEnterCoilNos: [],
+      tempEnterCoilNo: '',
+      selectedSupplierCoilNos: [],
+      tempSupplierCoilNo: '',
+      supplierCoilNoLoading: false,
     };
   },
   computed: {
@@ -208,6 +252,10 @@ export default {
         this.checkItemList = [];
         this.form.taskCode = undefined;
         this.selectedCoils = [];
+        this.selectedEnterCoilNos = [];
+        this.tempEnterCoilNo = '';
+        this.selectedSupplierCoilNos = [];
+        this.tempSupplierCoilNo = '';
         this.getList();
       }
     }
@@ -264,7 +312,8 @@ export default {
             taskType: this.form.taskType,
             belongCompany: this.form.belongCompany || undefined,
             coilIds: coilIds || undefined,
-            enterCoilNos: this.form.enterCoilNos || undefined
+            enterCoilNos: this.form.enterCoilNos || undefined,
+            supplierCoilNos: this.form.supplierCoilNos || undefined
           });
           this.dialogVisible = false;
         }
@@ -303,11 +352,59 @@ export default {
         const options = (response.rows || []).map(item => ({
           value: item.enterCoilNo,
           label: item.enterCoilNo
-        }));
+        })).filter(opt => !this.selectedEnterCoilNos.includes(opt.value));
         cb(options);
       }).finally(() => {
         this.coilNoLoading = false;
       });
+    },
+    handleSelectCoilNo(item) {
+      if (!this.selectedEnterCoilNos.includes(item.value)) {
+        this.selectedEnterCoilNos.push(item.value);
+      }
+      this.tempEnterCoilNo = '';
+      this.form.enterCoilNos = this.selectedEnterCoilNos.join(',');
+    },
+    removeEnterCoilNo(index) {
+      this.selectedEnterCoilNos.splice(index, 1);
+      this.form.enterCoilNos = this.selectedEnterCoilNos.join(',');
+    },
+    querySupplierCoilNo(queryString, cb) {
+      if (!queryString || queryString.length < 2) {
+        cb([]);
+        return;
+      }
+      this.supplierCoilNoLoading = true;
+      listMaterialCoil({
+        supplierCoilNo: queryString,
+        pageNum: 1,
+        pageSize: 20
+      }).then(response => {
+        const options = (response.rows || []).map(item => ({
+          value: item.supplierCoilNo,
+          label: item.supplierCoilNo,
+          enterCoilNo: item.enterCoilNo
+        })).filter(opt => !this.selectedSupplierCoilNos.includes(opt.value));
+        cb(options);
+      }).finally(() => {
+        this.supplierCoilNoLoading = false;
+      });
+    },
+    handleSelectSupplierCoilNo(item) {
+      if (!this.selectedSupplierCoilNos.includes(item.value)) {
+        this.selectedSupplierCoilNos.push(item.value);
+      }
+      this.form.supplierCoilNos = this.selectedSupplierCoilNos.join(',');
+      if (item.enterCoilNo && !this.selectedEnterCoilNos.includes(item.enterCoilNo)) {
+        this.selectedEnterCoilNos.push(item.enterCoilNo);
+        this.form.enterCoilNos = this.selectedEnterCoilNos.join(',');
+        this.$refs["taskForm"].validateField('enterCoilNos');
+      }
+      this.tempSupplierCoilNo = '';
+    },
+    removeSupplierCoilNo(index) {
+      this.selectedSupplierCoilNos.splice(index, 1);
+      this.form.supplierCoilNos = this.selectedSupplierCoilNos.join(',');
     }
   }
 };
diff --git a/klp-ui/src/utils/productContent.js b/klp-ui/src/utils/productContent.js
index 16f3ab3f7..2ecbe87a2 100644
--- a/klp-ui/src/utils/productContent.js
+++ b/klp-ui/src/utils/productContent.js
@@ -89,6 +89,122 @@ export function calculateProductTaxTotal(product) {
   return quantity * taxPrice;
 }
 
+/**
+ * 计算无税单价 = 含税单价 / 税率除数
+ * @param {Object} product - 产品对象
+ * @returns {number} 无税单价
+ */
+export function calculateProductNoTaxPrice(product) {
+  if (!product) return 0;
+  const taxPrice = parseFloat(product.taxPrice) || 0;
+  const taxDivisor = parseFloat(product.taxDivisor) || 1.13;
+  return taxPrice / taxDivisor;
+}
+
+/**
+ * 计算无税总额 = 数量 * 无税单价
+ * @param {Object} product - 产品对象
+ * @returns {number} 无税总额
+ */
+export function calculateProductNoTaxTotal(product) {
+  if (!product) return 0;
+  const quantity = parseFloat(product.quantity) || 0;
+  const noTaxPrice = parseFloat(product.noTaxPrice) || 0;
+  return quantity * noTaxPrice;
+}
+
+/**
+ * 计算税额 = 含税总额 - 无税总额
+ * @param {Object} product - 产品对象
+ * @returns {number} 税额
+ */
+export function calculateProductTaxAmount(product) {
+  if (!product) return 0;
+  const taxTotal = parseFloat(product.taxTotal) || 0;
+  const noTaxTotal = parseFloat(product.noTaxTotal) || 0;
+  return taxTotal - noTaxTotal;
+}
+
+/**
+ * 根据变更字段重新计算产品所有金额字段
+ * @param {Object} product - 产品对象
+ * @param {string} changedField - 变更的字段名
+ * @returns {Object} 更新后的产品对象
+ */
+export function calculateProductFields(product, changedField = 'quantity') {
+  if (!product) return product;
+
+  const quantity = parseFloat(product.quantity) || 0;
+  let taxPrice = parseFloat(product.taxPrice) || 0;
+  let taxDivisor = parseFloat(product.taxDivisor) || 1.13;
+  let noTaxPrice, noTaxTotal, taxTotal, taxAmount;
+
+  switch (changedField) {
+    case 'quantity':
+    case 'taxPrice':
+      taxTotal = quantity * taxPrice;
+      noTaxPrice = taxPrice / taxDivisor;
+      noTaxTotal = quantity * noTaxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+      break;
+    case 'taxDivisor':
+      noTaxPrice = taxPrice / taxDivisor;
+      taxTotal = quantity * taxPrice;
+      noTaxTotal = quantity * noTaxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+      break;
+    case 'noTaxPrice':
+      noTaxPrice = parseFloat(product.noTaxPrice) || 0;
+      taxPrice = noTaxPrice * taxDivisor;
+      taxTotal = quantity * taxPrice;
+      noTaxTotal = quantity * noTaxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+      break;
+    case 'noTaxTotal':
+      noTaxTotal = parseFloat(product.noTaxTotal) || 0;
+      noTaxPrice = quantity > 0 ? noTaxTotal / quantity : 0;
+      taxPrice = noTaxPrice * taxDivisor;
+      taxTotal = quantity * taxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+      break;
+    case 'taxTotal':
+      taxTotal = parseFloat(product.taxTotal) || 0;
+      taxPrice = quantity > 0 ? taxTotal / quantity : 0;
+      noTaxPrice = taxPrice / taxDivisor;
+      noTaxTotal = quantity * noTaxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+      break;
+    case 'taxAmount':
+      taxAmount = parseFloat(product.taxAmount) || 0;
+      taxTotal = quantity * taxPrice;
+      noTaxTotal = taxTotal - taxAmount;
+      noTaxPrice = quantity > 0 ? noTaxTotal / quantity : 0;
+      taxPrice = quantity > 0 ? noTaxPrice * taxDivisor : 0;
+      taxTotal = quantity * taxPrice;
+      noTaxTotal = quantity * noTaxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+      break;
+    default:
+      taxTotal = quantity * taxPrice;
+      noTaxPrice = taxPrice / taxDivisor;
+      noTaxTotal = quantity * noTaxPrice;
+      taxAmount = taxTotal - noTaxTotal;
+  }
+
+  const round2 = (v) => Math.round(v * 100) / 100;
+
+  return {
+    ...product,
+    quantity,
+    taxPrice: round2(taxPrice),
+    noTaxPrice: round2(noTaxPrice),
+    taxTotal: round2(taxTotal),
+    noTaxTotal: round2(noTaxTotal),
+    taxAmount: round2(taxAmount),
+    taxDivisor
+  };
+}
+
 /**
  * 重新计算所有产品的含税总额和总计
  * @param {Object} content - 产品内容对象
@@ -99,10 +215,9 @@ export function recalculateTotals(content) {
     return { ...DEFAULT_PRODUCT_CONTENT };
   }
 
-  const products = (content.products || []).map(product => ({
-    ...product,
-    taxTotal: calculateProductTaxTotal(product)
-  }));
+  const products = (content.products || []).map(product =>
+    calculateProductFields(product, 'quantity')
+  );
 
   const totalQuantity = calculateTotalQuantity(products);
   const totalTaxTotal = calculateTotalTaxTotal(products);
@@ -124,15 +239,16 @@ export function recalculateTotals(content) {
 export function convertOrderItemToProduct(orderItem) {
   if (!orderItem) return {};
   
-  return {
+  const product = {
     spec: orderItem.finishedProductSpec || '',
     material: orderItem.material || '',
     quantity: parseFloat(orderItem.weight) || 0,
     taxPrice: parseFloat(orderItem.contractPrice) || 0,
-    noTaxPrice: parseFloat(orderItem.itemAmount) || 0,
-    taxTotal: (parseFloat(orderItem.contractPrice) || 0) * (parseFloat(orderItem.weight) || 0),
+    taxDivisor: parseFloat(orderItem.taxDivisor) || 1.13,
     remark: orderItem.remark || ''
   };
+
+  return calculateProductFields(product, 'quantity');
 }
 
 /**
@@ -304,6 +420,10 @@ export default {
   calculateTotalQuantity,
   calculateTotalTaxTotal,
   calculateProductTaxTotal,
+  calculateProductNoTaxPrice,
+  calculateProductNoTaxTotal,
+  calculateProductTaxAmount,
+  calculateProductFields,
   recalculateTotals,
   convertOrderItemToProduct,
   convertOrderItemsToContent,
diff --git a/klp-ui/src/views/cost/item.vue b/klp-ui/src/views/cost/item.vue
index 6cf80dcc1..aacacbad1 100644
--- a/klp-ui/src/views/cost/item.vue
+++ b/klp-ui/src/views/cost/item.vue
@@ -17,13 +17,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="成本分类 原料/能耗/辅料/设备/人工" prop="category">
-        <el-input
+      <el-form-item label="成本分类" prop="category">
+        <el-select
           v-model="queryParams.category"
-          placeholder="请输入成本分类 原料/能耗/辅料/设备/人工"
+          placeholder="请选择成本分类"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery"
+        >
+          <el-option label="原料" value="原料" />
+          <el-option label="能耗" value="能耗" />
+          <el-option label="辅料" value="辅料" />
+          <el-option label="设备" value="设备" />
+          <el-option label="人工" value="人工" />
+          <el-option label="产出" value="产出" />
+          <el-option label="轧辊" value="轧辊" />
+          <el-option label="其他" value="其他" />
+        </el-select>
       </el-form-item>
       <el-form-item label="计量单位" prop="unit">
         <el-input
@@ -33,6 +42,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="查询条件" prop="queryCondition">
+        <el-input
+          v-model="queryParams.queryCondition"
+          placeholder="请输入查询条件"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -86,9 +103,10 @@
       <el-table-column label="主键ID" align="center" prop="itemId" v-if="true"/>
       <el-table-column label="成本项目编码" align="center" prop="itemCode" />
       <el-table-column label="成本项目名称" align="center" prop="itemName" />
-      <el-table-column label="成本分类 原料/能耗/辅料/设备/人工" align="center" prop="category" />
+      <el-table-column label="成本分类" align="center" prop="category" />
       <el-table-column label="计量单位" align="center" prop="unit" />
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="查询条件" align="center" prop="queryCondition" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -124,8 +142,17 @@
         <el-form-item label="成本项目名称" prop="itemName">
           <el-input v-model="form.itemName" placeholder="请输入成本项目名称" />
         </el-form-item>
-        <el-form-item label="成本分类 原料/能耗/辅料/设备/人工" prop="category">
-          <el-input v-model="form.category" placeholder="请输入成本分类 原料/能耗/辅料/设备/人工" />
+        <el-form-item label="成本分类" prop="category">
+          <el-select v-model="form.category" placeholder="请选择成本分类">
+            <el-option label="原料" value="原料" />
+            <el-option label="能耗" value="能耗" />
+            <el-option label="辅料" value="辅料" />
+            <el-option label="设备" value="设备" />
+            <el-option label="人工" value="人工" />
+            <el-option label="产出" value="产出" />
+            <el-option label="轧辊" value="轧辊" />
+            <el-option label="其他" value="其他" />
+          </el-select>
         </el-form-item>
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
@@ -133,6 +160,9 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
+        <el-form-item label="查询条件" prop="queryCondition">
+          <el-input v-model="form.queryCondition" placeholder="请输入查询条件" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -177,6 +207,7 @@ export default {
         itemName: undefined,
         category: undefined,
         unit: undefined,
+        queryCondition: undefined,
       },
       // 表单参数
       form: {},
@@ -212,6 +243,7 @@ export default {
         category: undefined,
         unit: undefined,
         remark: undefined,
+        queryCondition: undefined,
         delFlag: undefined,
         createBy: undefined,
         createTime: undefined,
diff --git a/klp-ui/src/views/crm/contract/components/ContractList.vue b/klp-ui/src/views/crm/contract/components/ContractList.vue
index 84360c589..aba7786d4 100644
--- a/klp-ui/src/views/crm/contract/components/ContractList.vue
+++ b/klp-ui/src/views/crm/contract/components/ContractList.vue
@@ -133,13 +133,40 @@
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" style="padding: 10px; margin-bottom: 10px !important;" />
+
+    <!-- 导出预览对话框 -->
+    <el-dialog title="导出预览" :visible.sync="exportDialogVisible" width="95%" top="20px" append-to-body
+      :close-on-click-modal="false" @open="generatePreviewHtml">
+      <div style="display: flex; gap: 16px; height: calc(100vh - 200px);">
+        <!-- 左侧：列配置 -->
+        <div style="width: 200px; flex-shrink: 0; border: 1px solid #e4e7ed; border-radius: 4px; padding: 12px; overflow-y: auto;">
+          <div style="font-weight: bold; margin-bottom: 10px; font-size: 14px;">产品表列配置</div>
+          <el-checkbox v-model="selectAllColumns" :indeterminate="columnIndeterminate" @change="handleSelectAllColumns"
+            style="margin-bottom: 8px;">全选</el-checkbox>
+          <div v-for="col in columnConfigs" :key="col.key" style="margin-bottom: 6px;">
+            <el-checkbox v-model="col.checked" @change="onColumnChange">{{ col.label }}</el-checkbox>
+          </div>
+          <el-divider />
+          <div style="font-size: 12px; color: #909399;">勾选的列将显示在导出的产品表中</div>
+        </div>
+        <!-- 右侧：预览 -->
+        <div style="flex: 1; border: 1px solid #e4e7ed; border-radius: 4px; overflow: hidden; background: #f0f0f0;">
+          <iframe ref="previewFrame" style="width: 100%; height: 100%; border: none; background: #fff;"></iframe>
+        </div>
+      </div>
+      <span slot="footer">
+        <el-button @click="exportDialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="exportLoading" @click="confirmExport">确认导出</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listOrder, updateOrder } from "@/api/crm/order";
-import * as ExcelJS from 'exceljs';
-import { saveAs } from 'file-saver';
+import html2canvas from 'html2canvas';
+import jsPDF from 'jspdf';
+import contractLogo from '@/assets/images/contractLogo.png';
 import {
   parseProductContent,
   convertToChinese
@@ -175,6 +202,24 @@ export default {
         signLocation: undefined,
         status: undefined,
       },
+      // 导出预览
+      exportDialogVisible: false,
+      exportLoading: false,
+      exportRow: null,
+      selectAllColumns: true,
+      columnIndeterminate: false,
+      columnConfigs: [
+        { key: 'spec', label: '规格（mm）', checked: true },
+        { key: 'material', label: '材质', checked: true },
+        { key: 'quantity', label: '数量（吨）', checked: true },
+        { key: 'taxPrice', label: '含税单价（元/吨）', checked: true },
+        { key: 'taxDivisor', label: '税率除数', checked: true },
+        { key: 'noTaxPrice', label: '无税单价（元/吨）', checked: true },
+        { key: 'taxTotal', label: '含税总额（元）', checked: true },
+        { key: 'noTaxTotal', label: '无税总额（元）', checked: true },
+        { key: 'taxAmount', label: '税额（元）', checked: true },
+        { key: 'remark', label: '备注', checked: true },
+      ],
     };
   },
   created() {
@@ -235,529 +280,359 @@ export default {
     toggleMoreFilter() {
       this.showMoreFilter = !this.showMoreFilter;
     },
-    convertToChinese(amount) {
-      return convertToChinese(amount);
+    /** 导出合同 - 打开预览对话框 */
+    handleExport(row) {
+      this.exportRow = row;
+      this.exportDialogVisible = true;
     },
-    /** 导出合同 */
-    async handleExport(row) {
-      // 1. 创建excel
-      const workbook = new ExcelJS.Workbook();
-      const worksheet = workbook.addWorksheet('产品销售合同');
-      // let orderItems = [];
-      // // 2. 查询合同详情
-      // const res = await listOrderItem({ orderId: row.orderId, pageNum: 1, pageSize: 1000 });
-      // orderItems = res.rows || [];
+    /** 全选/取消全选 */
+    handleSelectAllColumns(val) {
+      this.columnConfigs.forEach(col => { col.checked = val; });
+      this.columnIndeterminate = false;
+      this.generatePreviewHtml();
+    },
+    /** 单个列勾选变化 */
+    onColumnChange() {
+      const checkedCount = this.columnConfigs.filter(c => c.checked).length;
+      this.selectAllColumns = checkedCount === this.columnConfigs.length;
+      this.columnIndeterminate = checkedCount > 0 && checkedCount < this.columnConfigs.length;
+      this.generatePreviewHtml();
+    },
+    /** 根据列配置生成产品表HTMl */
+    buildProductTableHtml(productData, products) {
+      const activeCols = this.columnConfigs.filter(c => c.checked);
+      const hasCol = (key) => activeCols.some(c => c.key === key);
 
-      // 2. 设置列宽
-      worksheet.columns = [
-        { width: 10 },
-        { width: 20 },
-        { width: 15 },
-        { width: 15 },
-        { width: 15 },
-        { width: 15 },
-        { width: 15 },
-        { width: 20 }
-      ];
+      // 表头
+      let headerCells = '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:30px;">序号</th>';
+      if (hasCol('spec')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:80px;">规格(mm)</th>';
+      if (hasCol('material')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:60px;">材质</th>';
+      if (hasCol('quantity')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:55px;">数量(吨)</th>';
+      if (hasCol('taxPrice')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:70px;">含税单价(元/吨)</th>';
+      if (hasCol('taxDivisor')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:45px;">税率除数</th>';
+      if (hasCol('noTaxPrice')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:70px;">无税单价(元/吨)</th>';
+      if (hasCol('taxTotal')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:70px;">含税总额(元)</th>';
+      if (hasCol('noTaxTotal')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:70px;">无税总额(元)</th>';
+      if (hasCol('taxAmount')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:55px;">税额(元)</th>';
+      if (hasCol('remark')) headerCells += '<th style="border:1px solid #000;padding:4px 4px;font-weight:bold;width:80px;">备注</th>';
+      const colCount = activeCols.length + 1; // +1 for 序号
 
-      // 3. 合并单元格并设置内容
-      // 公司信息
-      worksheet.mergeCells('A1:H1');
-      worksheet.getCell('A1').value = '嘉祥科伦普重工有限公司';
-      worksheet.getCell('A1').font = { size: 16, bold: true };
-      worksheet.getCell('A1').alignment = { horizontal: 'center', vertical: 'middle' };
-
-      // 合同标题
-      worksheet.mergeCells('A2:F2');
-      worksheet.getCell('A2').value = '产品销售合同';
-      worksheet.getCell('A2').font = { size: 18, bold: true };
-      worksheet.getCell('A2').alignment = { horizontal: 'center', vertical: 'middle' };
-
-      // 合同编号
-      worksheet.mergeCells('G2:H2');
-      worksheet.getCell('G2').value = `合同编号：${row.contractCode || ''}`;
-      worksheet.getCell('G2').alignment = { horizontal: 'right', vertical: 'middle' };
-
-      // 供方信息
-      worksheet.getCell('A3').value = `供方（甲方）：${row.supplier || '嘉祥科伦普重工有限公司'}`;
-      worksheet.getCell('A3').alignment = { horizontal: 'left', vertical: 'middle' };
-
-      // 签订时间
-      worksheet.getCell('E3').value = `签订时间：${row.signTime ? this.parseTime(row.signTime, '{y}年{m}月{d}日') : '2026年 月 日'}`;
-      worksheet.getCell('E3').alignment = { horizontal: 'left', vertical: 'middle' };
-
-      // 需方信息
-      worksheet.getCell('A4').value = `需方（乙方）：${row.customer || ''}`;
-      worksheet.getCell('A4').alignment = { horizontal: 'left', vertical: 'middle' };
-
-      // 签订地点
-      worksheet.getCell('E4').value = `签订地点：${row.signLocation || '山东省济宁市嘉祥县'}`;
-      worksheet.getCell('E4').alignment = { horizontal: 'left', vertical: 'middle' };
-
-      // 产品内容标题
-      worksheet.getCell('A5').value = '一、产品内容';
-      worksheet.getCell('A5').font = { bold: true };
-
-      // 产品名称和生产厂家
-      worksheet.mergeCells('A6:C6');
-      worksheet.getCell('A6').value = `产品名称：${row.productName || '冷硬钢卷'}`;
-      worksheet.getCell('A6').alignment = { horizontal: 'left', vertical: 'middle' };
-      worksheet.getCell('A6').border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-
-
-      worksheet.mergeCells('D6:H6');
-      worksheet.getCell('D6').value = `生产厂家：${row.manufacturer || '嘉祥科伦普重工有限公司'}`;
-      worksheet.getCell('D6').alignment = { horizontal: 'left', vertical: 'middle' };
-      worksheet.getCell('D6').border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-
-      // 产品表格标题（分为两行）
-      // 合并序号、规格、材质、备注列的单元格（两行）
-      const mergedHeaders = ['序号', '规格（mm）', '材质', '备注'];
-      const mergedColumns = [1, 2, 3, 8];
-
-      mergedColumns.forEach((col, index) => {
-        // 合并两行
-        worksheet.mergeCells(7, col, 8, col);
-        const cell = worksheet.getCell(7, col);
-        cell.value = mergedHeaders[index];
-        cell.font = { bold: true };
-        cell.fill = { type: 'pattern', pattern: 'solid' };
-        cell.border = {
-          top: { style: 'thin' },
-          left: { style: 'thin' },
-          bottom: { style: 'thin' },
-          right: { style: 'thin' }
-        };
-        cell.alignment = { horizontal: 'center', vertical: 'middle' };
+      // 数据行
+      let bodyRows = '';
+      products.forEach((product, index) => {
+        let cells = `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${index + 1}</td>`;
+        if (hasCol('spec')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.spec || ''}</td>`;
+        if (hasCol('material')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.material || ''}</td>`;
+        if (hasCol('quantity')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.quantity || ''}</td>`;
+        if (hasCol('taxPrice')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.taxPrice || ''}</td>`;
+        if (hasCol('taxDivisor')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.taxDivisor || '1.13'}</td>`;
+        if (hasCol('noTaxPrice')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.noTaxPrice || 0).toFixed(2)}</td>`;
+        if (hasCol('taxTotal')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.taxTotal || 0).toFixed(2)}</td>`;
+        if (hasCol('noTaxTotal')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.noTaxTotal || 0).toFixed(2)}</td>`;
+        if (hasCol('taxAmount')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.taxAmount || 0).toFixed(2)}</td>`;
+        if (hasCol('remark')) cells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;max-width:100px;word-wrap:break-word;">${product.remark || ''}</td>`;
+        bodyRows += `<tr>${cells}</tr>`;
       });
 
-      // 数量、含税单价、不含税单价、含税总额的标题和单位各占一行
-      const quantityHeaders = ['数量', '（吨）'];
-      const taxPriceHeaders = ['含税单价', '（元/吨）'];
-      const noTaxPriceHeaders = ['不含税单价', '（元/吨）'];
-      const taxTotalHeaders = ['含税总额', '（元）'];
+      // 合计行
+      const totalQty = products.reduce((a, p) => a + (parseFloat(p.quantity) || 0), 0);
+      const totalTax = products.reduce((a, p) => a + (parseFloat(p.taxTotal) || 0), 0);
+      const totalNoTax = products.reduce((a, p) => a + (parseFloat(p.noTaxTotal) || 0), 0);
+      const totalTaxAmt = products.reduce((a, p) => a + (parseFloat(p.taxAmount) || 0), 0);
+      const totalAmountInWords = productData.totalAmountInWords || convertToChinese(totalTax) || '零元整';
 
-      // 数量列
-      worksheet.getCell(7, 4).value = quantityHeaders[0];
-      worksheet.getCell(8, 4).value = quantityHeaders[1];
-
-      // 含税单价列
-      worksheet.getCell(7, 5).value = taxPriceHeaders[0];
-      worksheet.getCell(8, 5).value = taxPriceHeaders[1];
-
-      // 不含税单价列
-      worksheet.getCell(7, 6).value = noTaxPriceHeaders[0];
-      worksheet.getCell(8, 6).value = noTaxPriceHeaders[1];
-
-      // 含税总额列
-      worksheet.getCell(7, 7).value = taxTotalHeaders[0];
-      worksheet.getCell(8, 7).value = taxTotalHeaders[1];
-
-      // 设置样式
-      for (let row = 7; row <= 8; row++) {
-        for (let col = 4; col <= 7; col++) {
-          const cell = worksheet.getCell(row, col);
-          cell.font = { bold: true };
-          cell.fill = { type: 'pattern', pattern: 'solid' };
-          cell.border = {
-            top: { style: 'thin' },
-            left: { style: 'thin' },
-            bottom: { style: 'thin' },
-            right: { style: 'thin' }
-          };
-          cell.alignment = { horizontal: 'center', vertical: 'middle' };
+      // 合计行单元格（按列顺序填充）
+      let totalCells = '';
+      let cellIdx = 0;
+      activeCols.forEach((col) => {
+        if (cellIdx < 2) {
+          // 前 2 个活动列（spec、material）与序号一起被"合计" colspan=3 覆盖
+          if (cellIdx === 0) {
+            totalCells += `<td colspan="3" style="border:1px solid #000;padding:4px 4px;font-weight:bold;text-align:center;">合&nbsp;&nbsp;计</td>`;
+          }
+        } else {
+          let val = '';
+          if (col.key === 'quantity') val = totalQty.toFixed(2);
+          else if (col.key === 'taxTotal') val = totalTax.toFixed(2);
+          else if (col.key === 'noTaxTotal') val = totalNoTax.toFixed(2);
+          else if (col.key === 'taxAmount') val = totalTaxAmt.toFixed(2);
+          totalCells += `<td style="border:1px solid #000;padding:3px 4px;text-align:center;">${val}</td>`;
         }
-      }
+        cellIdx++;
+      });
+
+      const html = `
+        <table style="width:100%;border-collapse:collapse;font-size:11px;margin-bottom:6px;">
+          <tr>
+            <td colspan="4" style="border:1px solid #000;padding:3px 6px;font-weight:bold;text-align:left;">产品名称：${productData.productName || ''}</td>
+            <td colspan="${colCount - 4 > 0 ? colCount - 4 : 1}" style="border:1px solid #000;padding:3px 6px;font-weight:bold;text-align:left;">生产厂家：嘉祥科伦普重工有限公司</td>
+          </tr>
+          <tr style="background-color:#f5f5f5;">${headerCells}</tr>
+          ${bodyRows}
+          <tr>${totalCells}</tr>
+          <tr>
+            <td colspan="${colCount}" style="border:1px solid #000;padding:4px 6px;font-weight:bold;text-align:left;">合计人民币（大写）：${totalAmountInWords}</td>
+          </tr>
+        </table>`;
+      return html;
+    },
+    /** 生成预览HTML并更新iframe */
+    generatePreviewHtml() {
+      const row = this.exportRow;
+      if (!row) return;
 
-      // 产品表格数据， 来源于一个json字符串（productContent，json结构参考ProductContent.vue）
-      // 解析产品内容
       let productData = parseProductContent(row.productContent);
       if (!productData.productName && row.productName) {
         productData.productName = row.productName;
       }
+      const products = productData.products && productData.products.length > 0 ? productData.products : [];
 
-      // if (orderItems) {
-      //   try {
-      //     // 改为从orderItems中获取产品内容
-      //     const productName = orderItems[0].productType || '冷硬钢卷';
-      //     const remark = row.remark || '';
-      //     const products = orderItems.map(item => ({
-      //       spec: item.finishedProductSpec || '',
-      //       material: item.material || '',
-      //       quantity: parseFloat(item.weight || 0),
-      //       taxPrice: parseFloat(item.contractPrice || 0),
-      //       noTaxPrice: parseFloat(item.itemAmount || 0),
-      //       taxTotal: parseFloat(item.contractPrice) * parseFloat(item.weight || 0),
-      //       remark: item.remark || ''
-      //     }));
+      const productTableHtml = this.buildProductTableHtml(productData, products);
 
-      //     const totalQuantity = products.reduce((acc, product) => acc + parseFloat(product.quantity || 0), 0);
-      //     const totalTaxTotal = products.reduce((acc, product) => acc + parseFloat(product.taxTotal || 0), 0);
-      //     const totalAmountInWords = this.convertToChinese(totalTaxTotal);
-
-      //     productData = {
-      //       products,
-      //       productName,
-      //       remark,
-      //       totalQuantity,
-      //       totalTaxTotal,
-      //       totalAmountInWords
-      //     };
-      //   } catch (error) {
-      //     console.error('解析产品内容失败:', error);
-      //   }
-      // }
-
-      // 更新产品名称
-      worksheet.getCell('A6').value = `产品名称：${productData.productName}`;
-
-      // 产品表格数据
-      let currentRow = 9;
-      let totalQuantity = 0;
-      let totalTaxTotal = 0;
-
-      if (productData.products && productData.products.length > 0) {
-        productData.products.forEach((product, index) => {
-          const rowNum = currentRow + index;
-          worksheet.getCell(`A${rowNum}`).value = index + 1;
-          worksheet.getCell(`B${rowNum}`).value = product.spec || '';
-          worksheet.getCell(`C${rowNum}`).value = product.material || '';
-          worksheet.getCell(`D${rowNum}`).value = product.quantity || 0;
-          worksheet.getCell(`E${rowNum}`).value = product.taxPrice || 0;
-          worksheet.getCell(`F${rowNum}`).value = product.noTaxPrice || 0;
-          worksheet.getCell(`G${rowNum}`).value = product.taxTotal || 0;
-          worksheet.getCell(`H${rowNum}`).value = product.remark || '';
-
-          // 设置数据行边框
-          for (let i = 1; i <= 8; i++) {
-            const cell = worksheet.getCell(rowNum, i);
-            cell.border = {
-              top: { style: 'thin' },
-              left: { style: 'thin' },
-              bottom: { style: 'thin' },
-              right: { style: 'thin' }
-            };
-            cell.alignment = { horizontal: 'center', vertical: 'middle' };
-          }
-
-          // 累加合计
-          totalQuantity += parseFloat(product.quantity || 0);
-          totalTaxTotal += parseFloat(product.taxTotal || 0);
-        });
-
-        currentRow += productData.products.length;
-      } else {
-        // 至少一行空数据
-        worksheet.getCell(`A${currentRow}`).value = 1;
-        worksheet.getCell(`B${currentRow}`).value = '';
-        worksheet.getCell(`C${currentRow}`).value = 'SPCC';
-        worksheet.getCell(`D${currentRow}`).value = '';
-        worksheet.getCell(`E${currentRow}`).value = '';
-        worksheet.getCell(`F${currentRow}`).value = 0.00;
-        worksheet.getCell(`G${currentRow}`).value = 0;
-        worksheet.getCell(`H${currentRow}`).value = '';
-
-        // 设置数据行边框
-        for (let i = 1; i <= 8; i++) {
-          const cell = worksheet.getCell(currentRow, i);
-          cell.border = {
-            top: { style: 'thin' },
-            left: { style: 'thin' },
-            bottom: { style: 'thin' },
-            right: { style: 'thin' }
-          };
-          cell.alignment = { horizontal: 'center', vertical: 'middle' };
-        }
-        currentRow++;
-      }
-
-      // 合计行
-      worksheet.getCell(`A${currentRow}`).value = '合   计';
-      worksheet.getCell(`A${currentRow}`).font = { bold: true };
-      worksheet.getCell(`A${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'center', vertical: 'middle' };
-
-      worksheet.getCell(`D${currentRow}`).value = productData.totalQuantity || totalQuantity;
-      worksheet.getCell(`D${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`D${currentRow}`).alignment = { horizontal: 'center', vertical: 'middle' };
-
-      worksheet.getCell(`G${currentRow}`).value = productData.totalTaxTotal || totalTaxTotal;
-      worksheet.getCell(`G${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`G${currentRow}`).alignment = { horizontal: 'center', vertical: 'middle' };
-
-      worksheet.getCell(`H${currentRow}`).value = '';
-      worksheet.getCell(`H${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`H${currentRow}`).alignment = { horizontal: 'center', vertical: 'middle' };
-
-      currentRow++;
-
-      // 大写金额
-      worksheet.mergeCells(`A${currentRow}:B${currentRow}`);
-      worksheet.getCell(`A${currentRow}`).value = `合计人民币（大写）`;
-      worksheet.getCell(`A${currentRow}`).font = { bold: true };
-      worksheet.getCell(`A${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-      worksheet.mergeCells(`C${currentRow}:H${currentRow}`);
-      worksheet.getCell(`C${currentRow}`).value = `${productData.totalAmountInWords || row.totalAmountUpper || '零元整'}`;
-      worksheet.getCell(`C${currentRow}`).font = { bold: true };
-      worksheet.getCell(`C${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`C${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-      currentRow++;
-
-      // 备注行
-      worksheet.mergeCells(`B${currentRow}:H${currentRow}`);
-      worksheet.getCell(`A${currentRow}`).value = '备注:';
-      worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'top' };
-      worksheet.getCell(`A${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-
-      worksheet.getCell(`B${currentRow}`).alignment = { horizontal: 'left', vertical: 'top' };
-      worksheet.getCell(`B${currentRow}`).value = productData.remark || '';
-      worksheet.getCell(`B${currentRow}`).border = {
-        top: { style: 'thin' },
-        left: { style: 'thin' },
-        bottom: { style: 'thin' },
-        right: { style: 'thin' }
-      };
-      worksheet.getCell(`B${currentRow}`).alignment = { horizontal: 'left', vertical: 'top', wrapText: true };
-
-      currentRow++;
-
-      // 空白行（保持至少5行空白）
-      // const emptyRows = Math.max(5, 15 - currentRow + 1);
-      // for (let i = 0; i < emptyRows; i++) {
-      //   const rowNum = currentRow + i;
-      //   for (let j = 1; j <= 8; j++) {
-      //     const cell = worksheet.getCell(rowNum, j);
-      //     cell.border = {
-      //       top: { style: 'thin' },
-      //       left: { style: 'thin' },
-      //       bottom: { style: 'thin' },
-      //       right: { style: 'thin' }
-      //     };
-      //   }
-      // }
-
-      // currentRow += emptyRows;
-
-
-
-      // 产品表格之后是其他合同内容（contractContent字段，存储的是HTML格式的富文本）
+      // 解析合同内容
+      let contractContentHtml = '';
       if (row.contractContent) {
-        // 优化HTML处理，保留p标签作为换行符，将多个p标签单元格合并
         let htmlContent = row.contractContent;
-
-        // 提取所有p标签内容
         const pTagRegex = /<p[^>]*>([\s\S]*?)<\/p>/g;
         let match;
         const pContents = [];
-
         while ((match = pTagRegex.exec(htmlContent)) !== null) {
-          let content = match[1];
-
-          // 移除其他HTML标签
-          content = content.replace(/<[^>]*>/g, '');
-
-          // 处理HTML实体
-          content = content.replace(/&nbsp;/g, ' ');
-          content = content.replace(/&lt;/g, '<');
-          content = content.replace(/&gt;/g, '>');
-          content = content.replace(/&amp;/g, '&');
-          content = content.replace(/&quot;/g, '"');
-          content = content.replace(/&#39;/g, "'");
-
-          // 清理空格和换行
-          content = content.trim();
-
-          // 如果不是以大写汉字数字开头，添加一个中文字符的缩进
+          let content = match[1].replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#39;/g, "'").trim();
           if (content) {
-            // 检查是否以大写汉字数字开头（一、二、三、四、五、六、七、八、九、十）
             const chineseNumberRegex = /^[一二三四五六七八九十]+、/;
-            if (!chineseNumberRegex.test(content)) {
-              content = '　' + content; // 使用全角空格作为中文字符缩进
-            }
-            pContents.push(content);
+            pContents.push(chineseNumberRegex.test(content) ? content : '　' + content);
           }
         }
-
-        // 如果没有提取到p标签内容，尝试提取所有文本内容
         if (pContents.length === 0) {
-          let textContent = htmlContent.replace(/<[^>]*>/g, '');
-          textContent = textContent.replace(/&nbsp;/g, ' ').trim();
+          const textContent = htmlContent.replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').trim();
+          if (textContent) pContents.push(textContent);
+        }
+        if (pContents.length > 0) {
+          contractContentHtml = '<div style="margin-top:8px;font-size:12px;line-height:1.8;">' + pContents.join('<br/>') + '</div>';
+        }
+      }
 
-          // 如果不是以大写汉字数字开头，添加一个中文字符的缩进
-          if (textContent) {
-            // 检查是否以大写汉字数字开头（一、二、三、四、五、六、七、八、九、十）
-            const chineseNumberRegex = /^[一二三四五六七八九十]+、/;
-            if (!chineseNumberRegex.test(textContent)) {
-              textContent = '　' + textContent; // 使用全角空格作为中文字符缩进
+      const totalTax = products.reduce((a, p) => a + (parseFloat(p.taxTotal) || 0), 0);
+      const amountWords = productData.totalAmountInWords || convertToChinese(totalTax) || '零元整';
+
+      const fullHtml = `
+<!DOCTYPE html>
+<html>
+<head><meta charset="utf-8"><title>合同预览</title>
+<style>
+  * { margin: 0; padding: 0; box-sizing: border-box; }
+  body { font-family: 'SimSun','宋体',serif; color: #000; background: #e8e8e8; font-size: 12px; line-height: 1.6; display: flex; flex-direction: column; align-items: center; padding: 20px 0; }
+  .a4-page { width: 794px; min-height: 1123px; padding: 30px 40px; background: #fff; margin-bottom: 20px; box-shadow: 0 2px 12px rgba(0,0,0,0.15); }
+  .company-header { display: flex; align-items: flex-start; justify-content: space-between; margin-bottom: 6px; }
+  .contract-title { text-align: center; font-size: 20px; font-weight: bold; letter-spacing: 6px; margin-bottom: 14px; }
+  .info-row { display: flex; justify-content: space-between; margin-bottom: 4px; font-size: 13px; line-height: 2; }
+  .section-title { font-size: 13px; font-weight: bold; margin-bottom: 4px; margin-top: 8px; }
+  table { width: 100%; border-collapse: collapse; }
+  th, td { border: 1px solid #000; padding: 3px 4px; text-align: center; font-size: 11px; }
+  th { background-color: #f5f5f5; font-weight: bold; }
+  .sign-section { margin-top: 24px; font-size: 12px; line-height: 2.2; }
+  .sign-section .col { width: 48%; }
+  .sign-row { display: flex; justify-content: space-between; }
+</style>
+</head>
+<body>
+  <div class="a4-page" style="position:relative;">
+  <img src="${contractLogo}" style="position:absolute;left:20px;top:20px;height:80px;" crossorigin="anonymous" />
+  <div style="text-align:center;padding-top:10px;">
+    <div style="font-size:20px;font-weight:bold;letter-spacing:2px;">嘉祥科伦普重工有限公司</div>
+  </div>
+  <div style="display:flex;justify-content:center;align-items:baseline;margin:12px 0 8px 0;">
+    <div style="font-size:22px;font-weight:bold;letter-spacing:6px;">产 品 销 售 合 同</div>
+    <div style="font-size:11px;margin-left:40px;">合同编号：${row.contractCode || ''}</div>
+  </div>
+  <div class="info-row">
+    <div style="width:55%;">
+      <div>供方（甲方）：${row.supplier || ''}</div>
+      <div>需方（乙方）：${row.customer || ''}</div>
+    </div>
+    <div style="width:40%;">
+      <div>签订时间：${row.signTime ? this.parseTime(row.signTime, '{y}年{m}月{d}日') : ''}</div>
+      <div>签订地点：${row.signLocation || ''}</div>
+    </div>
+  </div>
+  <div class="section-title">一、产品内容</div>
+  ${productTableHtml}
+  ${contractContentHtml}
+  <div class="sign-section">
+    <div class="sign-row">
+      <div class="col">
+        <div>供方（甲方）：${row.supplier || ''}</div>
+        <div>地址：${row.supplierAddress || ''}</div>
+        <div>电话：${row.supplierPhone || ''}</div>
+        <div>开户行：${row.supplierBank || ''}</div>
+        <div>账号：${row.supplierAccount || ''}</div>
+        <div>税号：${row.supplierTaxNo || ''}</div>
+      </div>
+      <div class="col">
+        <div>需方（乙方）：${row.customer || ''}</div>
+        <div>地址：${row.customerAddress || ''}</div>
+        <div>电话：${row.customerPhone || ''}</div>
+        <div>开户行：${row.customerBank || ''}</div>
+        <div>账号：${row.customerAccount || ''}</div>
+        <div>税号：${row.customerTaxNo || ''}</div>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
+</html>`;
+
+      this.$nextTick(() => {
+        const iframe = this.$refs.previewFrame;
+        if (iframe) {
+          iframe.srcdoc = fullHtml;
+        }
+      });
+    },
+    /** 确认导出PDF */
+    async confirmExport() {
+      const row = this.exportRow;
+      if (!row) return;
+
+      this.exportLoading = true;
+      const loading = this.$loading({
+        lock: true,
+        text: '正在生成PDF，请稍候...',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
+
+      try {
+        let productData = parseProductContent(row.productContent);
+        if (!productData.productName && row.productName) {
+          productData.productName = row.productName;
+        }
+        const products = productData.products && productData.products.length > 0 ? productData.products : [];
+
+        const productTableHtml = this.buildProductTableHtml(productData, products);
+
+        // 解析合同内容
+        let contractContentHtml = '';
+        if (row.contractContent) {
+          let htmlContent = row.contractContent;
+          const pTagRegex = /<p[^>]*>([\s\S]*?)<\/p>/g;
+          let match;
+          const pContents = [];
+          while ((match = pTagRegex.exec(htmlContent)) !== null) {
+            let content = match[1].replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#39;/g, "'").trim();
+            if (content) {
+              const chineseNumberRegex = /^[一二三四五六七八九十]+、/;
+              pContents.push(chineseNumberRegex.test(content) ? content : '　' + content);
             }
-            pContents.push(textContent);
+          }
+          if (pContents.length === 0) {
+            const textContent = htmlContent.replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').trim();
+            if (textContent) pContents.push(textContent);
+          }
+          if (pContents.length > 0) {
+            contractContentHtml = '<div style="margin-top:10px;font-size:12px;line-height:1.8;">' + pContents.join('<br/>') + '</div>';
           }
         }
 
-        // 直接合并单元格并设置内容，避免合并已合并的单元格
-        if (pContents.length > 0) {
-          // 计算需要的行数
-          const contentLines = pContents.reduce((total, content) => {
-            return total + (content.match(/\n/g) || []).length + 1;
-          }, 0);
+        const totalTax = products.reduce((a, p) => a + (parseFloat(p.taxTotal) || 0), 0);
+        const amountWords = productData.totalAmountInWords || convertToChinese(totalTax) || '零元整';
 
-          // 合并单元格
-          const endRow = currentRow + Math.ceil(contentLines / 2); // 估算需要的行数
-          worksheet.mergeCells(`A${currentRow}:H${endRow}`);
+        // 构建完整的合同HTML（794px 宽，适合A4）
+        const contractHtml = `
+          <div id="contract-pdf-content" style="width:794px;padding:30px 40px;font-family:'SimSun','宋体',serif;color:#000;background:#fff;box-sizing:border-box;position:relative;">
+<img src="${contractLogo}" style="position:absolute;left:20px;top:20px;height:80px;" crossorigin="anonymous" />
+            <div style="text-align:center;padding-top:10px;">
+              <div style="font-size:20px;font-weight:bold;letter-spacing:2px;">嘉祥科伦普重工有限公司</div>
+            </div>
+            <div style="display:flex;justify-content:center;align-items:baseline;margin:12px 0 8px 0;">
+              <div style="font-size:22px;font-weight:bold;letter-spacing:6px;">产 品 销 售 合 同</div>
+              <div style="font-size:11px;margin-left:40px;">合同编号：${row.contractCode || ''}</div>
+            </div>
+            <div style="display:flex;justify-content:space-between;margin-bottom:8px;font-size:13px;line-height:2;">
+              <div style="width:55%;">
+                <div>供方（甲方）：${row.supplier || ''}</div>
+                <div>需方（乙方）：${row.customer || ''}</div>
+              </div>
+              <div style="width:40%;text-align:left;">
+                <div>签订时间：${row.signTime ? this.parseTime(row.signTime, '{y}年{m}月{d}日') : ''}</div>
+                <div>签订地点：${row.signLocation || ''}</div>
+              </div>
+            </div>
+            <div style="font-size:13px;font-weight:bold;margin-bottom:5px;">一、产品内容</div>
+            ${productTableHtml}
+            ${contractContentHtml}
+            <div style="margin-top:40px;font-size:12px;line-height:2.2;">
+              <div style="display:flex;justify-content:space-between;">
+                <div style="width:48%;">
+                  <div>供方（甲方）：${row.supplier || ''}</div>
+                  <div>地址：${row.supplierAddress || ''}</div>
+                  <div>电话：${row.supplierPhone || ''}</div>
+                  <div>开户行：${row.supplierBank || ''}</div>
+                  <div>账号：${row.supplierAccount || ''}</div>
+                  <div>税号：${row.supplierTaxNo || ''}</div>
+                </div>
+                <div style="width:48%;">
+                  <div>需方（乙方）：${row.customer || ''}</div>
+                  <div>地址：${row.customerAddress || ''}</div>
+                  <div>电话：${row.customerPhone || ''}</div>
+                  <div>开户行：${row.customerBank || ''}</div>
+                  <div>账号：${row.customerAccount || ''}</div>
+                  <div>税号：${row.customerTaxNo || ''}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        `;
 
-          // 设置合并后单元格的内容和样式
-          const mergedContent = pContents.join('\n');
-          worksheet.getCell(`A${currentRow}`).value = mergedContent;
-          worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'top', wrapText: true };
+        const container = document.createElement('div');
+        container.style.position = 'fixed';
+        container.style.left = '-9999px';
+        container.style.top = '0';
+        container.innerHTML = contractHtml;
+        document.body.appendChild(container);
 
-          // 调整合并后单元格的行高
-          const lineCount = (mergedContent.match(/\n/g) || []).length + 1;
-          const height = Math.max(60, lineCount * 15);
-          worksheet.getRow(currentRow).height = height;
+        const element = document.getElementById('contract-pdf-content');
+        await new Promise(resolve => setTimeout(resolve, 500));
 
-          // 调整currentRow
-          currentRow = endRow + 1;
+        const canvas = await html2canvas(element, {
+          scale: 2,
+          useCORS: true,
+          allowTaint: true,
+          logging: false,
+          backgroundColor: '#ffffff',
+          imageTimeout: 5000
+        });
+
+        document.body.removeChild(container);
+
+        const pdfWidth = 210;
+        const pdfHeight = 297;
+        const imgWidth = pdfWidth;
+        const imgHeight = (canvas.height * pdfWidth) / canvas.width;
+        const pdf = new jsPDF('p', 'mm', 'a4');
+        const imgData = canvas.toDataURL('image/jpeg', 0.95);
+        let heightLeft = imgHeight;
+        let position = 0;
+
+        pdf.addImage(imgData, 'JPEG', 0, position, imgWidth, imgHeight);
+        heightLeft -= pdfHeight;
+
+        while (heightLeft > 0) {
+          position = heightLeft - imgHeight;
+          pdf.addPage();
+          pdf.addImage(imgData, 'JPEG', 0, position, imgWidth, imgHeight);
+          heightLeft -= pdfHeight;
         }
+
+        pdf.save(`合同_${row.contractCode || row.contractName || '未命名'}.pdf`);
+        this.$message.success('PDF导出成功');
+        this.exportDialogVisible = false;
+      } catch (error) {
+        console.error('PDF导出失败:', error);
+        this.$message.error('PDF导出失败，请重试');
+      } finally {
+        loading.close();
+        this.exportLoading = false;
       }
-
-      // 设置合同尾部信息，每一行的前四列与后四列分别合并
-      // 内容参考
-
-      // 设置合同尾部信息，每一行的前四列与后四列分别合并
-      // 内容参考ContractPreview.vue
-      if (currentRow > 0) {
-        // 空行
-        currentRow++;
-
-        // 供方（甲方）信息
-        worksheet.mergeCells(`A${currentRow}:D${currentRow}`);
-        worksheet.getCell(`A${currentRow}`).value = `供方（甲方）：${row.supplier || '嘉祥科伦普重工有限公司'}`;
-        worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-        worksheet.mergeCells(`E${currentRow}:H${currentRow}`);
-        worksheet.getCell(`E${currentRow}`).value = `需方（乙方）：${row.customer || ''}`;
-        worksheet.getCell(`E${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-        currentRow++;
-
-        // 地址信息
-        worksheet.mergeCells(`A${currentRow}:D${currentRow}`);
-        worksheet.getCell(`A${currentRow}`).value = `地址：${row.supplierAddress || ''}`;
-        worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-        worksheet.mergeCells(`E${currentRow}:H${currentRow}`);
-        worksheet.getCell(`E${currentRow}`).value = `地址：${row.customerAddress || ''}`;
-        worksheet.getCell(`E${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-        currentRow++;
-
-        // 电话信息
-        worksheet.mergeCells(`A${currentRow}:D${currentRow}`);
-        worksheet.getCell(`A${currentRow}`).value = `电话：${row.supplierPhone || ''}`;
-        worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-        worksheet.mergeCells(`E${currentRow}:H${currentRow}`);
-        worksheet.getCell(`E${currentRow}`).value = `电话：${row.customerPhone || ''}`;
-        worksheet.getCell(`E${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-        currentRow++;
-
-        // 开户行信息
-        worksheet.mergeCells(`A${currentRow}:D${currentRow}`);
-        worksheet.getCell(`A${currentRow}`).value = `开户行：${row.supplierBank || ''}`;
-        worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-        worksheet.mergeCells(`E${currentRow}:H${currentRow}`);
-        worksheet.getCell(`E${currentRow}`).value = `开户行：${row.customerBank || ''}`;
-        worksheet.getCell(`E${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-        currentRow++;
-
-        // 账号信息
-        worksheet.mergeCells(`A${currentRow}:D${currentRow}`);
-        worksheet.getCell(`A${currentRow}`).value = `账号：${row.supplierAccount || ''}`;
-        worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-        worksheet.mergeCells(`E${currentRow}:H${currentRow}`);
-        worksheet.getCell(`E${currentRow}`).value = `账号：${row.customerAccount || ''}`;
-        worksheet.getCell(`E${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-        currentRow++;
-
-        // 税号信息
-        worksheet.mergeCells(`A${currentRow}:D${currentRow}`);
-        worksheet.getCell(`A${currentRow}`).value = `税号：${row.supplierTaxNo || ''}`;
-        worksheet.getCell(`A${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-
-        worksheet.mergeCells(`E${currentRow}:H${currentRow}`);
-        worksheet.getCell(`E${currentRow}`).value = `税号：${row.customerTaxNo || ''}`;
-        worksheet.getCell(`E${currentRow}`).alignment = { horizontal: 'left', vertical: 'middle' };
-        currentRow++;
-      }
-
-      // 4. 设置行高
-      worksheet.getRow(1).height = 40;
-      worksheet.getRow(2).height = 30;
-      worksheet.getRow(3).height = 20;
-      worksheet.getRow(4).height = 20;
-      worksheet.getRow(5).height = 20;
-      worksheet.getRow(6).height = 20;
-      worksheet.getRow(7).height = 25;
-
-      // 自动调整数据行高
-      for (let i = 8; i <= currentRow; i++) {
-        if (!worksheet.getRow(i).height) {
-          worksheet.getRow(i).height = 20;
-        }
-      }
-
-      // 5. 导出文件
-      const buffer = await workbook.xlsx.writeBuffer();
-      const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-      saveAs(blob, `合同_${row.contractCode || row.contractName || '未命名'}.xlsx`);
     },
   }
 };
diff --git a/klp-ui/src/views/crm/contract/components/ContractPreview.vue b/klp-ui/src/views/crm/contract/components/ContractPreview.vue
index 3c969c86c..6e3a7da1d 100644
--- a/klp-ui/src/views/crm/contract/components/ContractPreview.vue
+++ b/klp-ui/src/views/crm/contract/components/ContractPreview.vue
@@ -3,12 +3,15 @@
     <div v-if="contract" class="preview-content">
       <h3 style="margin-bottom: 20px; color: #303133; display: flex; justify-content: space-between; align-items: center;">
         {{ contract.contractName }}
-        <el-select v-hasPermi="['crm:contract:status']" v-model="contract.status" placeholder="请选择合同状态" style="width: 150px;" @change="handleStatusChange">
-          <el-option label="草稿" :value="0" />
-          <el-option label="已生效" :value="1" />
-          <el-option label="已取消" :value="2" />
-          <el-option label="已结清" :value="3" />
-        </el-select>
+        <span>
+          <el-button type="primary" icon="el-icon-printer" @click="printContract">打印预览</el-button>
+          <el-select v-hasPermi="['crm:contract:status']" v-model="contract.status" placeholder="请选择合同状态" style="width: 150px; margin-left: 10px;" @change="handleStatusChange">
+            <el-option label="草稿" :value="0" />
+            <el-option label="已生效" :value="1" />
+            <el-option label="已取消" :value="2" />
+            <el-option label="已结清" :value="3" />
+          </el-select>
+        </span>
       </h3>
       <el-descriptions :column="2" border>
         <el-descriptions-item label="合同编号">{{ contract.contractCode }}</el-descriptions-item>
@@ -62,6 +65,8 @@
 <script>
 import ProductContent from './ProductContent.vue';
 import OrderDetail from './OrderDetail.vue';
+import { parseProductContent, convertToChinese } from '@/utils/productContent';
+import contractLogo from '@/assets/images/contractLogo.png';
 
 export default {
   name: "ContractPreview",
@@ -104,6 +109,177 @@ export default {
         .replace('{i}', minutes)
         .replace('{s}', seconds);
     },
+    /** 打印预览（A4尺寸，多页支持） */
+    printContract() {
+      const row = this.contract;
+      if (!row) return;
+
+      let productData = parseProductContent(row.productContent);
+      if (!productData.productName && row.productName) {
+        productData.productName = row.productName;
+      }
+      const products = productData.products && productData.products.length > 0 ? productData.products : [];
+      const totalQty = products.reduce((a, p) => a + (parseFloat(p.quantity) || 0), 0);
+      const totalTax = products.reduce((a, p) => a + (parseFloat(p.taxTotal) || 0), 0);
+      const totalNoTax = products.reduce((a, p) => a + (parseFloat(p.noTaxTotal) || 0), 0);
+      const totalTaxAmt = products.reduce((a, p) => a + (parseFloat(p.taxAmount) || 0), 0);
+      const amountWords = productData.totalAmountInWords || convertToChinese(totalTax) || '零元整';
+
+      let productRowsHtml = '';
+      products.forEach((product, index) => {
+        productRowsHtml += `<tr>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${index + 1}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.spec || ''}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.material || ''}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.quantity || ''}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.taxPrice || ''}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${product.taxDivisor || '1.13'}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.noTaxPrice || 0).toFixed(2)}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.taxTotal || 0).toFixed(2)}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.noTaxTotal || 0).toFixed(2)}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;">${(product.taxAmount || 0).toFixed(2)}</td>
+          <td style="border:1px solid #000;padding:3px 4px;text-align:center;max-width:100px;word-wrap:break-word;">${product.remark || ''}</td>
+        </tr>`;
+      });
+
+      let contractContentHtml = '';
+      if (row.contractContent) {
+        let htmlContent = row.contractContent;
+        const pTagRegex = /<p[^>]*>([\s\S]*?)<\/p>/g;
+        let match;
+        const pContents = [];
+        while ((match = pTagRegex.exec(htmlContent)) !== null) {
+          let content = match[1].replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&').replace(/&quot;/g, '"').replace(/&#39;/g, "'").trim();
+          if (content) {
+            const chineseNumberRegex = /^[一二三四五六七八九十]+、/;
+            pContents.push(chineseNumberRegex.test(content) ? content : '　' + content);
+          }
+        }
+        if (pContents.length === 0) {
+          const textContent = htmlContent.replace(/<[^>]*>/g, '').replace(/&nbsp;/g, ' ').trim();
+          if (textContent) pContents.push(textContent);
+        }
+        if (pContents.length > 0) {
+          contractContentHtml = '<div style="margin-top:10px;font-size:12px;line-height:1.8;">' + pContents.join('<br/>') + '</div>';
+        }
+      }
+
+      const printHtml = `<!DOCTYPE html>
+<html>
+<head><meta charset="utf-8"><title>合同打印预览</title>
+<style>
+  @page { size: A4; margin: 15mm; }
+  * { margin: 0; padding: 0; box-sizing: border-box; }
+  body { font-family: 'SimSun','宋体',serif; color: #000; background: #e8e8e8; font-size: 12px; line-height: 1.6; display: flex; flex-direction: column; align-items: center; padding: 20px 0; }
+  .a4-page { width: 794px; min-height: 1123px; padding: 30px 40px; background: #fff; margin-bottom: 20px; box-shadow: 0 2px 12px rgba(0,0,0,0.15); }
+  .company-header { display: flex; align-items: flex-start; justify-content: space-between; margin-bottom: 8px; }
+  .contract-title { text-align: center; font-size: 22px; font-weight: bold; letter-spacing: 6px; margin-bottom: 18px; }
+  .info-row { display: flex; justify-content: space-between; margin-bottom: 6px; font-size: 13px; line-height: 2; }
+  .section-title { font-size: 13px; font-weight: bold; margin-bottom: 4px; margin-top: 10px; }
+  table { width: 100%; border-collapse: collapse; font-size: 11px; }
+  th, td { border: 1px solid #000; padding: 3px 4px; text-align: center; }
+  th { background-color: #f5f5f5; font-weight: bold; }
+  .total-row td { font-weight: bold; }
+  .sign-section { margin-top: 30px; font-size: 12px; line-height: 2.2; }
+  .sign-section .col { width: 48%; }
+  .sign-row { display: flex; justify-content: space-between; }
+  .print-toolbar { position: fixed; top: 0; right: 20px; z-index: 100; display: flex; gap: 8px; padding: 10px; }
+  .print-toolbar button { padding: 8px 20px; border: none; border-radius: 4px; cursor: pointer; font-size: 14px; }
+  .print-toolbar .btn-print { background: #409eff; color: #fff; }
+  .print-toolbar .btn-print:hover { background: #66b1ff; }
+  @media print {
+    body { background: #fff; padding: 0; }
+    .a4-page { width: auto; min-height: auto; padding: 0; margin: 0; box-shadow: none; page-break-after: always; }
+    .print-toolbar { display: none !important; }
+  }
+</style>
+</head>
+<body>
+<div class="print-toolbar"><button class="btn-print" onclick="window.print()">打 印</button></div>
+<div class="a4-page" style="position:relative;">
+  <img src="${contractLogo}" style="position:absolute;left:20px;top:20px;height:80px;" crossorigin="anonymous" />
+  <div style="text-align:center;padding-top:10px;">
+    <div style="font-size:20px;font-weight:bold;letter-spacing:2px;">嘉祥科伦普重工有限公司</div>
+  </div>
+  <div style="display:flex;justify-content:center;align-items:baseline;margin:12px 0 8px 0;">
+    <div style="font-size:22px;font-weight:bold;letter-spacing:6px;">产 品 销 售 合 同</div>
+    <div style="font-size:11px;margin-left:40px;">合同编号：${row.contractCode || ''}</div>
+  </div>
+  <div class="info-row">
+    <div style="width:55%;">
+      <div>供方（甲方）：${row.supplier || ''}</div>
+      <div>需方（乙方）：${row.customer || ''}</div>
+    </div>
+    <div style="width:40%;">
+      <div>签订时间：${row.signTime ? this.parseTime(row.signTime, '{y}年{m}月{d}日') : ''}</div>
+      <div>签订地点：${row.signLocation || ''}</div>
+    </div>
+  </div>
+  <div class="section-title">一、产品内容</div>
+  <table>
+    <tr>
+      <td colspan="4" style="font-weight:bold;text-align:left;">产品名称：${productData.productName || ''}</td>
+      <td colspan="7" style="font-weight:bold;text-align:left;">生产厂家：${row.manufacturer || '嘉祥科伦普重工有限公司'}</td>
+    </tr>
+    <tr>
+      <th style="width:30px;">序号</th>
+      <th style="width:80px;">规格（mm）</th>
+      <th style="width:55px;">材质</th>
+      <th style="width:50px;">数量（吨）</th>
+      <th style="width:70px;">含税单价（元/吨）</th>
+      <th style="width:45px;">税率除数</th>
+      <th style="width:70px;">无税单价（元/吨）</th>
+      <th style="width:70px;">含税总额（元）</th>
+      <th style="width:70px;">无税总额（元）</th>
+      <th style="width:50px;">税额（元）</th>
+      <th style="width:80px;">备注</th>
+    </tr>
+    ${productRowsHtml}
+    <tr class="total-row">
+      <td colspan="4" style="text-align:center;">合&nbsp;&nbsp;计</td>
+      <td>${totalQty.toFixed(2)}</td>
+      <td></td>
+      <td></td>
+      <td>${totalTax.toFixed(2)}</td>
+      <td>${totalNoTax.toFixed(2)}</td>
+      <td>${totalTaxAmt.toFixed(2)}</td>
+      <td></td>
+    </tr>
+    <tr><td colspan="11" style="font-weight:bold;text-align:left;">合计人民币（大写）：${amountWords}</td></tr>
+  </table>
+  ${contractContentHtml}
+  <div class="sign-section">
+    <div class="sign-row">
+      <div class="col">
+        <div>供方（甲方）：${row.supplier || ''}</div>
+        <div>地址：${row.supplierAddress || ''}</div>
+        <div>电话：${row.supplierPhone || ''}</div>
+        <div>开户行：${row.supplierBank || ''}</div>
+        <div>账号：${row.supplierAccount || ''}</div>
+        <div>税号：${row.supplierTaxNo || ''}</div>
+      </div>
+      <div class="col">
+        <div>需方（乙方）：${row.customer || ''}</div>
+        <div>地址：${row.customerAddress || ''}</div>
+        <div>电话：${row.customerPhone || ''}</div>
+        <div>开户行：${row.customerBank || ''}</div>
+        <div>账号：${row.customerAccount || ''}</div>
+        <div>税号：${row.customerTaxNo || ''}</div>
+      </div>
+    </div>
+  </div>
+</div>
+</body>
+</html>`;
+
+      const printWindow = window.open('', '_blank');
+      if (printWindow) {
+        printWindow.document.write(printHtml);
+        printWindow.document.close();
+      } else {
+        this.$message.warning('请允许浏览器弹出新窗口，或手动使用 Ctrl+P 打印');
+      }
+    },
     handleStatusChange(value) {
       this.$emit('updateStatus', value);
     }
diff --git a/klp-ui/src/views/crm/contract/components/ProductContent.vue b/klp-ui/src/views/crm/contract/components/ProductContent.vue
index cd3b11feb..693444bf9 100644
--- a/klp-ui/src/views/crm/contract/components/ProductContent.vue
+++ b/klp-ui/src/views/crm/contract/components/ProductContent.vue
@@ -2,16 +2,16 @@
   <div v-loading="loading">
     <!-- 网格布局实现的表格，共8列 -->
     <div class="product-content">
-      <!-- 第一行合并所有八个单元格，内容为：嘉祥科伦普重工有限公司 -->
+      <!-- 第一行合并所有单元格 -->
       <div class="table-row table-header">
         <div class="table-cell" colspan="3">
           <div class="company-name">产品名称：
-            <el-select v-model="productName" placeholder="请选择产品名称" size="small" :readonly="readonly" filterable allow-create clearable>
+            <el-select style="width: 120px;" v-model="productName" placeholder="请选择产品名称" size="small" :readonly="readonly" filterable allow-create clearable>
               <el-option v-for="item in productOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </div>
         </div>
-        <div class="table-cell" colspan="5">
+        <div class="table-cell" colspan="8">
           <div class="company-name">生产厂家：嘉祥科伦普重工有限公司</div>
         </div>
       </div>
@@ -23,9 +23,11 @@
         <div class="table-cell">材质</div>
         <div class="table-cell">数量（吨）</div>
         <div class="table-cell">含税单价（元/吨）</div>
-        <div class="table-cell" v-if="false">不含税单价（元/吨）</div>
+        <div class="table-cell">税率除数</div>
+        <div class="table-cell">无税单价（元/吨）</div>
         <div class="table-cell">含税总额（元）</div>
-        <div class="table-cell">不含税总额（元）</div>
+        <div class="table-cell">无税总额（元）</div>
+        <div class="table-cell">税额（元）</div>
         <div class="table-cell">
           备注
           <el-button v-if="!readonly" type="primary" size="mini" icon="el-icon-plus" @click="addProduct"
@@ -52,23 +54,32 @@
         </div>
         <div class="table-cell">
           <el-input v-model.number="item.quantity" placeholder="请输入数量" type="number" :readonly="readonly" size="small"
-            @change="calculateTotals" />
+            @change="onQuantityChange(item)" />
         </div>
 
         <div class="table-cell">
           <el-input v-model.number="item.taxPrice" placeholder="请输入含税单价" type="number" :readonly="readonly" size="small"
-            @change="calculateTotals" />
-        </div>
-        <div class="table-cell" v-if="false">
-          <el-input v-model.number="item.noTaxPrice" placeholder="请输入不含税单价" type="number" :readonly="readonly"
-            size="small" @change="calculateTotals" />
+            @change="onTaxPriceChange(item)" />
         </div>
         <div class="table-cell">
-          <el-input v-model.number="item.taxTotal" placeholder="含税总额" type="number" :readonly="true" size="small" />
+          <el-input v-model.number="item.taxDivisor" placeholder="税率除数" type="number" :readonly="readonly"
+            size="small" @change="onTaxDivisorChange(item)" />
         </div>
         <div class="table-cell">
-          <el-input :value="((item.taxTotal || 0) / 1.13).toFixed(2)" placeholder="不含税总额" type="number" :readonly="true"
-            size="small" />
+          <el-input v-model.number="item.noTaxPrice" placeholder="无税单价" type="number" :readonly="readonly"
+            size="small" @change="onNoTaxPriceChange(item)" />
+        </div>
+        <div class="table-cell">
+          <el-input v-model.number="item.taxTotal" placeholder="含税总额" type="number" :readonly="readonly" size="small"
+            @change="onTaxTotalChange(item)" />
+        </div>
+        <div class="table-cell">
+          <el-input v-model.number="item.noTaxTotal" placeholder="无税总额" type="number" :readonly="readonly"
+            size="small" @change="onNoTaxTotalChange(item)" />
+        </div>
+        <div class="table-cell">
+          <el-input v-model.number="item.taxAmount" placeholder="税额" type="number" :readonly="readonly" size="small"
+            @change="onTaxAmountChange(item)" />
         </div>
         <div class="table-cell">
           <el-input v-model="item.remark" placeholder="请输入备注" :readonly="readonly" size="small" />
@@ -78,17 +89,19 @@
       <!-- 合计行 -->
       <div class="table-row table-total-row">
         <div class="table-cell" colspan="3">合计</div>
-        <div class="table-cell">{{ totalQuantity }}</div>
-        <div class="table-cell" v-if="false"></div>
+        <div class="table-cell">{{ totalQuantity.toFixed(2) }}</div>
         <div class="table-cell"></div>
-        <div class="table-cell">{{ totalTaxTotal }}</div>
-        <div class="table-cell">{{ ((totalTaxTotal || 0) / 1.13).toFixed(2) }}</div>
+        <div class="table-cell"></div>
+        <div class="table-cell"></div>
+        <div class="table-cell">{{ totalTaxTotal.toFixed(2) }}</div>
+        <div class="table-cell">{{ totalNoTaxTotal.toFixed(2) }}</div>
+        <div class="table-cell">{{ totalTaxAmount.toFixed(2) }}</div>
         <div class="table-cell"></div>
       </div>
 
       <!-- 合计人民币(大写) -->
       <div class="table-row">
-        <div class="table-cell" colspan="8">
+        <div class="table-cell" colspan="11">
           <span>合计人民币(大写)：</span>
           <span>{{ totalAmountInWords }}</span>
         </div>
@@ -96,7 +109,7 @@
 
       <!-- 备注 -->
       <div class="table-row">
-        <div class="table-cell" colspan="8">
+        <div class="table-cell" colspan="11">
           <span>备注：</span>
           <el-input v-model="remark" type="textarea" placeholder="请输入备注" :readonly="readonly"
             :autosize="{ minRows: 2 }" />
@@ -111,7 +124,7 @@ import {
   parseProductContent,
   calculateTotalQuantity,
   calculateTotalTaxTotal,
-  calculateProductTaxTotal,
+  calculateProductFields,
   convertToChinese
 } from '@/utils/productContent';
 
@@ -151,6 +164,18 @@ export default {
     totalTaxTotal() {
       return calculateTotalTaxTotal(this.products);
     },
+    // 计算总无税总额
+    totalNoTaxTotal() {
+      return this.products.reduce((total, item) => {
+        return total + (parseFloat(item.noTaxTotal) || 0);
+      }, 0);
+    },
+    // 计算总税额
+    totalTaxAmount() {
+      return this.products.reduce((total, item) => {
+        return total + (parseFloat(item.taxAmount) || 0);
+      }, 0);
+    },
     // 计算大写金额
     totalAmountInWords() {
       return convertToChinese(this.totalTaxTotal);
@@ -159,7 +184,7 @@ export default {
     jsonContent() {
       // 只存储非空行
       const nonEmptyProducts = this.products.filter(item => {
-        return item.spec || item.material || item.quantity || item.taxPrice || item.noTaxPrice || item.remark;
+        return item.spec || item.material || item.quantity || item.taxPrice || item.remark;
       });
       const data = {
         products: nonEmptyProducts,
@@ -167,6 +192,8 @@ export default {
         remark: this.remark,
         totalQuantity: this.totalQuantity,
         totalTaxTotal: this.totalTaxTotal,
+        totalNoTaxTotal: this.totalNoTaxTotal,
+        totalTaxAmount: this.totalTaxAmount,
         totalAmountInWords: this.totalAmountInWords
       };
       return JSON.stringify(data, null, 2);
@@ -184,7 +211,9 @@ export default {
     value: {
       handler(newValue) {
         if (!newValue) {
-          this.products = [{}];
+          const defaultItem = { taxDivisor: 1.13 };
+          this.initProduct(defaultItem);
+          this.products = [defaultItem];
           this.remark = '';
           this.productName = '';
           return;
@@ -195,11 +224,26 @@ export default {
     }
   },
   methods: {
+    // 初始化产品的默认字段
+    initProduct(item) {
+      if (item.taxDivisor === undefined || item.taxDivisor === null) {
+        item.taxDivisor = 1.13;
+      }
+      if (item.noTaxPrice === undefined) item.noTaxPrice = 0;
+      if (item.noTaxTotal === undefined) item.noTaxTotal = 0;
+      if (item.taxAmount === undefined) item.taxAmount = 0;
+      if (item.taxTotal === undefined) item.taxTotal = 0;
+    },
     // 解析content字符串
     parseContent(content) {
       try {
         const data = parseProductContent(content);
-        this.products = data.products.length > 0 ? data.products : [{}];
+        const products = data.products.length > 0 ? data.products : [{}];
+        products.forEach(item => {
+          this.initProduct(item);
+          Object.assign(item, calculateProductFields(item, 'quantity'));
+        });
+        this.products = products;
         this.remark = data.remark || '';
         this.productName = data.productName || '';
       } catch (error) {
@@ -208,15 +252,45 @@ export default {
         this.remark = '';
       }
     },
+    // 数量变更
+    onQuantityChange(item) {
+      Object.assign(item, calculateProductFields(item, 'quantity'));
+    },
+    // 含税单价变更
+    onTaxPriceChange(item) {
+      Object.assign(item, calculateProductFields(item, 'taxPrice'));
+    },
+    // 税率除数变更
+    onTaxDivisorChange(item) {
+      Object.assign(item, calculateProductFields(item, 'taxDivisor'));
+    },
+    // 无税单价变更
+    onNoTaxPriceChange(item) {
+      Object.assign(item, calculateProductFields(item, 'noTaxPrice'));
+    },
+    // 含税总额变更
+    onTaxTotalChange(item) {
+      Object.assign(item, calculateProductFields(item, 'taxTotal'));
+    },
+    // 无税总额变更
+    onNoTaxTotalChange(item) {
+      Object.assign(item, calculateProductFields(item, 'noTaxTotal'));
+    },
+    // 税额变更
+    onTaxAmountChange(item) {
+      Object.assign(item, calculateProductFields(item, 'taxAmount'));
+    },
     // 计算金额
     calculateTotals() {
       this.products.forEach(item => {
-        item.taxTotal = calculateProductTaxTotal(item);
+        Object.assign(item, calculateProductFields(item, 'quantity'));
       });
     },
     // 添加产品行
     addProduct() {
-      this.products.push({});
+      const newItem = { taxDivisor: 1.13 };
+      this.initProduct(newItem);
+      this.products.push(newItem);
     },
     // 删除产品行
     removeProduct(index) {
@@ -229,7 +303,9 @@ export default {
   mounted() {
     // 确保至少有一个空行
     if (this.products.length === 0) {
-      this.products.push({});
+      const newItem = { taxDivisor: 1.13 };
+      this.initProduct(newItem);
+      this.products.push(newItem);
     }
   }
 }
@@ -239,7 +315,7 @@ export default {
 .product-content {
   border: 1px solid #e4e7ed;
   border-radius: 4px;
-  overflow: hidden;
+  overflow-x: auto;
 }
 
 .table-header {
@@ -251,11 +327,14 @@ export default {
 .company-name {
   font-size: 16px;
   font-weight: bold;
+  display: flex;
+  align-items: center;
+
 }
 
 .table-row {
   display: grid;
-  grid-template-columns: 80px 150px 120px 100px 160px 120px 140px 1fr;
+  grid-template-columns: 45px 100px 90px 75px 100px 90px 100px 110px 110px 110px 1fr;
   border-bottom: 1px solid #e4e7ed;
 }
 
@@ -300,6 +379,10 @@ export default {
   grid-column: span 9;
 }
 
+.table-cell[colspan="11"] {
+  grid-column: span 11;
+}
+
 .serial-number {
   position: relative;
   display: inline-flex;
@@ -318,4 +401,14 @@ export default {
 .el-input {
   width: 100%;
 }
+
+/* 隐藏 number 输入框的上下箭头 */
+.el-input /deep/ input[type="number"]::-webkit-outer-spin-button,
+.el-input /deep/ input[type="number"]::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.el-input /deep/ input[type="number"] {
+  -moz-appearance: textfield;
+}
 </style>
\ No newline at end of file
diff --git a/klp-ui/src/views/mes/eqp/check/index.vue b/klp-ui/src/views/mes/eqp/check/index.vue
index 2cc499ed1..5af4e3b16 100644
--- a/klp-ui/src/views/mes/eqp/check/index.vue
+++ b/klp-ui/src/views/mes/eqp/check/index.vue
@@ -50,6 +50,7 @@
                 <div class="part-card-meta">
                   <span>{{ item.productionLine }}</span>
                   <template v-if="item.lineSection"> / {{ item.lineSection }}</template>
+                  <template v-if="item.responsiblePerson"> | <span class="part-card-person">负责人：{{ item.responsiblePerson }}</span></template>
                   <template v-if="item.remark"> | {{ item.remark }}</template>
                 </div>
               </div>
@@ -133,7 +134,7 @@
     <el-dialog :title="partTitle" :visible.sync="partOpen" width="500px" append-to-body>
       <el-form ref="partForm" :model="partForm" :rules="partRules" label-width="80px">
         <el-form-item label="产线" prop="productionLine">
-          <el-select v-model="partForm.lineId" placeholder="请选择产线" style="width: 100%;">
+          <el-select v-model="partForm.productionLine" placeholder="请选择产线" style="width: 100%;">
             <el-option v-for="item in lineList" :key="item.lineId" :label="item.lineName" :value="item.lineId" />
           </el-select>
         </el-form-item>
@@ -700,6 +701,11 @@ export default {
   text-overflow: ellipsis;
 }
 
+.part-card-person {
+  color: #409eff;
+  font-weight: 600;
+}
+
 .part-card-actions {
   flex-shrink: 0;
   margin-left: 4px;
diff --git a/klp-ui/src/views/mes/eqp/check/person.vue b/klp-ui/src/views/mes/eqp/check/person.vue
new file mode 100644
index 000000000..76b11bc4d
--- /dev/null
+++ b/klp-ui/src/views/mes/eqp/check/person.vue
@@ -0,0 +1,711 @@
+<template>
+  <div class="app-container">
+    <el-radio-group v-model="sharedQueryParams.responsiblePerson" @change="handleQuery" size="small" style="margin-bottom: 10px;">
+      <el-radio-button v-for="person in personList" :key="person" :label="person">{{ person }}</el-radio-button>
+    </el-radio-group>
+
+    <DragResizePanel direction="horizontal" :initialSize="500" :minSize="350"
+      style="height: calc(100vh - 164px); margin-top: 10px;">
+      <template #panelA>
+        <div style="height: 100%; padding: 0 10px; display: flex; flex-direction: column;">
+          <el-form :model="partQueryParams" size="small" :inline="true" label-width="80px">
+            <el-form-item label="巡检部位" prop="inspectPart">
+              <el-input v-model="partQueryParams.inspectPart" placeholder="请输入巡检部位" clearable
+                @keyup.enter.native="handlePartQuery" />
+            </el-form-item>
+            <el-form-item label="产线" prop="productionLine">
+              <el-input v-model="sharedQueryParams.productionLine" placeholder="请输入产线" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="产线段" prop="lineSection">
+              <el-input v-model="sharedQueryParams.lineSection" placeholder="请输入产线段" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handlePartQuery">搜索</el-button>
+            </el-form-item>
+          </el-form>
+
+          <el-row :gutter="10" class="mb8">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handlePartAdd">新增</el-button>
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="partSingle"
+              @click="handlePartUpdate">修改</el-button>
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="partMultiple"
+              @click="handlePartDelete">删除</el-button>
+          </el-row>
+
+          <div v-loading="partLoading" style="flex: 1; overflow-y: auto; overflow-x: hidden;">
+            <div v-for="item in equipmentPartList" :key="item.partId" class="part-card"
+              :class="{ 'part-card-selected': isCurrentPart(item) }" @click="handlePartRowClick(item)">
+              <el-checkbox :value="!!partCheckedMap[item.partId]" @click.stop @change="togglePartSelect(item)"
+                class="part-checkbox" />
+              <div class="part-card-body">
+                <div class="part-card-name">
+                  <pre>{{ item.inspectPart }}</pre>
+                </div>
+                <div class="part-card-meta">
+                  <span>{{ item.productionLine }}</span>
+                  <template v-if="item.lineSection"> / {{ item.lineSection }}</template>
+                  <template v-if="item.responsiblePerson"> | <span class="part-card-person">负责人：{{ item.responsiblePerson }}</span></template>
+                  <template v-if="item.remark"> | {{ item.remark }}</template>
+                </div>
+              </div>
+              <div class="part-card-actions" @click.stop>
+                <el-button size="mini" type="text" icon="el-icon-document-copy" @click="handlePartCopy(item)" />
+                <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAddChecklistForPart(item)" />
+                <el-button size="mini" type="text" icon="el-icon-full-screen" @click="handleShowQRCode(item)" />
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handlePartUpdate(item)" />
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handlePartDelete(item)" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+      <template #panelB>
+        <div style="height: 100%; padding: 0 10px; display: flex; flex-direction: column; overflow: hidden;">
+          <el-form :model="checklistQueryParams" ref="checklistQueryForm" size="small" :inline="true"
+            label-width="80px">
+            <el-form-item label="检验编号" prop="checkNo">
+              <el-input v-model="checklistQueryParams.checkNo" placeholder="请输入检验编号" clearable
+                @keyup.enter.native="handleChecklistQuery" />
+            </el-form-item>
+            <el-form-item label="检验部位" prop="partId">
+              <el-select v-model="checklistQueryParams.partId" placeholder="请选择检验部位" clearable size="mini"
+                @change="handleChecklistQuery" style="width: 150px;">
+                <el-option v-for="item in equipmentPartList" :key="item.partId" :label="item.inspectPart"
+                  :value="item.partId" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设备状态" prop="equipmentState">
+              <el-select v-model="checklistQueryParams.equipmentState" placeholder="请选择设备状态" clearable
+                @change="handleChecklistQuery" style="width: 150px;">
+                <el-option label="运行" value="运行" />
+                <el-option label="停止" value="停止" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="检验标准" prop="checkStandard">
+              <el-input v-model="checklistQueryParams.checkStandard" placeholder="请输入检验标准" clearable
+                @keyup.enter.native="handleChecklistQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleChecklistQuery">搜索</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleChecklistAdd">新增</el-button>
+              <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="checklistSingle"
+                @click="handleChecklistUpdate">修改</el-button>
+              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="checklistMultiple"
+                @click="handleChecklistDelete">删除</el-button>
+            </el-form-item>
+          </el-form>
+
+          <div v-loading="checklistLoading" style="flex: 1; overflow: hidden;">
+            <el-table :data="equipmentChecklistList" height="calc(100% - 20px)"
+              @selection-change="handleChecklistSelectionChange">
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column label="检验编号" align="center" prop="checkNo" />
+              <el-table-column label="设备部件名称" align="center" prop="partName" width="120" />
+              <el-table-column label="检验内容" align="center" prop="checkContent" show-overflow-tooltip />
+              <el-table-column label="设备状态" align="center" prop="equipmentState" />
+              <el-table-column label="检验标准" align="center" prop="checkStandard" show-overflow-tooltip />
+              <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="text" icon="el-icon-document-copy"
+                    @click.stop="handleChecklistCopy(scope.row)">
+                  </el-button>
+                  <el-button size="mini" type="text" icon="el-icon-edit"
+                    @click.stop="handleChecklistUpdate(scope.row)"></el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete"
+                    @click.stop="handleChecklistDelete(scope.row)"></el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </template>
+    </DragResizePanel>
+
+    <el-dialog :title="partTitle" :visible.sync="partOpen" width="500px" append-to-body>
+      <el-form ref="partForm" :model="partForm" :rules="partRules" label-width="80px">
+        <el-form-item label="产线" prop="productionLine">
+          <el-select v-model="partForm.lineId" placeholder="请选择产线" style="width: 100%;">
+            <el-option v-for="item in lineList" :key="item.lineId" :label="item.lineName" :value="item.lineId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产线段" prop="lineSection">
+          <el-input v-model="partForm.lineSection" placeholder="请输入产线段" />
+        </el-form-item>
+        <el-form-item label="巡检部位" prop="inspectPart">
+          <el-input v-model="partForm.inspectPart" placeholder="请输入巡检部位" />
+        </el-form-item>
+        <el-form-item label="负责人" prop="responsiblePerson">
+          <el-input v-model="partForm.responsiblePerson" placeholder="请输入负责人" clearable />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="partForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="partButtonLoading" type="primary" @click="submitPartForm">确 定</el-button>
+        <el-button @click="cancelPart">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="qrCodeTitle" :visible.sync="qrCodeOpen" width="360px" append-to-body>
+      <div ref="qrCodeWrapper" style="display: flex; flex-direction: column; align-items: center; padding: 10px 0;">
+        <QRCode ref="qrCodeRef" :content="qrCodeContent" :size="200" :text="qrCodeText" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="qrCodeLoading" type="primary" @click="saveQRCodeImage">保存图片</el-button>
+        <el-button :loading="qrCodeLoading" type="primary" @click="printQRCode">打印</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="checklistTitle" :visible.sync="checklistOpen" width="500px" append-to-body>
+      <el-form ref="checklistForm" :model="checklistForm" :rules="checklistRules" label-width="80px">
+        <el-form-item label="检验编号" prop="checkNo">
+          <el-input v-model="checklistForm.checkNo" placeholder="请输入检验编号" />
+        </el-form-item>
+        <el-form-item label="检验部位" prop="partId">
+          <el-select v-model="checklistForm.partId" placeholder="请选择检验部位" clearable style="width: 100%;">
+            <el-option v-for="item in equipmentPartList" :key="item.partId" :label="item.inspectPart"
+              :value="item.partId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检验内容">
+          <el-input v-model="checklistForm.checkContent" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="设备状态" prop="equipmentState">
+          <el-select v-model="checklistForm.equipmentState" placeholder="请选择设备状态" clearable style="width: 100%;">
+            <el-option label="运行" value="运行" />
+            <el-option label="停止" value="停止" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检验标准" prop="checkStandard">
+          <el-input v-model="checklistForm.checkStandard" type="textarea" placeholder="请输入检验标准" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="checklistForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="checklistButtonLoading" type="primary" @click="submitChecklistForm">确 定</el-button>
+        <el-button @click="cancelChecklist">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import DragResizePanel from "@/components/DragResizePanel";
+import QRCode from "@/components/QRCode";
+import domToImage from 'dom-to-image';
+import html2canvas from 'html2canvas';
+import { PDFDocument } from 'pdf-lib';
+import { listEquipmentPart, getEquipmentPart, delEquipmentPart, addEquipmentPart, updateEquipmentPart } from "@/api/mes/eqp/equipmentPart";
+import { listEquipmentChecklist, getEquipmentChecklist, delEquipmentChecklist, addEquipmentChecklist, updateEquipmentChecklist } from "@/api/mes/eqp/equipmentChecklist";
+import { listProductionLine } from '@/api/wms/productionLine'
+
+export default {
+  name: "EquipmentPartByPerson",
+  components: { DragResizePanel, QRCode },
+  data() {
+    return {
+      showSearch: true,
+
+      // Shared query params (responsiblePerson is primary, others optional)
+      sharedQueryParams: {
+        responsiblePerson: undefined,
+        productionLine: undefined,
+        lineSection: undefined
+      },
+      personList: [],
+      lineList: [],
+
+      // Part (left side)
+      partLoading: false,
+      partButtonLoading: false,
+      partIds: [],
+      partSingle: true,
+      partMultiple: true,
+      partTotal: 0,
+      equipmentPartList: [],
+      partTitle: "",
+      partOpen: false,
+      partQueryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        inspectPart: undefined,
+      },
+      partCheckedMap: {},
+      partForm: {},
+      partRules: {
+        inspectPart: [
+          { required: true, message: "巡检部位不能为空", trigger: "blur" }
+        ],
+        productionLine: [
+          { required: true, message: "产线不能为空", trigger: "blur" }
+        ],
+        lineSection: [
+          { required: true, message: "产线段不能为空", trigger: "blur" }
+        ]
+      },
+
+      // Checklist (right side)
+      checklistLoading: false,
+      checklistButtonLoading: false,
+      checklistIds: [],
+      checklistSingle: true,
+      checklistMultiple: true,
+      checklistTotal: 0,
+      equipmentChecklistList: [],
+      checklistTitle: "",
+      checklistOpen: false,
+      checklistQueryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        checkNo: undefined,
+        partId: undefined,
+        partName: undefined,
+        equipmentState: undefined,
+        checkStandard: undefined,
+        responsiblePerson: undefined
+      },
+      checklistForm: {},
+      checklistRules: {},
+      currentPart: {},
+
+      // QR Code
+      qrCodeOpen: false,
+      qrCodeTitle: '',
+      qrCodeContent: '',
+      qrCodeText: '',
+      qrCodeLoading: false,
+    };
+  },
+  computed: {
+    currentPartId() {
+      return this.currentPart?.partId || "";
+    },
+  },
+  created() {
+    this.loadInitData();
+  },
+  methods: {
+    async loadInitData() {
+      try {
+        const res = await listProductionLine({ pageSize: 999 });
+        if (res.rows) this.lineList = res.rows;
+      } catch (e) { console.error('加载产线列表失败', e); }
+      await this.loadPersonList();
+    },
+    async loadPersonList() {
+      try {
+        const res = await listEquipmentPart({ pageSize: 9999 });
+        if (res.rows) {
+          const persons = [...new Set(res.rows.map(item => item.responsiblePerson).filter(Boolean))];
+          this.personList = persons.sort();
+          if (this.personList.length > 0 && !this.sharedQueryParams.responsiblePerson) {
+            this.sharedQueryParams.responsiblePerson = this.personList[0];
+          }
+        }
+        if (this.sharedQueryParams.responsiblePerson) {
+          this.getPartList();
+          this.getChecklistList();
+        }
+      } catch (e) { console.error('加载负责人列表失败', e); }
+    },
+    applySharedParams() {
+      this.partQueryParams.responsiblePerson = this.sharedQueryParams.responsiblePerson;
+      this.partQueryParams.productionLine = this.sharedQueryParams.productionLine;
+      this.partQueryParams.lineSection = this.sharedQueryParams.lineSection;
+      this.checklistQueryParams.responsiblePerson = this.sharedQueryParams.responsiblePerson;
+      this.checklistQueryParams.productionLine = this.sharedQueryParams.productionLine;
+      this.checklistQueryParams.lineSection = this.sharedQueryParams.lineSection;
+    },
+    handleQuery() {
+      this.partQueryParams.pageNum = 1;
+      this.checklistQueryParams.pageNum = 1;
+      this.applySharedParams();
+      this.getPartList(true);
+    },
+
+    // ========== Part (Left) ==========
+    getPartList(splitChild = false) {
+      this.partLoading = true;
+      this.applySharedParams();
+      const params = {
+        ...this.partQueryParams,
+        productionLine: this.sharedQueryParams.productionLine,
+        lineSection: this.sharedQueryParams.lineSection,
+      };
+      listEquipmentPart(params).then(response => {
+        this.equipmentPartList = response.rows;
+        if (splitChild) {
+          this.checklistLoading = true;
+          this.equipmentChecklistList = this.equipmentPartList.flatMap(item => item.checklistList || []);
+          this.checklistLoading = false;
+        }
+        this.partTotal = response.total;
+        this.partLoading = false;
+      });
+    },
+    handlePartQuery() {
+      this.partQueryParams.pageNum = 1;
+      this.getPartList();
+    },
+    isCurrentPart(item) {
+      return this.currentPart && this.currentPart.partId === item.partId;
+    },
+    togglePartSelect(item) {
+      const checked = !this.partCheckedMap[item.partId];
+      this.$set(this.partCheckedMap, item.partId, checked);
+      this.updatePartSelection();
+    },
+    updatePartSelection() {
+      const selected = this.equipmentPartList.filter(item => this.partCheckedMap[item.partId]);
+      this.partIds = selected.map(item => item.partId);
+      this.partSingle = selected.length !== 1;
+      this.partMultiple = !selected.length;
+    },
+    handlePartRowClick(row) {
+      this.checklistQueryParams.partId = row.partId;
+      this.checklistQueryParams.pageNum = 1;
+      this.currentPart = row;
+      this.getChecklistList();
+    },
+    resetPartForm() {
+      this.partForm = {
+        partId: undefined,
+        inspectPart: undefined,
+        remark: undefined,
+        lineId: undefined,
+        productionLine: undefined,
+        lineSection: undefined,
+        responsiblePerson: undefined
+      };
+      this.resetForm("partForm");
+    },
+    cancelPart() {
+      this.partOpen = false;
+      this.resetPartForm();
+    },
+    handlePartAdd() {
+      this.resetPartForm();
+      if (this.sharedQueryParams.responsiblePerson) {
+        this.partForm.responsiblePerson = this.sharedQueryParams.responsiblePerson;
+      }
+      this.partOpen = true;
+      this.partTitle = "添加检验部位";
+    },
+    handlePartUpdate(row) {
+      this.partLoading = true;
+      this.resetPartForm();
+      const partId = row.partId || this.partIds;
+      getEquipmentPart(partId).then(response => {
+        this.partLoading = false;
+        this.partForm = response.data;
+        if (this.partForm.productionLine && this.lineList.length) {
+          const line = this.lineList.find(l => l.lineName === this.partForm.productionLine);
+          if (line) this.$set(this.partForm, 'lineId', line.lineId);
+        }
+        this.partOpen = true;
+        this.partTitle = "修改检验部位";
+      });
+    },
+    submitPartForm() {
+      this.$refs["partForm"].validate(valid => {
+        if (valid) {
+          this.partButtonLoading = true;
+          if (this.partForm.lineId) {
+            const line = this.lineList.find(l => l.lineId === this.partForm.lineId);
+            if (line) this.partForm.productionLine = line.lineName;
+          }
+          if (this.partForm.partId != null) {
+            updateEquipmentPart(this.partForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.partOpen = false;
+              this.getPartList();
+              this.loadPersonList();
+            }).finally(() => {
+              this.partButtonLoading = false;
+            });
+          } else {
+            addEquipmentPart(this.partForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.partOpen = false;
+              this.getPartList();
+              this.loadPersonList();
+            }).finally(() => {
+              this.partButtonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    handlePartDelete(row) {
+      const partIds = row.partId || this.partIds;
+      this.$modal.confirm('是否确认删除检验部位编号为"' + partIds + '"的数据项？').then(() => {
+        this.partLoading = true;
+        return delEquipmentPart(partIds);
+      }).then(() => {
+        this.partLoading = false;
+        this.getPartList();
+        this.loadPersonList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { }).finally(() => {
+        this.partLoading = false;
+      });
+    },
+    handlePartCopy(row) {
+      this.partLoading = true;
+      this.resetPartForm();
+      getEquipmentPart(row.partId).then(response => {
+        this.partLoading = false;
+        this.partForm = response.data;
+        this.partForm.partId = undefined;
+        this.partOpen = true;
+        this.partTitle = "复制新增检验部位";
+      });
+    },
+    handleAddChecklistForPart(row) {
+      this.resetChecklistForm();
+      this.checklistForm.partId = row.partId;
+      this.checklistOpen = true;
+      this.checklistTitle = "添加设备检验清单";
+    },
+    handleShowQRCode(row) {
+      this.qrCodeContent = `eqpPart::${row.partId}`;
+      this.qrCodeText = row.inspectPart;
+      this.qrCodeTitle = `二维码 - ${row.inspectPart}`;
+      this.qrCodeOpen = true;
+    },
+    async saveQRCodeImage() {
+      const el = this.$refs.qrCodeWrapper;
+      if (!el) return;
+      this.qrCodeLoading = true;
+      try {
+        const dataUrl = await domToImage.toPng(el);
+        const link = document.createElement('a');
+        link.href = dataUrl;
+        link.download = `二维码_${this.qrCodeText}_${new Date().getTime()}.png`;
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+        this.$modal.msgSuccess('图片保存成功');
+      } catch (error) {
+        console.error('保存二维码图片失败:', error);
+        this.$modal.msgError('保存图片失败');
+      } finally {
+        this.qrCodeLoading = false;
+      }
+    },
+    async printQRCode() {
+      const el = this.$refs.qrCodeWrapper;
+      if (!el) return;
+      this.qrCodeLoading = true;
+      try {
+        const canvas = await html2canvas(el, {
+          backgroundColor: '#ffffff',
+          scale: 3,
+          useCORS: true,
+        });
+        const mmToPt = 72 / 25.4;
+        const sizeMm = 100;
+        const sizePt = sizeMm * mmToPt;
+        const pdfDoc = await PDFDocument.create();
+        const imgPng = await pdfDoc.embedPng(canvas.toDataURL('image/png'));
+        const page = pdfDoc.addPage([sizePt, sizePt]);
+        const imgDims = imgPng.scale(1);
+        const scale = Math.min(sizePt / imgDims.width, sizePt / imgDims.height);
+        const dw = imgDims.width * scale;
+        const dh = imgDims.height * scale;
+        page.drawImage(imgPng, {
+          x: (sizePt - dw) / 2,
+          y: (sizePt - dh) / 2,
+          width: dw,
+          height: dh,
+        });
+        const pdfBytes = await pdfDoc.save();
+        const blob = new Blob([pdfBytes], { type: 'application/pdf' });
+        const url = URL.createObjectURL(blob);
+        window.open(url, '_blank');
+      } catch (error) {
+        console.error('打印二维码失败:', error);
+        this.$modal.msgError('打印失败');
+      } finally {
+        this.qrCodeLoading = false;
+      }
+    },
+
+    // ========== Checklist (Right) ==========
+    getChecklistList() {
+      this.checklistLoading = true;
+      this.applySharedParams();
+      listEquipmentChecklist(this.checklistQueryParams).then(response => {
+        this.equipmentChecklistList = response.rows;
+        this.checklistTotal = response.total;
+        this.checklistLoading = false;
+      });
+    },
+    handleChecklistQuery() {
+      this.checklistQueryParams.pageNum = 1;
+      this.getChecklistList();
+    },
+    handleChecklistSelectionChange(selection) {
+      this.checklistIds = selection.map(item => item.checkId);
+      this.checklistSingle = selection.length !== 1;
+      this.checklistMultiple = !selection.length;
+    },
+    resetChecklistForm() {
+      this.checklistForm = {
+        checkId: undefined,
+        checkNo: undefined,
+        partId: undefined,
+        partName: undefined,
+        checkContent: undefined,
+        equipmentState: undefined,
+        checkStandard: undefined,
+        responsiblePerson: undefined,
+        remark: undefined
+      };
+      this.resetForm("checklistForm");
+    },
+    cancelChecklist() {
+      this.checklistOpen = false;
+      this.resetChecklistForm();
+    },
+    handleChecklistAdd() {
+      this.resetChecklistForm();
+      if (this.currentPart?.partId) {
+        this.checklistForm.partId = this.currentPart.partId;
+      }
+      this.checklistOpen = true;
+      this.checklistTitle = "添加设备检验清单";
+    },
+    handleChecklistCopy(row) {
+      this.checklistLoading = true;
+      this.resetChecklistForm();
+      getEquipmentChecklist(row.checkId).then(response => {
+        this.checklistLoading = false;
+        this.checklistForm = response.data;
+        this.checklistForm.checkId = undefined;
+        this.checklistOpen = true;
+        this.checklistTitle = "复制新增设备检验清单";
+      });
+    },
+    handleChecklistUpdate(row) {
+      this.checklistLoading = true;
+      this.resetChecklistForm();
+      const checkId = row.checkId || this.checklistIds;
+      getEquipmentChecklist(checkId).then(response => {
+        this.checklistLoading = false;
+        this.checklistForm = response.data;
+        this.checklistOpen = true;
+        this.checklistTitle = "修改设备检验清单";
+      });
+    },
+    submitChecklistForm() {
+      this.$refs["checklistForm"].validate(valid => {
+        if (valid) {
+          this.checklistButtonLoading = true;
+          if (this.checklistForm.checkId != null) {
+            updateEquipmentChecklist(this.checklistForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.checklistOpen = false;
+              this.getChecklistList();
+            }).finally(() => {
+              this.checklistButtonLoading = false;
+            });
+          } else {
+            addEquipmentChecklist(this.checklistForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.checklistOpen = false;
+              this.getChecklistList();
+            }).finally(() => {
+              this.checklistButtonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    handleChecklistDelete(row) {
+      const checkIds = row.checkId || this.checklistIds;
+      this.$modal.confirm('是否确认删除设备检验清单编号为"' + checkIds + '"的数据项？').then(() => {
+        this.checklistLoading = true;
+        return delEquipmentChecklist(checkIds);
+      }).then(() => {
+        this.checklistLoading = false;
+        this.getChecklistList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { }).finally(() => {
+        this.checklistLoading = false;
+      });
+    },
+  }
+};
+</script>
+
+<style scoped>
+.part-card {
+  display: flex;
+  align-items: center;
+  padding: 6px 8px;
+  margin-bottom: 2px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: background-color 0.2s;
+  border-left: 3px solid transparent;
+}
+
+.part-card:hover {
+  background-color: #f5f7fa;
+}
+
+.part-card-selected {
+  background-color: #ecf5ff;
+  border-left-color: #409eff;
+}
+
+.part-checkbox {
+  margin-right: 8px;
+  flex-shrink: 0;
+}
+
+.part-card-body {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+}
+
+.part-card-name {
+  font-size: 13px;
+  font-weight: 500;
+  color: #303133;
+  line-height: 1.4;
+}
+
+.part-card-meta {
+  font-size: 11px;
+  color: #909399;
+  line-height: 1.3;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.part-card-person {
+  color: #409eff;
+  font-weight: 600;
+}
+
+.part-card-actions {
+  flex-shrink: 0;
+  margin-left: 4px;
+  white-space: nowrap;
+}
+
+.part-card-actions .el-button {
+  padding: 2px 3px;
+  font-size: 13px;
+}
+</style>
diff --git a/klp-ui/src/views/mes/qc/certificate/book.vue b/klp-ui/src/views/mes/qc/certificate/book.vue
index c99f3877e..c84e39381 100644
--- a/klp-ui/src/views/mes/qc/certificate/book.vue
+++ b/klp-ui/src/views/mes/qc/certificate/book.vue
@@ -207,7 +207,8 @@
           :visible="true"
           :preview="true"
           :certificate="previewData" 
-          :items="previewItems" 
+          :items="previewItems"
+          :template-type="selectedTemplateType"
         />
       </div>
       <div slot="footer" class="dialog-footer">
@@ -222,8 +223,27 @@
       v-show="false"
       ref="hiddenPrintComponent"
       :certificate="printCertificateData" 
-      :items="printItemsData" 
+      :items="printItemsData"
+      :template-type="selectedTemplateType"
     />
+
+    <!-- 模板选择对话框 -->
+    <el-dialog title="选择质保书模板" :visible.sync="templateDialogVisible" width="500px" append-to-body>
+      <div class="template-selection">
+        <el-radio-group v-model="selectedTemplateType" class="template-radio-group">
+          <el-radio v-for="option in templateOptions" :key="option.value" :label="option.value" class="template-radio">
+            <div class="template-option">
+              <i class="el-icon-document"></i>
+              <span>{{ option.label }}</span>
+            </div>
+          </el-radio>
+        </el-radio-group>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmTemplate">确 定</el-button>
+        <el-button @click="templateDialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -231,6 +251,7 @@
 import { listCertificate, getCertificate, delCertificate, addCertificate, updateCertificate } from "@/api/mes/qc/certificate";
 import { listCertificateItem } from "@/api/mes/qc/certificateItem";
 import CertificatePrintPreview from "./components/CertificatePrintPreview.vue";
+import { templateOptions } from "./components/templates";
 import { print as printPdf, downloadPdf } from "./lib/printUtils";
 
 export default {
@@ -240,6 +261,7 @@ export default {
   },
   data() {
     return {
+      templateOptions,
       buttonLoading: false,
       loading: true,
       ids: [],
@@ -258,6 +280,10 @@ export default {
       printComponentVisible: false,
       printCertificateData: {},
       printItemsData: [],
+      templateDialogVisible: false,
+      selectedTemplateType: 'chromium',
+      templateActionType: 'print',
+      templateDialogResolve: null,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -449,6 +475,10 @@ export default {
     },
     /** 预览按钮操作 */
     async handlePreview(row) {
+      this.templateActionType = 'preview';
+      const confirmed = await this.showTemplateDialog();
+      if (!confirmed) return;
+      
       const certificateId = row.certificateId;
       this.loading = true;
       try {
@@ -468,6 +498,10 @@ export default {
     },
     /** 打印按钮操作 */
     async handlePrint(row) {
+      this.templateActionType = 'print';
+      const confirmed = await this.showTemplateDialog();
+      if (!confirmed) return;
+      
       const certificateId = row.certificateId;
       await this.preparePrintComponent(certificateId);
       await this.$nextTick();
@@ -517,6 +551,19 @@ export default {
       } finally {
         this.loading = false;
       }
+    },
+    showTemplateDialog() {
+      return new Promise((resolve) => {
+        this.templateDialogResolve = resolve;
+        this.templateDialogVisible = true;
+      });
+    },
+    confirmTemplate() {
+      this.templateDialogVisible = false;
+      if (this.templateDialogResolve) {
+        this.templateDialogResolve(true);
+        this.templateDialogResolve = null;
+      }
     }
   }
 };
@@ -538,4 +585,46 @@ export default {
   color: #1f79b9;
   font-weight: 500;
 }
+
+.template-selection {
+  padding: 20px;
+}
+
+.template-radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+}
+
+.template-radio {
+  display: flex;
+  align-items: center;
+  margin: 0;
+  padding: 15px;
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  transition: all 0.3s ease;
+}
+
+.template-radio:hover {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.template-radio.is-checked {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.template-option {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+}
+
+.template-option i {
+  font-size: 20px;
+  color: #409eff;
+}
 </style>
diff --git a/klp-ui/src/views/mes/qc/certificate/chemistry.vue b/klp-ui/src/views/mes/qc/certificate/chemistry.vue
index bb9f64561..da541bdb5 100644
--- a/klp-ui/src/views/mes/qc/certificate/chemistry.vue
+++ b/klp-ui/src/views/mes/qc/certificate/chemistry.vue
@@ -90,6 +90,14 @@
       <el-table-column label="磷(%)" align="center" prop="p" />
       <el-table-column label="硫(%)" align="center" prop="s" />
       <el-table-column label="酸溶铝(%)" align="center" prop="als" />
+      <el-table-column label="铝(%)" align="center" prop="al" />
+      <el-table-column label="钛(%)" align="center" prop="ti" />
+      <el-table-column label="铬(%)" align="center" prop="cr" />
+      <el-table-column label="镍(%)" align="center" prop="ni" />
+      <el-table-column label="铜(%)" align="center" prop="cu" />
+      <el-table-column label="氮(%)" align="center" prop="n" />
+      <el-table-column label="铁(%)" align="center" prop="fe" />
+      <el-table-column label="硼(%)" align="center" prop="b" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -124,11 +132,22 @@
           <el-autocomplete
             v-model="form.coilNo"
             :fetch-suggestions="queryCoilNo"
-            placeholder="请输入入场钢卷号（输入2个字符以上自动搜索）"
+            placeholder="输入入场钢卷号搜索"
             :loading="coilNoLoading"
             :trigger-on-focus="false"
             clearable
           />
+          <el-autocomplete
+            v-model="tempSupplierCoilNo"
+            :fetch-suggestions="querySupplierCoilNo"
+            placeholder="或输入厂家卷号自动匹配"
+            :loading="supplierCoilNoLoading"
+            :trigger-on-focus="false"
+            clearable
+            size="small"
+            @select="handleSelectSupplierCoilNo"
+            style="margin-top: 6px;"
+          />
         </el-form-item>
         <el-form-item label="炉号" prop="heatNo">
           <el-input v-model="form.heatNo" placeholder="请输入炉号" />
@@ -151,6 +170,30 @@
         <el-form-item label="酸溶铝(%)" prop="als">
           <el-input v-model="form.als" placeholder="请输入酸溶铝(%)" />
         </el-form-item>
+        <el-form-item label="铝(%)" prop="al">
+          <el-input v-model="form.al" placeholder="请输入铝(%)" />
+        </el-form-item>
+        <el-form-item label="钛(%)" prop="ti">
+          <el-input v-model="form.ti" placeholder="请输入钛(%)" />
+        </el-form-item>
+        <el-form-item label="铬(%)" prop="cr">
+          <el-input v-model="form.cr" placeholder="请输入铬(%)" />
+        </el-form-item>
+        <el-form-item label="镍(%)" prop="ni">
+          <el-input v-model="form.ni" placeholder="请输入镍(%)" />
+        </el-form-item>
+        <el-form-item label="铜(%)" prop="cu">
+          <el-input v-model="form.cu" placeholder="请输入铜(%)" />
+        </el-form-item>
+        <el-form-item label="氮(%)" prop="n">
+          <el-input v-model="form.n" placeholder="请输入氮(%)" />
+        </el-form-item>
+        <el-form-item label="铁(%)" prop="fe">
+          <el-input v-model="form.fe" placeholder="请输入铁(%)" />
+        </el-form-item>
+        <el-form-item label="硼(%)" prop="b">
+          <el-input v-model="form.b" placeholder="请输入硼(%)" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -216,12 +259,21 @@
             :row-class-name="importTableRowClassName">
             <el-table-column label="#" width="48" type="index" align="center" />
             <el-table-column prop="coilNo" label="入场钢卷号" width="140" />
+            <el-table-column prop="supplierCoilNo" label="厂家卷号" width="120" />
             <el-table-column prop="c" label="C(%)" width="70" align="center" />
             <el-table-column prop="si" label="Si(%)" width="70" align="center" />
             <el-table-column prop="mn" label="Mn(%)" width="70" align="center" />
             <el-table-column prop="p" label="P(%)" width="70" align="center" />
             <el-table-column prop="s" label="S(%)" width="70" align="center" />
             <el-table-column prop="als" label="Als(%)" width="70" align="center" />
+            <el-table-column prop="al" label="Al(%)" width="70" align="center" />
+            <el-table-column prop="ti" label="Ti(%)" width="70" align="center" />
+            <el-table-column prop="cr" label="Cr(%)" width="70" align="center" />
+            <el-table-column prop="ni" label="Ni(%)" width="70" align="center" />
+            <el-table-column prop="cu" label="Cu(%)" width="70" align="center" />
+            <el-table-column prop="n" label="N(%)" width="70" align="center" />
+            <el-table-column prop="fe" label="Fe(%)" width="70" align="center" />
+            <el-table-column prop="b" label="B(%)" width="70" align="center" />
 
           </el-table>
         </div>
@@ -255,6 +307,31 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="选择对应入场卷号" :visible.sync="ambiguousVisible" width="600px" append-to-body :close-on-click-modal="false">
+      <div style="font-size: 12px; color: #909399; margin-bottom: 12px;">
+        厂家卷号匹配到多条入场卷号，请为每行选择对应记录
+      </div>
+      <el-table :data="ambiguousRows" border size="small" max-height="350">
+        <el-table-column label="厂家卷号" prop="supplierCoilNo" width="140" />
+        <el-table-column label="选择入场卷号" min-width="280">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.selected" placeholder="请选择入场卷号" size="small" style="width: 100%;">
+              <el-option
+                v-for="opt in scope.row.options"
+                :key="opt"
+                :label="opt"
+                :value="opt"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmAmbiguous">确 定</el-button>
+        <el-button @click="ambiguousVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -264,16 +341,25 @@ import { listChemicalItem, getChemicalItem, delChemicalItem, addChemicalItem, up
 import CoilSelector from "@/components/CoilSelector";
 import { listMaterialCoil } from "@/api/wms/coil";
 
-const CHEMI_TEMPLATE_HEADERS = ['入场钢卷号', 'C(%)', 'Si(%)', 'Mn(%)', 'P(%)', 'S(%)', 'Als(%)'];
+const CHEMI_TEMPLATE_HEADERS = ['入场钢卷号', '厂家卷号', 'C(%)', 'Si(%)', 'Mn(%)', 'P(%)', 'S(%)', 'Als(%)', 'Al(%)', 'Ti(%)', 'Cr(%)', 'Ni(%)', 'Cu(%)', 'N(%)', 'Fe(%)', 'B(%)'];
 
 const CHEMI_HEADER_MAP = {
   '入场钢卷号': 'coilNo',
+  '厂家卷号': 'supplierCoilNo',
   'C(%)': 'c',
   'Si(%)': 'si',
   'Mn(%)': 'mn',
   'P(%)': 'p',
   'S(%)': 's',
-  'Als(%)': 'als'
+  'Als(%)': 'als',
+  'Al(%)': 'al',
+  'Ti(%)': 'ti',
+  'Cr(%)': 'cr',
+  'Ni(%)': 'ni',
+  'Cu(%)': 'cu',
+  'N(%)': 'n',
+  'Fe(%)': 'fe',
+  'B(%)': 'b'
 };
 
 export default {
@@ -316,6 +402,14 @@ export default {
         p: undefined,
         s: undefined,
         als: undefined,
+        al: undefined,
+        ti: undefined,
+        cr: undefined,
+        ni: undefined,
+        cu: undefined,
+        n: undefined,
+        fe: undefined,
+        b: undefined,
       },
       // 表单参数
       form: {},
@@ -339,6 +433,10 @@ export default {
       importLoading: false,
       coilNoOptions: [],
       coilNoLoading: false,
+      tempSupplierCoilNo: '',
+      supplierCoilNoLoading: false,
+      ambiguousVisible: false,
+      ambiguousRows: [],
     };
   },
   created() {
@@ -372,6 +470,14 @@ export default {
         p: undefined,
         s: undefined,
         als: undefined,
+        al: undefined,
+        ti: undefined,
+        cr: undefined,
+        ni: undefined,
+        cu: undefined,
+        n: undefined,
+        fe: undefined,
+        b: undefined,
         remark: undefined,
         delFlag: undefined,
         createTime: undefined,
@@ -426,6 +532,34 @@ export default {
         this.coilNoLoading = false;
       });
     },
+    querySupplierCoilNo(queryString, cb) {
+      if (!queryString || queryString.length < 2) {
+        cb([]);
+        return;
+      }
+      this.supplierCoilNoLoading = true;
+      listMaterialCoil({
+        supplierCoilNo: queryString,
+        pageNum: 1,
+        pageSize: 20
+      }).then(response => {
+        const options = (response.rows || []).map(item => ({
+          value: item.supplierCoilNo,
+          label: item.supplierCoilNo,
+          enterCoilNo: item.enterCoilNo
+        }));
+        cb(options);
+      }).finally(() => {
+        this.supplierCoilNoLoading = false;
+      });
+    },
+    handleSelectSupplierCoilNo(item) {
+      if (item.enterCoilNo) {
+        this.form.coilNo = item.enterCoilNo;
+        this.$refs["form"].validateField('coilNo');
+      }
+      this.tempSupplierCoilNo = '';
+    },
     handleBatchAdd(rows) {
       this.loading = true;
       this.buttonLoading = true;
@@ -495,12 +629,90 @@ export default {
       if (!this.importFile || !this.importRawData.length) { this.$message.warning('暂无数据可校验'); return; }
       this.importValidateLoading = true;
       this.importErrorList = [];
-      for (let i = 0; i < this.importRawData.length; i++) {
+      this.ambiguousRows = [];
+      const dataRows = this.importRawData;
+      for (let i = 0; i < dataRows.length; i++) {
         const rowNum = i + 2;
-        let coilNo = '';
-        CHEMI_TEMPLATE_HEADERS.forEach((h, j) => { if (CHEMI_HEADER_MAP[h] === 'coilNo') coilNo = this.importRawData[i][j]; });
-        if (!coilNo || !String(coilNo).trim()) this.importErrorList.push({ rowNum, errorMsg: '当前钢卷号不能为空' });
+        let coilNo = '', supplierCoilNo = '';
+        CHEMI_TEMPLATE_HEADERS.forEach((h, j) => {
+          if (CHEMI_HEADER_MAP[h] === 'coilNo') coilNo = dataRows[i][j];
+          if (CHEMI_HEADER_MAP[h] === 'supplierCoilNo') supplierCoilNo = dataRows[i][j];
+        });
+        coilNo = String(coilNo || '').trim();
+        supplierCoilNo = String(supplierCoilNo || '').trim();
+        if (!coilNo && !supplierCoilNo) {
+          this.importErrorList.push({ rowNum, errorMsg: '入场钢卷号和厂家卷号不能同时为空' });
+        }
       }
+      // 处理仅填写厂家卷号的行
+      if (this.importErrorList.length === 0) {
+        this.importTableData.forEach((row, idx) => {
+          const cn = (row.coilNo || '').trim();
+          const sn = (row.supplierCoilNo || '').trim();
+          row._sno = sn;
+          row._idx = idx;
+          row._fillCoilNo = cn;
+          // 仅厂家卷号且无入场卷号的行需匹配
+          if (sn && !cn) row._needMatch = true;
+        });
+        const needMatchRows = this.importTableData.filter(r => r._needMatch);
+        if (needMatchRows.length > 0) {
+          const uniqueSnos = [...new Set(needMatchRows.map(r => r._sno))];
+          const multiMap = {}; // supplierCoilNo -> [enterCoilNo, ...]
+          try {
+            const results = await Promise.all(
+              uniqueSnos.map(sno => listMaterialCoil({ supplierCoilNo: sno, pageNum: 1, pageSize: 50 }))
+            );
+            uniqueSnos.forEach((sno, idx) => {
+              const rows = (results[idx] && results[idx].rows) || [];
+              const enterNos = [...new Set(rows.map(r => r.enterCoilNo).filter(Boolean))];
+              multiMap[sno] = enterNos;
+            });
+          } catch (err) {
+            this.importValidateLoading = false;
+            this.importHandleError('厂家卷号匹配失败：' + err.message);
+            return;
+          }
+          const ambiguousList = [];
+          needMatchRows.forEach(row => {
+            const candidates = multiMap[row._sno] || [];
+            if (candidates.length === 0) {
+              this.importErrorList.push({ rowNum: (row.rowNum || (row._idx + 2)), errorMsg: `厂家卷号"${row._sno}"未匹配到入场卷号` });
+            } else if (candidates.length === 1) {
+              row.coilNo = candidates[0];
+            } else {
+              ambiguousList.push({
+                _idx: row._idx,
+                supplierCoilNo: row._sno,
+                options: candidates,
+                selected: null
+              });
+            }
+          });
+          if (ambiguousList.length > 0) {
+            this.ambiguousRows = ambiguousList;
+            this.importValidateLoading = false;
+            this.ambiguousVisible = true;
+            return;
+          }
+        }
+      }
+      this.finishValidation();
+    },
+    confirmAmbiguous() {
+      const unselected = this.ambiguousRows.filter(r => !r.selected);
+      if (unselected.length > 0) {
+        this.$message.warning('请为所有行选择入场卷号');
+        return;
+      }
+      this.ambiguousRows.forEach(item => {
+        this.importTableData[item._idx].coilNo = item.selected;
+      });
+      this.ambiguousVisible = false;
+      this.importValidateLoading = true;
+      this.finishValidation();
+    },
+    finishValidation() {
       if (this.importErrorList.length > 0) {
         this.$message.error(`数据校验失败，共发现${this.importErrorList.length}条错误`);
       } else {
@@ -523,7 +735,7 @@ export default {
       try {
         const payload = rows.map(row => {
           const item = { coilId: null, coilNo: row.coilNo };
-          ['c','si','mn','p','s','als'].forEach(f => { if (row[f]) item[f] = row[f]; });
+          ['c','si','mn','p','s','als','al','ti','cr','ni','cu','n','fe','b'].forEach(f => { if (row[f]) item[f] = row[f]; });
           return item;
         });
         const addRes = await batchAddChemicalItem(payload);
@@ -553,10 +765,10 @@ export default {
       this.$refs.importUpload?.clearFiles();
     },
     importDownloadTemplate() {
-      const data = [CHEMI_TEMPLATE_HEADERS, ['示例卷号', '0.05', '0.02', '0.30', '0.015', '0.008', '0.040']];
+      const data = [CHEMI_TEMPLATE_HEADERS, ['示例卷号', '示例厂家卷号', '0.05', '0.02', '0.30', '0.015', '0.008', '0.040', '0.04', '0.05', '0.03', '0.02', '0.03', '0.005', '98', '0.001']];
       const wb = XLSX.utils.book_new();
       const ws = XLSX.utils.aoa_to_sheet(data);
-      ws['!cols'] = [{ wch: 16 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }];
+      ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }, { wch: 8 }];
       XLSX.utils.book_append_sheet(wb, ws, '导入模板');
       XLSX.writeFile(wb, '化学成分导入模板.xlsx');
     },
diff --git a/klp-ui/src/views/mes/qc/certificate/components/CertificatePrintPreview.vue b/klp-ui/src/views/mes/qc/certificate/components/CertificatePrintPreview.vue
index a7db66872..9404b26c3 100644
--- a/klp-ui/src/views/mes/qc/certificate/components/CertificatePrintPreview.vue
+++ b/klp-ui/src/views/mes/qc/certificate/components/CertificatePrintPreview.vue
@@ -1,131 +1,18 @@
 <template>
   <div class="certificate-print-container" :class="{ 'is-hidden': !preview }">
     <div ref="certificateContent" class="certificate-pdf-content" :class="{ 'is-preview': preview }">
-      <div class="pdf-header">
-        <div class="header-left">
-          <img src="@/assets/logo/logo.png" class="company-logo" alt="logo" />
-          <div class="company-name-cn">科伦普</div>
-          <div class="company-name-en">KE LUN PU</div>
-        </div>
-        <div class="header-center">
-          <div class="main-title">产品质量证明书</div>
-          <div class="main-title-en">PRODUCT QUALITY CERTIFICATE</div>
-        </div>
-        <div class="header-right">
-          <div class="company-full-name">嘉祥科伦普重工有限公司</div>
-          <div class="company-address">山东省济宁市嘉祥县化工园区</div>
-        </div>
-      </div>
-
-      <div class="pdf-body">
-        <table class="info-table">
-          <tr>
-            <td class="label-cell">执行标准(SPECIFICATION):</td>
-            <td class="value-cell">{{ certificate.standard || '/' }}</td>
-            <td class="label-cell">证明书号(CERTIFICATE NO.):</td>
-            <td class="value-cell">{{ certificate.certificateNo || '' }}</td>
-          </tr>
-          <tr>
-            <td class="label-cell">收货单位(CONSIGNEE):</td>
-            <td class="value-cell">{{ certificate.consignee || '-' }}</td>
-            <td class="label-cell">合同号(CONTRACT NO.):</td>
-            <td class="value-cell">{{ certificate.contractNo || '' }}</td>
-          </tr>
-          <tr>
-            <td class="label-cell">产品名称(PRODUCT):</td>
-            <td class="value-cell">{{ certificate.productName || '' }}</td>
-            <td class="label-cell">签发日期(DATE OF ISSUE):</td>
-            <td class="value-cell">{{ formatDate(certificate.issueDate) || '' }}</td>
-          </tr>
-        </table>
-
-        <table class="data-table">
-          <thead>
-            <tr>
-              <th rowspan="2">序号</th>
-              <th rowspan="2">钢卷号<br>Coil No.</th>
-              <th rowspan="2">炉号<br>Heat No.</th>
-              <th rowspan="2">材质<br>Type</th>
-              <th rowspan="2">规格 Size<br>(mm)</th>
-              <th rowspan="2">件数<br>Pieces</th>
-              <th rowspan="2">重量<br>Weight(t)</th>
-              <th colspan="6">化学成分(%)<br>Chemical Composition</th>
-              <th colspan="3">拉伸试验 Tensile Test<br>(G.L=80mm)</th>
-              <th rowspan="2">硬度试验<br>Hardness Test</th>
-              <th rowspan="2">弯曲试验<br>180° B.T<br>D=0a</th>
-              <th rowspan="2">表面质量</th>
-              <th rowspan="2">表面结构</th>
-              <th rowspan="2">边缘状态</th>
-            </tr>
-            <tr>
-              <th>C</th>
-              <th>Si</th>
-              <th>Mn</th>
-              <th>P</th>
-              <th>S</th>
-              <th>Als</th>
-              <th>屈服 RP0.2<br>Y.S(MPa)</th>
-              <th>抗拉 T.S<br>(MPa)</th>
-              <th>伸长率 EL<br>(%)</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="(item, index) in items" :key="index">
-              <td>{{ index + 1 }}</td>
-              <td>{{ item.coilNo || '' }}</td>
-              <td>{{ item.heatNo || '' }}</td>
-              <td>{{ item.materialType || '' }}</td>
-              <td>{{ item.size || '' }}</td>
-              <td>{{ item.pieces || '' }}</td>
-              <td>{{ item.weight || '' }}</td>
-              <td>{{ item.c || '/' }}</td>
-              <td>{{ item.si || '/' }}</td>
-              <td>{{ item.mn || '/' }}</td>
-              <td>{{ item.p || '/' }}</td>
-              <td>{{ item.s || '/' }}</td>
-              <td>{{ item.als || '/' }}</td>
-              <td>{{ item.yieldStrength || '/' }}</td>
-              <td>{{ item.tensileStrength || '/' }}</td>
-              <td>{{ item.elongation || '/' }}</td>
-              <td>{{ item.hardness || '/' }}</td>
-              <td>{{ item.bendingTest || '/' }}</td>
-              <td>{{ item.surfaceQuality || '/' }}</td>
-              <td>{{ item.surfaceStructure || '/' }}</td>
-              <td>{{ item.edgeStatus || '/' }}</td>
-            </tr>
-            <tr v-if="items.length === 0">
-              <td colspan="21" class="empty-cell">暂无数据</td>
-            </tr>
-          </tbody>
-        </table>
-
-        <table class="footer-table">
-          <tr>
-            <td class="footer-label">注释<br>NOTE</td>
-            <td class="footer-content">
-              <pre>{{ certificate.note || '/' }}</pre>
-            </td>
-          </tr>
-          <tr>
-            <td class="footer-label">备注<br>REMARK</td>
-            <td class="footer-content footer-remark-cell">
-              <pre class="remark-text">{{ certificate.remark || '/' }}</pre>
-              <div class="signature-area">
-                <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/zhijian.png" class="stamp-image" alt="质检专用章" />
-                <div class="signature-block">
-                  <div class="signature-label">质量负责人:</div>
-                  <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/yanghongyan.png" class="signature-image" alt="签名" />
-                </div>
-              </div>
-            </td>
-          </tr>
-        </table>
-      </div>
+      <component
+        :is="currentTemplate"
+        :certificate="certificate"
+        :items="items"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import { templateMap } from './templates';
+
 export default {
   name: 'CertificatePrintPreview',
   props: {
@@ -140,13 +27,15 @@ export default {
     preview: {
       type: Boolean,
       default: false
+    },
+    templateType: {
+      type: String,
+      default: 'chromium'
     }
   },
-  methods: {
-    formatDate(dateStr) {
-      if (!dateStr) return '';
-      const date = new Date(dateStr);
-      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+  computed: {
+    currentTemplate() {
+      return templateMap[this.templateType] || templateMap.chromium;
     }
   }
 };
@@ -178,207 +67,4 @@ export default {
   font-family: "SimSun", "宋体", Arial, sans-serif;
   color: #000;
 }
-
-
-.pdf-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  margin-bottom: 8px;
-  padding-bottom: 6px;
-}
-
-.header-left {
-  text-align: center;
-  width: 90px;
-  flex-shrink: 0;
-}
-
-.company-logo {
-  width: 70px;
-  height: auto;
-  margin-bottom: 2px;
-}
-
-.company-name-cn {
-  font-size: 14px;
-  font-weight: bold;
-  color: #000;
-  line-height: 1.2;
-}
-
-.company-name-en {
-  font-size: 9px;
-  color: #333;
-  letter-spacing: 1px;
-}
-
-.header-center {
-  flex: 1;
-  text-align: center;
-  padding: 0 10px;
-}
-
-.main-title {
-  font-size: 22px;
-  font-weight: bold;
-  color: #000;
-  letter-spacing: 4px;
-  line-height: 1.3;
-}
-
-.main-title-en {
-  font-size: 13px;
-  color: #000;
-  font-family: "Times New Roman", serif;
-  letter-spacing: 1px;
-  margin-top: 2px;
-}
-
-.header-right {
-  text-align: right;
-  width: 160px;
-  flex-shrink: 0;
-}
-
-.company-full-name {
-  font-size: 13px;
-  font-weight: bold;
-  color: #000;
-  line-height: 1.4;
-}
-
-.company-address {
-  font-size: 10px;
-  color: #333;
-  margin-top: 2px;
-}
-
-.pdf-body {
-  margin-top: 5px;
-}
-
-.info-table {
-  width: 100%;
-  border-collapse: collapse;
-  margin-bottom: 0;
-  font-size: 11px;
-}
-
-.info-table td {
-  border: 1px solid #000;
-  padding: 3px 6px;
-  height: 22px;
-}
-
-.info-table .label-cell {
-  font-weight: bold;
-  width: 22%;
-  white-space: nowrap;
-  background: #fafafa;
-}
-
-.info-table .value-cell {
-  width: 28%;
-  text-align: center;
-}
-
-.data-table {
-  width: 100%;
-  border-collapse: collapse;
-  margin-bottom: 0;
-  font-size: 9px;
-}
-
-.data-table th,
-.data-table td {
-  border: 1px solid #000;
-  padding: 2px 3px;
-  text-align: center;
-  vertical-align: middle;
-  line-height: 1.3;
-}
-
-.data-table th {
-  background-color: #f0f0f0;
-  font-weight: bold;
-  font-size: 9px;
-}
-
-.data-table td {
-  font-size: 9px;
-}
-
-.empty-cell {
-  text-align: center;
-  padding: 20px;
-  color: #999;
-  font-size: 12px;
-}
-
-.footer-table {
-  width: 100%;
-  border-collapse: collapse;
-  margin-top: 0;
-  font-size: 9px;
-}
-
-.footer-table td {
-  border: 1px solid #000;
-  padding: 4px 6px;
-  vertical-align: top;
-}
-
-.footer-label {
-  font-weight: bold;
-  width: 60px;
-  text-align: center;
-  vertical-align: middle;
-  font-size: 9px;
-  line-height: 1.4;
-}
-
-.footer-content {
-  font-size: 9px;
-  line-height: 1.5;
-}
-
-.footer-remark-cell {
-  position: relative;
-  padding-right: 140px;
-}
-
-.remark-text {
-  font-size: 9px;
-  line-height: 1.6;
-}
-
-.signature-area {
-  position: absolute;
-  right: 8px;
-  bottom: 8px;
-  display: flex;
-  align-items: flex-end;
-  gap: 8px;
-}
-
-.stamp-image {
-  width: 80px;
-  height: auto;
-}
-
-.signature-block {
-  text-align: center;
-}
-
-.signature-label {
-  font-size: 9px;
-  margin-bottom: 2px;
-  white-space: nowrap;
-}
-
-.signature-image {
-  height: 35px;
-  width: auto;
-}
 </style>
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/ChromiumTemplate.vue b/klp-ui/src/views/mes/qc/certificate/components/templates/ChromiumTemplate.vue
new file mode 100644
index 000000000..f469c05b3
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/ChromiumTemplate.vue
@@ -0,0 +1,347 @@
+<template>
+  <div class="certificate-content">
+    <div class="pdf-header">
+      <div class="header-left">
+        <img src="@/assets/logo/logo.png" class="company-logo" alt="logo" />
+        <div class="company-name-cn">科伦普</div>
+        <div class="company-name-en">KE LUN PU</div>
+      </div>
+      <div class="header-center">
+        <div class="main-title">镀铬产品质量证明书</div>
+        <div class="main-title-en">CHROMIUM PLATED PRODUCT QUALITY CERTIFICATE</div>
+      </div>
+      <div class="header-right">
+        <div class="company-full-name">嘉祥科伦普重工有限公司</div>
+        <div class="company-address">山东省济宁市嘉祥县化工园区</div>
+      </div>
+    </div>
+
+    <div class="pdf-body">
+      <table class="info-table">
+        <tr>
+          <td class="label-cell">执行标准(SPECIFICATION):</td>
+          <td class="value-cell">{{ certificate.standard || '/' }}</td>
+          <td class="label-cell">证明书号(CERTIFICATE NO.):</td>
+          <td class="value-cell">{{ certificate.certificateNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">收货单位(CONSIGNEE):</td>
+          <td class="value-cell">{{ certificate.consignee || '-' }}</td>
+          <td class="label-cell">合同号(CONTRACT NO.):</td>
+          <td class="value-cell">{{ certificate.contractNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">产品名称(PRODUCT):</td>
+          <td class="value-cell">{{ certificate.productName || '' }}</td>
+          <td class="label-cell">签发日期(DATE OF ISSUE):</td>
+          <td class="value-cell">{{ formatDate(certificate.issueDate) || '' }}</td>
+        </tr>
+      </table>
+
+      <table class="data-table">
+        <thead>
+          <tr>
+            <th rowspan="2">序号</th>
+            <th rowspan="2">批号</th>
+            <th rowspan="2">原料号</th>
+            <th rowspan="2">规格 Size<br>(mm)</th>
+            <th rowspan="2">件数<br>Pieces</th>
+            <th rowspan="2">重量<br>Weight(t)</th>
+            <th colspan="6">化学成分(%)<br>Chemical Composition</th>
+            <th rowspan="2">规定塑性<br>延伸强度<br>(MPa)</th>
+            <th rowspan="2">硬度H.T</th>
+            <th rowspan="2">调质度</th>
+            <th rowspan="2">表面状态</th>
+            <th rowspan="2">CMHR30T<br>SmT.Sn</th>
+          </tr>
+          <tr>
+            <th>C</th>
+            <th>Si</th>
+            <th>Mn</th>
+            <th>P</th>
+            <th>S</th>
+            <th>Als</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, index) in items" :key="index">
+            <td>{{ index + 1 }}</td>
+            <td>{{ item.coilNo || '' }}</td>
+            <td>{{ item.rawCoilNo || '' }}</td>
+            <td>{{ item.size || '' }}</td>
+            <td>{{ item.pieces || '' }}</td>
+            <td>{{ item.weight || '' }}</td>
+            <td>{{ item.c || '/' }}</td>
+            <td>{{ item.si || '/' }}</td>
+            <td>{{ item.mn || '/' }}</td>
+            <td>{{ item.p || '/' }}</td>
+            <td>{{ item.s || '/' }}</td>
+            <td>{{ item.als || '/' }}</td>
+            <td>{{ item.plasticExtensionStrength || '/' }}</td>
+            <td>{{ item.hardness || '/' }}</td>
+            <td>{{ item.temperDegree || '/' }}</td>
+            <td>{{ item.surfaceQuality || '/' }}</td>
+            <td>{{ item.coatingMass || '/' }}</td>
+          </tr>
+          <tr v-if="items.length === 0">
+            <td colspan="17" class="empty-cell">暂无数据</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table class="footer-table">
+        <tr>
+          <td class="footer-label">注释<br>NOTE</td>
+          <td class="footer-content">
+            <pre>{{ certificate.note || '/' }}</pre>
+          </td>
+        </tr>
+        <tr>
+          <td class="footer-label">备注<br>REMARK</td>
+          <td class="footer-content footer-remark-cell">
+            <pre class="remark-text">{{ certificate.remark || '/' }}</pre>
+            <div class="signature-area">
+              <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/zhijian.png" class="stamp-image" alt="质检专用章" />
+              <div class="signature-block">
+                <div class="signature-label">质量负责人:</div>
+                <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/yanghongyan.png" class="signature-image" alt="签名" />
+              </div>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ChromiumTemplate',
+  props: {
+    certificate: {
+      type: Object,
+      default: () => ({})
+    },
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.certificate-content {
+  width: 100%;
+  height: 100%;
+}
+
+.pdf-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 8px;
+  padding-bottom: 6px;
+}
+
+.header-left {
+  text-align: center;
+  width: 90px;
+  flex-shrink: 0;
+}
+
+.company-logo {
+  width: 70px;
+  height: auto;
+  margin-bottom: 2px;
+}
+
+.company-name-cn {
+  font-size: 14px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.2;
+}
+
+.company-name-en {
+  font-size: 9px;
+  color: #333;
+  letter-spacing: 1px;
+}
+
+.header-center {
+  flex: 1;
+  text-align: center;
+  padding: 0 10px;
+}
+
+.main-title {
+  font-size: 22px;
+  font-weight: bold;
+  color: #000;
+  letter-spacing: 4px;
+  line-height: 1.3;
+}
+
+.main-title-en {
+  font-size: 13px;
+  color: #000;
+  font-family: "Times New Roman", serif;
+  letter-spacing: 1px;
+  margin-top: 2px;
+}
+
+.header-right {
+  text-align: right;
+  width: 160px;
+  flex-shrink: 0;
+}
+
+.company-full-name {
+  font-size: 13px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.4;
+}
+
+.company-address {
+  font-size: 10px;
+  color: #333;
+  margin-top: 2px;
+}
+
+.pdf-body {
+  margin-top: 5px;
+}
+
+.info-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 11px;
+}
+
+.info-table td {
+  border: 1px solid #000;
+  padding: 3px 6px;
+  height: 22px;
+}
+
+.info-table .label-cell {
+  font-weight: bold;
+  width: 22%;
+  white-space: nowrap;
+  background: #fafafa;
+}
+
+.info-table .value-cell {
+  width: 28%;
+  text-align: center;
+}
+
+.data-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 9px;
+}
+
+.data-table th,
+.data-table td {
+  border: 1px solid #000;
+  padding: 2px 3px;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 1.3;
+}
+
+.data-table th {
+  background-color: #f0f0f0;
+  font-weight: bold;
+  font-size: 9px;
+}
+
+.data-table td {
+  font-size: 9px;
+}
+
+.empty-cell {
+  text-align: center;
+  padding: 20px;
+  color: #999;
+  font-size: 12px;
+}
+
+.footer-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 0;
+  font-size: 9px;
+}
+
+.footer-table td {
+  border: 1px solid #000;
+  padding: 4px 6px;
+  vertical-align: top;
+}
+
+.footer-label {
+  font-weight: bold;
+  width: 60px;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 9px;
+  line-height: 1.4;
+}
+
+.footer-content {
+  font-size: 9px;
+  line-height: 1.5;
+}
+
+.footer-remark-cell {
+  position: relative;
+  padding-right: 140px;
+}
+
+.remark-text {
+  font-size: 9px;
+  line-height: 1.6;
+}
+
+.signature-area {
+  position: absolute;
+  right: 8px;
+  bottom: 8px;
+  display: flex;
+  align-items: flex-end;
+  gap: 8px;
+}
+
+.stamp-image {
+  width: 80px;
+  height: auto;
+}
+
+.signature-block {
+  text-align: center;
+}
+
+.signature-label {
+  font-size: 9px;
+  margin-bottom: 2px;
+  white-space: nowrap;
+}
+
+.signature-image {
+  height: 35px;
+  width: auto;
+}
+</style>
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/ColdHardTemplate.vue b/klp-ui/src/views/mes/qc/certificate/components/templates/ColdHardTemplate.vue
new file mode 100644
index 000000000..1173b5d6a
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/ColdHardTemplate.vue
@@ -0,0 +1,356 @@
+<template>
+  <div class="certificate-content">
+    <div class="pdf-header">
+      <div class="header-left">
+        <img src="@/assets/logo/logo.png" class="company-logo" alt="logo" />
+        <div class="company-name-cn">科伦普</div>
+        <div class="company-name-en">KE LUN PU</div>
+      </div>
+      <div class="header-center">
+        <div class="main-title">冷硬产品质量证明书</div>
+        <div class="main-title-en">COLD HARD PRODUCT QUALITY CERTIFICATE</div>
+      </div>
+      <div class="header-right">
+        <div class="company-full-name">嘉祥科伦普重工有限公司</div>
+        <div class="company-address">山东省济宁市嘉祥县化工园区</div>
+      </div>
+    </div>
+
+    <div class="pdf-body">
+      <table class="info-table">
+        <tr>
+          <td class="label-cell">执行标准(SPECIFICATION):</td>
+          <td class="value-cell">{{ certificate.standard || '/' }}</td>
+          <td class="label-cell">证明书号(CERTIFICATE NO.):</td>
+          <td class="value-cell">{{ certificate.certificateNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">收货单位(CONSIGNEE):</td>
+          <td class="value-cell">{{ certificate.consignee || '-' }}</td>
+          <td class="label-cell">合同号(CONTRACT NO.):</td>
+          <td class="value-cell">{{ certificate.contractNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">产品名称(PRODUCT):</td>
+          <td class="value-cell">{{ certificate.productName || '' }}</td>
+          <td class="label-cell">签发日期(DATE OF ISSUE):</td>
+          <td class="value-cell">{{ formatDate(certificate.issueDate) || '' }}</td>
+        </tr>
+      </table>
+
+      <table class="data-table">
+        <thead>
+          <tr>
+            <th rowspan="2">序号</th>
+            <th rowspan="2">钢卷号<br>Coil No.</th>
+            <th rowspan="2">炉号<br>Heat No.</th>
+            <th rowspan="2">材质<br>Type</th>
+            <th rowspan="2">规格 Size<br>(mm)</th>
+            <th rowspan="2">件数<br>Pieces</th>
+            <th rowspan="2">重量<br>Weight(t)</th>
+            <th colspan="6">化学成分(%)<br>Chemical Composition</th>
+            <th colspan="3">拉伸试验 Tensile Test<br>(G.L=80mm)</th>
+            <th rowspan="2">硬度试验<br>Hardness Test</th>
+            <th rowspan="2">弯曲试验<br>180° B.T<br>D=0a</th>
+            <th rowspan="2">表面质量</th>
+            <th rowspan="2">表面结构</th>
+            <th rowspan="2">边缘状态</th>
+          </tr>
+          <tr>
+            <th>C</th>
+            <th>Si</th>
+            <th>Mn</th>
+            <th>P</th>
+            <th>S</th>
+            <th>Als</th>
+            <th>屈服 RP0.2<br>Y.S(MPa)</th>
+            <th>抗拉 T.S<br>(MPa)</th>
+            <th>伸长率 EL<br>(%)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, index) in items" :key="index">
+            <td>{{ index + 1 }}</td>
+            <td>{{ item.coilNo || '' }}</td>
+            <td>{{ item.heatNo || '' }}</td>
+            <td>{{ item.materialType || '' }}</td>
+            <td>{{ item.size || '' }}</td>
+            <td>{{ item.pieces || '' }}</td>
+            <td>{{ item.weight || '' }}</td>
+            <td>{{ item.c || '/' }}</td>
+            <td>{{ item.si || '/' }}</td>
+            <td>{{ item.mn || '/' }}</td>
+            <td>{{ item.p || '/' }}</td>
+            <td>{{ item.s || '/' }}</td>
+            <td>{{ item.als || '/' }}</td>
+            <td>{{ item.yieldStrength || '/' }}</td>
+            <td>{{ item.tensileStrength || '/' }}</td>
+            <td>{{ item.elongation || '/' }}</td>
+            <td>{{ item.hardness || '/' }}</td>
+            <td>{{ item.bendingTest || '/' }}</td>
+            <td>{{ item.surfaceQuality || '/' }}</td>
+            <td>{{ item.surfaceStructure || '/' }}</td>
+            <td>{{ item.edgeStatus || '/' }}</td>
+          </tr>
+          <tr v-if="items.length === 0">
+            <td colspan="21" class="empty-cell">暂无数据</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table class="footer-table">
+        <tr>
+          <td class="footer-label">注释<br>NOTE</td>
+          <td class="footer-content">
+            <pre>{{ certificate.note || '/' }}</pre>
+          </td>
+        </tr>
+        <tr>
+          <td class="footer-label">备注<br>REMARK</td>
+          <td class="footer-content footer-remark-cell">
+            <pre class="remark-text">{{ certificate.remark || '/' }}</pre>
+            <div class="signature-area">
+              <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/zhijian.png" class="stamp-image" alt="质检专用章" />
+              <div class="signature-block">
+                <div class="signature-label">质量负责人:</div>
+                <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/yanghongyan.png" class="signature-image" alt="签名" />
+              </div>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ColdHardTemplate',
+  props: {
+    certificate: {
+      type: Object,
+      default: () => ({})
+    },
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.certificate-content {
+  width: 100%;
+  height: 100%;
+}
+
+.pdf-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 8px;
+  padding-bottom: 6px;
+}
+
+.header-left {
+  text-align: center;
+  width: 90px;
+  flex-shrink: 0;
+}
+
+.company-logo {
+  width: 70px;
+  height: auto;
+  margin-bottom: 2px;
+}
+
+.company-name-cn {
+  font-size: 14px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.2;
+}
+
+.company-name-en {
+  font-size: 9px;
+  color: #333;
+  letter-spacing: 1px;
+}
+
+.header-center {
+  flex: 1;
+  text-align: center;
+  padding: 0 10px;
+}
+
+.main-title {
+  font-size: 22px;
+  font-weight: bold;
+  color: #000;
+  letter-spacing: 4px;
+  line-height: 1.3;
+}
+
+.main-title-en {
+  font-size: 13px;
+  color: #000;
+  font-family: "Times New Roman", serif;
+  letter-spacing: 1px;
+  margin-top: 2px;
+}
+
+.header-right {
+  text-align: right;
+  width: 160px;
+  flex-shrink: 0;
+}
+
+.company-full-name {
+  font-size: 13px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.4;
+}
+
+.company-address {
+  font-size: 10px;
+  color: #333;
+  margin-top: 2px;
+}
+
+.pdf-body {
+  margin-top: 5px;
+}
+
+.info-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 11px;
+}
+
+.info-table td {
+  border: 1px solid #000;
+  padding: 3px 6px;
+  height: 22px;
+}
+
+.info-table .label-cell {
+  font-weight: bold;
+  width: 22%;
+  white-space: nowrap;
+  background: #fafafa;
+}
+
+.info-table .value-cell {
+  width: 28%;
+  text-align: center;
+}
+
+.data-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 9px;
+}
+
+.data-table th,
+.data-table td {
+  border: 1px solid #000;
+  padding: 2px 3px;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 1.3;
+}
+
+.data-table th {
+  background-color: #f0f0f0;
+  font-weight: bold;
+  font-size: 9px;
+}
+
+.data-table td {
+  font-size: 9px;
+}
+
+.empty-cell {
+  text-align: center;
+  padding: 20px;
+  color: #999;
+  font-size: 12px;
+}
+
+.footer-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 0;
+  font-size: 9px;
+}
+
+.footer-table td {
+  border: 1px solid #000;
+  padding: 4px 6px;
+  vertical-align: top;
+}
+
+.footer-label {
+  font-weight: bold;
+  width: 60px;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 9px;
+  line-height: 1.4;
+}
+
+.footer-content {
+  font-size: 9px;
+  line-height: 1.5;
+}
+
+.footer-remark-cell {
+  position: relative;
+  padding-right: 140px;
+}
+
+.remark-text {
+  font-size: 9px;
+  line-height: 1.6;
+}
+
+.signature-area {
+  position: absolute;
+  right: 8px;
+  bottom: 8px;
+  display: flex;
+  align-items: flex-end;
+  gap: 8px;
+}
+
+.stamp-image {
+  width: 80px;
+  height: auto;
+}
+
+.signature-block {
+  text-align: center;
+}
+
+.signature-label {
+  font-size: 9px;
+  margin-bottom: 2px;
+  white-space: nowrap;
+}
+
+.signature-image {
+  height: 35px;
+  width: auto;
+}
+</style>
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/GalvanizingTemplate.vue b/klp-ui/src/views/mes/qc/certificate/components/templates/GalvanizingTemplate.vue
new file mode 100644
index 000000000..84ca61b8e
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/GalvanizingTemplate.vue
@@ -0,0 +1,360 @@
+<template>
+  <div class="certificate-content">
+    <div class="pdf-header">
+      <div class="header-left">
+        <img src="@/assets/logo/logo.png" class="company-logo" alt="logo" />
+        <div class="company-name-cn">科伦普</div>
+        <div class="company-name-en">KE LUN PU</div>
+      </div>
+      <div class="header-center">
+        <div class="main-title">镀锌产品质量证明书</div>
+        <div class="main-title-en">GALVANIZED PRODUCT QUALITY CERTIFICATE</div>
+      </div>
+      <div class="header-right">
+        <div class="company-full-name">嘉祥科伦普重工有限公司</div>
+        <div class="company-address">山东省济宁市嘉祥县化工园区</div>
+      </div>
+    </div>
+
+    <div class="pdf-body">
+      <table class="info-table">
+        <tr>
+          <td class="label-cell">执行标准(SPECIFICATION):</td>
+          <td class="value-cell">{{ certificate.standard || '/' }}</td>
+          <td class="label-cell">证明书号(CERTIFICATE NO.):</td>
+          <td class="value-cell">{{ certificate.certificateNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">收货单位(CONSIGNEE):</td>
+          <td class="value-cell">{{ certificate.consignee || '-' }}</td>
+          <td class="label-cell">合同号(CONTRACT NO.):</td>
+          <td class="value-cell">{{ certificate.contractNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">产品名称(PRODUCT):</td>
+          <td class="value-cell">{{ certificate.productName || '' }}</td>
+          <td class="label-cell">签发日期(DATE OF ISSUE):</td>
+          <td class="value-cell">{{ formatDate(certificate.issueDate) || '' }}</td>
+        </tr>
+      </table>
+
+      <table class="data-table">
+        <thead>
+          <tr>
+            <th rowspan="2">序号</th>
+            <th rowspan="2">钢卷号<br>Coil No.</th>
+            <th rowspan="2">原料号<br>Material No.</th>
+            <th rowspan="2">材质<br>Type</th>
+            <th rowspan="2">规格 Size<br>(mm)</th>
+            <th rowspan="2">件数<br>Pieces</th>
+            <th rowspan="2">重量<br>Weight(t)</th>
+            <th colspan="6">化学成分(%)<br>Chemical Composition</th>
+            <th colspan="3">拉伸试验 Tensile Test<br>(G.L=80mm)</th>
+            <th rowspan="2">镀层弯曲<br>B.T<br>D=0a</th>
+            <th rowspan="2">表面质量</th>
+            <th rowspan="2">表面结构</th>
+            <th rowspan="2">镀层<br>表面结构</th>
+            <th rowspan="2">表面处理</th>
+            <th rowspan="2">镀层重量COATINGMASS<br>锌层重量双面三点平均值<br>(g/m²)</th>
+          </tr>
+          <tr>
+            <th>C</th>
+            <th>Si</th>
+            <th>Mn</th>
+            <th>P</th>
+            <th>S</th>
+            <th>Als</th>
+            <th>屈服<br>Y.S</th>
+            <th>抗拉<br>T.S</th>
+            <th>伸长率<br>EL</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, index) in items" :key="index">
+            <td>{{ index + 1 }}</td>
+            <td>{{ item.coilNo || '' }}</td>
+            <td>{{ item.rawCoilNo || '' }}</td>
+            <td>{{ item.materialType || '' }}</td>
+            <td>{{ item.size || '' }}</td>
+            <td>{{ item.pieces || '' }}</td>
+            <td>{{ item.weight || '' }}</td>
+            <td>{{ item.c || '/' }}</td>
+            <td>{{ item.si || '/' }}</td>
+            <td>{{ item.mn || '/' }}</td>
+            <td>{{ item.p || '/' }}</td>
+            <td>{{ item.s || '/' }}</td>
+            <td>{{ item.als || '/' }}</td>
+            <td>{{ item.yieldStrength || '/' }}</td>
+            <td>{{ item.tensileStrength || '/' }}</td>
+            <td>{{ item.elongation || '/' }}</td>
+            <td>{{ item.bendingTest || '/' }}</td>
+            <td>{{ item.surfaceQuality || '/' }}</td>
+            <td>{{ item.surfaceStructure || '/' }}</td>
+            <td>{{ item.coatingSurfaceStructure || '/' }}</td>
+            <td>{{ item.surfaceTreatment || '/' }}</td>
+            <td>
+              <div>{{ item.coatingMass || '/' }}</div>
+            </td>
+          </tr>
+          <tr v-if="items.length === 0">
+            <td colspan="22" class="empty-cell">暂无数据</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table class="footer-table">
+        <tr>
+          <td class="footer-label">注释<br>NOTE</td>
+          <td class="footer-content">
+            <pre>{{ certificate.note || '/' }}</pre>
+          </td>
+        </tr>
+        <tr>
+          <td class="footer-label">备注<br>REMARK</td>
+          <td class="footer-content footer-remark-cell">
+            <pre class="remark-text">{{ certificate.remark || '/' }}</pre>
+            <div class="signature-area">
+              <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/zhijian.png" class="stamp-image" alt="质检专用章" />
+              <div class="signature-block">
+                <div class="signature-label">质量负责人:</div>
+                <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/yanghongyan.png" class="signature-image" alt="签名" />
+              </div>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'GalvanizingTemplate',
+  props: {
+    certificate: {
+      type: Object,
+      default: () => ({})
+    },
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.certificate-content {
+  width: 100%;
+  height: 100%;
+}
+
+.pdf-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 8px;
+  padding-bottom: 6px;
+}
+
+.header-left {
+  text-align: center;
+  width: 90px;
+  flex-shrink: 0;
+}
+
+.company-logo {
+  width: 70px;
+  height: auto;
+  margin-bottom: 2px;
+}
+
+.company-name-cn {
+  font-size: 14px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.2;
+}
+
+.company-name-en {
+  font-size: 9px;
+  color: #333;
+  letter-spacing: 1px;
+}
+
+.header-center {
+  flex: 1;
+  text-align: center;
+  padding: 0 10px;
+}
+
+.main-title {
+  font-size: 22px;
+  font-weight: bold;
+  color: #000;
+  letter-spacing: 4px;
+  line-height: 1.3;
+}
+
+.main-title-en {
+  font-size: 13px;
+  color: #000;
+  font-family: "Times New Roman", serif;
+  letter-spacing: 1px;
+  margin-top: 2px;
+}
+
+.header-right {
+  text-align: right;
+  width: 160px;
+  flex-shrink: 0;
+}
+
+.company-full-name {
+  font-size: 13px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.4;
+}
+
+.company-address {
+  font-size: 10px;
+  color: #333;
+  margin-top: 2px;
+}
+
+.pdf-body {
+  margin-top: 5px;
+}
+
+.info-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 11px;
+}
+
+.info-table td {
+  border: 1px solid #000;
+  padding: 3px 6px;
+  height: 22px;
+}
+
+.info-table .label-cell {
+  font-weight: bold;
+  width: 22%;
+  white-space: nowrap;
+  background: #fafafa;
+}
+
+.info-table .value-cell {
+  width: 28%;
+  text-align: center;
+}
+
+.data-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 9px;
+}
+
+.data-table th,
+.data-table td {
+  border: 1px solid #000;
+  padding: 2px 3px;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 1.3;
+}
+
+.data-table th {
+  background-color: #f0f0f0;
+  font-weight: bold;
+  font-size: 9px;
+}
+
+.data-table td {
+  font-size: 9px;
+}
+
+.empty-cell {
+  text-align: center;
+  padding: 20px;
+  color: #999;
+  font-size: 12px;
+}
+
+.footer-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 0;
+  font-size: 9px;
+}
+
+.footer-table td {
+  border: 1px solid #000;
+  padding: 4px 6px;
+  vertical-align: top;
+}
+
+.footer-label {
+  font-weight: bold;
+  width: 60px;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 9px;
+  line-height: 1.4;
+}
+
+.footer-content {
+  font-size: 9px;
+  line-height: 1.5;
+}
+
+.footer-remark-cell {
+  position: relative;
+  padding-right: 140px;
+}
+
+.remark-text {
+  font-size: 9px;
+  line-height: 1.6;
+}
+
+.signature-area {
+  position: absolute;
+  right: 8px;
+  bottom: 8px;
+  display: flex;
+  align-items: flex-end;
+  gap: 8px;
+}
+
+.stamp-image {
+  width: 80px;
+  height: auto;
+}
+
+.signature-block {
+  text-align: center;
+}
+
+.signature-label {
+  font-size: 9px;
+  margin-bottom: 2px;
+  white-space: nowrap;
+}
+
+.signature-image {
+  height: 35px;
+  width: auto;
+}
+</style>
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/RawMaterialTemplate.vue b/klp-ui/src/views/mes/qc/certificate/components/templates/RawMaterialTemplate.vue
new file mode 100644
index 000000000..1bcdd7e21
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/RawMaterialTemplate.vue
@@ -0,0 +1,378 @@
+<template>
+  <div class="certificate-content">
+    <div class="pdf-header">
+      <div class="header-left">
+        <img src="@/assets/logo/logo.png" class="company-logo" alt="logo" />
+        <div class="company-name-cn">科伦普</div>
+        <div class="company-name-en">KE LUN PU</div>
+      </div>
+      <div class="header-center">
+        <div class="main-title">产品质量证明书</div>
+        <div class="main-title-en">PRODUCT QUALITY CERTIFICATE</div>
+      </div>
+      <div class="header-right">
+        <div class="company-full-name">嘉祥科伦普重工有限公司</div>
+        <div class="company-address">山东省济宁市嘉祥县化工园区</div>
+      </div>
+    </div>
+
+    <div class="pdf-body">
+      <table class="info-table">
+        <tr>
+          <td class="label-cell">执行标准(SPECIFICATION):</td>
+          <td class="value-cell">{{ certificate.standard || '/' }}</td>
+          <td class="label-cell">证明书号(CERTIFICATE NO.):</td>
+          <td class="value-cell">{{ certificate.certificateNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">收货单位(CONSIGNEE):</td>
+          <td class="value-cell">{{ certificate.consignee || '-' }}</td>
+          <td class="label-cell">合同号(CONTRACT NO.):</td>
+          <td class="value-cell">{{ certificate.contractNo || '' }}</td>
+        </tr>
+        <tr>
+          <td class="label-cell">产品名称(PRODUCT):</td>
+          <td class="value-cell">{{ certificate.productName || '' }}</td>
+          <td class="label-cell">签发日期(DATE OF ISSUE):</td>
+          <td class="value-cell">{{ formatDate(certificate.issueDate) || '' }}</td>
+        </tr>
+      </table>
+
+      <table class="data-table">
+        <thead>
+          <tr>
+            <th rowspan="2">序号</th>
+            <th rowspan="2">钢卷号<br>Coil No.</th>
+            <th rowspan="2">炉号<br>Heat No.</th>
+            <th rowspan="2">材质<br>Type</th>
+            <th rowspan="2">规格 Size<br>(mm)</th>
+            <th rowspan="2">件数<br>Pieces</th>
+            <th rowspan="2">重量<br>Weight(t)</th>
+            <th colspan="14">化学成分(%)<br>Chemical Composition</th>
+            <th colspan="3">拉伸试验 Tensile Test<br>(G.L=80mm)</th>
+            <th rowspan="2">硬度试验<br>Hardness Test</th>
+            <th rowspan="2">弯曲试验<br>180° B.T<br>D=0a</th>
+            <th rowspan="2">表面质量</th>
+            <th rowspan="2">表面结构</th>
+            <th rowspan="2">边缘状态</th>
+            <th rowspan="2">规定塑性延伸强度<br>(MPa)</th>
+            <th rowspan="2">镀层表面结构</th>
+            <th rowspan="2">镀层重量<br>(g/m²)</th>
+          </tr>
+          <tr>
+            <th>C</th>
+            <th>Si</th>
+            <th>Mn</th>
+            <th>P</th>
+            <th>S</th>
+            <th>Als</th>
+            <th>Al</th>
+            <th>Ti</th>
+            <th>Cr</th>
+            <th>Ni</th>
+            <th>Cu</th>
+            <th>N</th>
+            <th>Fe</th>
+            <th>B</th>
+            <th>屈服 RP0.2<br>Y.S(MPa)</th>
+            <th>抗拉 T.S<br>(MPa)</th>
+            <th>伸长率 EL<br>(%)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(item, index) in items" :key="index">
+            <td>{{ index + 1 }}</td>
+            <td>{{ item.coilNo || '' }}</td>
+            <td>{{ item.heatNo || '' }}</td>
+            <td>{{ item.materialType || '' }}</td>
+            <td>{{ item.size || '' }}</td>
+            <td>{{ item.pieces || '' }}</td>
+            <td>{{ item.weight || '' }}</td>
+            <td>{{ item.c || '/' }}</td>
+            <td>{{ item.si || '/' }}</td>
+            <td>{{ item.mn || '/' }}</td>
+            <td>{{ item.p || '/' }}</td>
+            <td>{{ item.s || '/' }}</td>
+            <td>{{ item.als || '/' }}</td>
+            <td>{{ item.al || '/' }}</td>
+            <td>{{ item.ti || '/' }}</td>
+            <td>{{ item.cr || '/' }}</td>
+            <td>{{ item.ni || '/' }}</td>
+            <td>{{ item.cu || '/' }}</td>
+            <td>{{ item.n || '/' }}</td>
+            <td>{{ item.fe || '/' }}</td>
+            <td>{{ item.b || '/' }}</td>
+            <td>{{ item.yieldStrength || '/' }}</td>
+            <td>{{ item.tensileStrength || '/' }}</td>
+            <td>{{ item.elongation || '/' }}</td>
+            <td>{{ item.hardness || '/' }}</td>
+            <td>{{ item.bendingTest || '/' }}</td>
+            <td>{{ item.surfaceQuality || '/' }}</td>
+            <td>{{ item.surfaceStructure || '/' }}</td>
+            <td>{{ item.edgeStatus || '/' }}</td>
+            <td>{{ item.plasticExtensionStrength || '/' }}</td>
+            <td>{{ item.coatingSurfaceStructure || '/' }}</td>
+            <td>{{ item.coatingMass || '/' }}</td>
+          </tr>
+          <tr v-if="items.length === 0">
+            <td colspan="30" class="empty-cell">暂无数据</td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table class="footer-table">
+        <tr>
+          <td class="footer-label">注释<br>NOTE</td>
+          <td class="footer-content">
+            <pre>{{ certificate.note || '/' }}</pre>
+          </td>
+        </tr>
+        <tr>
+          <td class="footer-label">备注<br>REMARK</td>
+          <td class="footer-content footer-remark-cell">
+            <pre class="remark-text">{{ certificate.remark || '/' }}</pre>
+            <div class="signature-area">
+              <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/zhijian.png" class="stamp-image" alt="质检专用章" />
+              <div class="signature-block">
+                <div class="signature-label">质量负责人:</div>
+                <img v-if="certificate.approveStatus === 'PASSED'" src="@/assets/images/yanghongyan.png" class="signature-image" alt="签名" />
+              </div>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'RawMaterialTemplate',
+  props: {
+    certificate: {
+      type: Object,
+      default: () => ({})
+    },
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    formatDate(dateStr) {
+      if (!dateStr) return '';
+      const date = new Date(dateStr);
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.certificate-content {
+  width: 100%;
+  height: 100%;
+}
+
+.pdf-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 8px;
+  padding-bottom: 6px;
+}
+
+.header-left {
+  text-align: center;
+  width: 90px;
+  flex-shrink: 0;
+}
+
+.company-logo {
+  width: 70px;
+  height: auto;
+  margin-bottom: 2px;
+}
+
+.company-name-cn {
+  font-size: 14px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.2;
+}
+
+.company-name-en {
+  font-size: 9px;
+  color: #333;
+  letter-spacing: 1px;
+}
+
+.header-center {
+  flex: 1;
+  text-align: center;
+  padding: 0 10px;
+}
+
+.main-title {
+  font-size: 22px;
+  font-weight: bold;
+  color: #000;
+  letter-spacing: 4px;
+  line-height: 1.3;
+}
+
+.main-title-en {
+  font-size: 13px;
+  color: #000;
+  font-family: "Times New Roman", serif;
+  letter-spacing: 1px;
+  margin-top: 2px;
+}
+
+.header-right {
+  text-align: right;
+  width: 160px;
+  flex-shrink: 0;
+}
+
+.company-full-name {
+  font-size: 13px;
+  font-weight: bold;
+  color: #000;
+  line-height: 1.4;
+}
+
+.company-address {
+  font-size: 10px;
+  color: #333;
+  margin-top: 2px;
+}
+
+.pdf-body {
+  margin-top: 5px;
+}
+
+.info-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 11px;
+}
+
+.info-table td {
+  border: 1px solid #000;
+  padding: 3px 6px;
+  height: 22px;
+}
+
+.info-table .label-cell {
+  font-weight: bold;
+  width: 22%;
+  white-space: nowrap;
+  background: #fafafa;
+}
+
+.info-table .value-cell {
+  width: 28%;
+  text-align: center;
+}
+
+.data-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 0;
+  font-size: 9px;
+}
+
+.data-table th,
+.data-table td {
+  border: 1px solid #000;
+  padding: 2px 3px;
+  text-align: center;
+  vertical-align: middle;
+  line-height: 1.3;
+}
+
+.data-table th {
+  background-color: #f0f0f0;
+  font-weight: bold;
+  font-size: 9px;
+}
+
+.data-table td {
+  font-size: 9px;
+}
+
+.empty-cell {
+  text-align: center;
+  padding: 20px;
+  color: #999;
+  font-size: 12px;
+}
+
+.footer-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 0;
+  font-size: 9px;
+}
+
+.footer-table td {
+  border: 1px solid #000;
+  padding: 4px 6px;
+  vertical-align: top;
+}
+
+.footer-label {
+  font-weight: bold;
+  width: 60px;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 9px;
+  line-height: 1.4;
+}
+
+.footer-content {
+  font-size: 9px;
+  line-height: 1.5;
+}
+
+.footer-remark-cell {
+  position: relative;
+  padding-right: 140px;
+}
+
+.remark-text {
+  font-size: 9px;
+  line-height: 1.6;
+}
+
+.signature-area {
+  position: absolute;
+  right: 8px;
+  bottom: 8px;
+  display: flex;
+  align-items: flex-end;
+  gap: 8px;
+}
+
+.stamp-image {
+  width: 80px;
+  height: auto;
+}
+
+.signature-block {
+  text-align: center;
+}
+
+.signature-label {
+  font-size: 9px;
+  margin-bottom: 2px;
+  white-space: nowrap;
+}
+
+.signature-image {
+  height: 35px;
+  width: auto;
+}
+</style>
diff --git a/klp-ui/src/views/mes/qc/certificate/components/templates/index.js b/klp-ui/src/views/mes/qc/certificate/components/templates/index.js
new file mode 100644
index 000000000..bf0c37f9c
--- /dev/null
+++ b/klp-ui/src/views/mes/qc/certificate/components/templates/index.js
@@ -0,0 +1,20 @@
+import ChromiumTemplate from './ChromiumTemplate.vue';
+import GalvanizingTemplate from './GalvanizingTemplate.vue';
+import ColdHardTemplate from './ColdHardTemplate.vue';
+import RawMaterialTemplate from './RawMaterialTemplate.vue';
+
+export const templateMap = {
+  chromium: ChromiumTemplate,
+  galvanizing: GalvanizingTemplate,
+  coldHard: ColdHardTemplate,
+  rawMaterial: RawMaterialTemplate
+};
+
+export const templateOptions = [
+  { value: 'chromium', label: '镀铬质保书模版' },
+  { value: 'galvanizing', label: '镀锌质保书模版' },
+  { value: 'coldHard', label: '冷硬质保书模版' },
+  { value: 'rawMaterial', label: '原料质保书模版' }
+];
+
+export default templateMap;
diff --git a/klp-ui/src/views/mes/qc/certificate/item.vue b/klp-ui/src/views/mes/qc/certificate/item.vue
index 02a728b97..369a3093d 100644
--- a/klp-ui/src/views/mes/qc/certificate/item.vue
+++ b/klp-ui/src/views/mes/qc/certificate/item.vue
@@ -106,6 +106,11 @@
             </el-input>
           </template>
         </el-table-column>
+        <el-table-column label="原料号" align="center" prop="rawCoilNo" width="120">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.rawCoilNo" style="background-color: #fff3e6;" />
+          </template>
+        </el-table-column>
         <el-table-column label="炉号" align="center" prop="heatNo" width="120">
           <template slot-scope="scope">
             <el-input v-model="scope.row.heatNo" style="background-color: #e6f7ff;" />
@@ -162,6 +167,46 @@
             <el-input v-model="scope.row.als" style="background-color: #e6f7ff;" />
           </template>
         </el-table-column>
+        <el-table-column label="Al(%)" align="center" prop="al" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.al" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Ti(%)" align="center" prop="ti" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.ti" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Cr(%)" align="center" prop="cr" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.cr" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Ni(%)" align="center" prop="ni" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.ni" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Cu(%)" align="center" prop="cu" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.cu" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="N(%)" align="center" prop="n" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.n" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Fe(%)" align="center" prop="fe" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.fe" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="B(%)" align="center" prop="b" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.b" style="background-color: #e6f7ff;" />
+          </template>
+        </el-table-column>
 
         <el-table-column label="屈服强度(MPa)" align="center" prop="yieldStrength" width="130">
           <template slot-scope="scope">
@@ -188,6 +233,11 @@
             <el-input v-model="scope.row.bendingTest" style="background-color: #f6ffed;" />
           </template>
         </el-table-column>
+        <!-- <el-table-column label="镀层" align="center" prop="coating" width="80">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.coating" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column> -->
 
         <el-table-column label="表面质量" align="center" prop="surfaceQuality" width="100">
           <template slot-scope="scope">
@@ -204,6 +254,36 @@
             <el-input v-model="scope.row.edgeStatus" style="background-color: #f6ffed;" />
           </template>
         </el-table-column>
+        <el-table-column label="规定塑性延伸强度(MPa)" align="center" prop="plasticExtensionStrength" width="170">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.plasticExtensionStrength" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="镀层表面结构" align="center" prop="coatingSurfaceStructure" width="130">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.coatingSurfaceStructure" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="镀层重量(g/m²)" align="center" prop="coatingMass" width="130">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.coatingMass" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="表面处理" align="center" prop="surfaceTreatment" width="100">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.surfaceTreatment" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column>
+        <el-table-column label="调制度" align="center" prop="temperDegree" width="100">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.temperDegree" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="锌层重量平均值" align="center" prop="zincCoatingWeight" width="160">
+          <template slot-scope="scope">
+            <el-input v-model.number="scope.row.zincCoatingWeight" style="background-color: #f6ffed;" />
+          </template>
+        </el-table-column> -->
         <!-- <el-table-column label="备注" align="center" prop="remark">
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" style="background-color: #fff0f6;" />
@@ -335,7 +415,25 @@
 
     <!-- 隐藏的打印组件 -->
     <CertificatePrintPreview ref="certificatePrint" v-show="false" :certificate="printCertificateData"
-      :items="printItemsData" />
+      :items="printItemsData" :template-type="selectedTemplateType" />
+
+    <!-- 模板选择对话框 -->
+    <el-dialog title="选择质保书模板" :visible.sync="templateDialogVisible" width="500px" append-to-body>
+      <div class="template-selection">
+        <el-radio-group v-model="selectedTemplateType" class="template-radio-group">
+          <el-radio v-for="option in templateOptions" :key="option.value" :label="option.value" class="template-radio">
+            <div class="template-option">
+              <i class="el-icon-document"></i>
+              <span>{{ option.label }}</span>
+            </div>
+          </el-radio>
+        </el-radio-group>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmTemplate">确 定</el-button>
+        <el-button @click="templateDialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -347,6 +445,7 @@ import { listChemicalItem } from "@/api/mes/qc/chemicalItem";
 import { listPhysicalItem } from "@/api/mes/qc/physicalItem";
 import CoilSelector from "@/components/CoilSelector/index.vue";
 import CertificatePrintPreview from "./components/CertificatePrintPreview.vue";
+import { templateOptions } from "./components/templates";
 import { print as printPdf } from "./lib/printUtils";
 
 export default {
@@ -362,6 +461,7 @@ export default {
   },
   data() {
     return {
+      templateOptions,
       buttonLoading: false,
       loading: false,
       certificateLoading: false,
@@ -380,6 +480,9 @@ export default {
       printComponentVisible: false,
       printCertificateData: {},
       printItemsData: [],
+      templateDialogVisible: false,
+      selectedTemplateType: 'chromium',
+      templateDialogResolve: null,
       certificateForm: {
         certificateNo: '',
         contractNo: '',
@@ -527,13 +630,15 @@ export default {
       ]);
       const chem = chemRes.rows && chemRes.rows[0] || {};
       const phys = physRes.rows && physRes.rows[0] || {};
-      const { c, si, mn, p, s, als, yieldStrength, tensileStrength, elongation, hardness, bendingTest, surfaceQuality, surfaceStructure, edgeStatus } = { ...chem, ...phys };
-      return { c, si, mn, p, s, als, yieldStrength, tensileStrength, elongation, hardness, bendingTest, surfaceQuality, surfaceStructure, edgeStatus };
+      const { c, si, mn, p, s, als, al, ti, cr, ni, cu, n, fe, b } = chem;
+      const { yieldStrength, tensileStrength, elongation, hardness, bendingTest, surfaceQuality, surfaceStructure, edgeStatus, plasticExtensionStrength, coatingSurfaceStructure, coatingMass, coating, surfaceTreatment, zincCoatingWeight } = phys;
+      return { c, si, mn, p, s, als, al, ti, cr, ni, cu, n, fe, b, yieldStrength, tensileStrength, elongation, hardness, bendingTest, surfaceQuality, surfaceStructure, edgeStatus, plasticExtensionStrength, coatingSurfaceStructure, coatingMass, coating, surfaceTreatment, zincCoatingWeight };
     },
     async handleCoilSelect(row) {
       if (this.currentEditRow) {
         const editRow = this.currentEditRow;
         editRow.coilNo = row.currentCoilNo;
+        editRow.materialNo = row.enterCoilNo;
         editRow.materialType = row.material;
         editRow.size = row.specification;
         editRow.weight = row.netWeight;
@@ -718,6 +823,9 @@ export default {
       });
     },
     async handlePrint() {
+      const confirmed = await this.showTemplateDialog();
+      if (!confirmed) return;
+      
       this.printCertificateData = this.currentCertificateInfo;
       this.printItemsData = this.certificateItemList || [];
       this.$nextTick(() => {
@@ -725,6 +833,19 @@ export default {
         console.log(el);
         printPdf(el);
       });
+    },
+    showTemplateDialog() {
+      return new Promise((resolve) => {
+        this.templateDialogResolve = resolve;
+        this.templateDialogVisible = true;
+      });
+    },
+    confirmTemplate() {
+      this.templateDialogVisible = false;
+      if (this.templateDialogResolve) {
+        this.templateDialogResolve(true);
+        this.templateDialogResolve = null;
+      }
     }
   }
 };
@@ -899,4 +1020,46 @@ export default {
 ::v-deep .el-table .cell {
   padding: 0;
 }
+
+.template-selection {
+  padding: 20px;
+}
+
+.template-radio-group {
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+}
+
+.template-radio {
+  display: flex;
+  align-items: center;
+  margin: 0;
+  padding: 15px;
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  transition: all 0.3s ease;
+}
+
+.template-radio:hover {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.template-radio.is-checked {
+  border-color: #409eff;
+  background-color: #ecf5ff;
+}
+
+.template-option {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  font-size: 14px;
+}
+
+.template-option i {
+  font-size: 20px;
+  color: #409eff;
+}
 </style>
diff --git a/klp-ui/src/views/mes/qc/certificate/physics.vue b/klp-ui/src/views/mes/qc/certificate/physics.vue
index 4cfd5e183..fa32d86b3 100644
--- a/klp-ui/src/views/mes/qc/certificate/physics.vue
+++ b/klp-ui/src/views/mes/qc/certificate/physics.vue
@@ -65,6 +65,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="镀层表面结构" prop="coatingSurfaceStructure">
+        <el-input
+          v-model="queryParams.coatingSurfaceStructure"
+          placeholder="请输入镀层表面结构"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -135,10 +143,13 @@
       <el-table-column label="屈服强度(MPa)" align="center" prop="yieldStrength" />
       <el-table-column label="抗拉强度(MPa)" align="center" prop="tensileStrength" />
       <el-table-column label="伸长率(%)" align="center" prop="elongation" />
+      <el-table-column label="规定塑性延伸强度(MPa)" align="center" prop="plasticExtensionStrength" />
       <el-table-column label="硬度实验(HRB)" align="center" prop="hardness" />
+      <el-table-column label="镀层重量(g/m²)" align="center" prop="coatingMass" />
       <el-table-column label="弯曲试验" align="center" prop="bendingTest" />
       <el-table-column label="表面质量" align="center" prop="surfaceQuality" />
       <el-table-column label="表面结构" align="center" prop="surfaceStructure" />
+      <el-table-column label="镀层表面结构" align="center" prop="coatingSurfaceStructure" />
       <el-table-column label="边缘状态" align="center" prop="edgeStatus" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -174,11 +185,22 @@
           <el-autocomplete
             v-model="form.coilNo"
             :fetch-suggestions="queryCoilNo"
-            placeholder="请输入入场钢卷号（输入2个字符以上自动搜索）"
+            placeholder="输入入场钢卷号搜索"
             :loading="coilNoLoading"
             :trigger-on-focus="false"
             clearable
           />
+          <el-autocomplete
+            v-model="tempSupplierCoilNo"
+            :fetch-suggestions="querySupplierCoilNo"
+            placeholder="或输入厂家卷号自动匹配"
+            :loading="supplierCoilNoLoading"
+            :trigger-on-focus="false"
+            clearable
+            size="small"
+            @select="handleSelectSupplierCoilNo"
+            style="margin-top: 6px;"
+          />
         </el-form-item>
         <el-form-item label="屈服强度(MPa)" prop="yieldStrength">
           <el-input v-model="form.yieldStrength" placeholder="请输入屈服强度(MPa)" />
@@ -189,9 +211,15 @@
         <el-form-item label="伸长率(%)" prop="elongation">
           <el-input v-model="form.elongation" placeholder="请输入伸长率(%)" />
         </el-form-item>
+        <el-form-item label="规定塑性延伸强度(MPa)" prop="plasticExtensionStrength">
+          <el-input v-model="form.plasticExtensionStrength" placeholder="请输入规定塑性延伸强度(MPa)" />
+        </el-form-item>
         <el-form-item label="硬度实验(HRB)" prop="hardness">
           <el-input v-model="form.hardness" placeholder="请输入硬度实验(HRB)" />
         </el-form-item>
+        <el-form-item label="镀层重量(g/m²)" prop="coatingMass">
+          <el-input v-model="form.coatingMass" placeholder="请输入镀层重量(g/m²)" />
+        </el-form-item>
         <el-form-item label="弯曲试验" prop="bendingTest">
           <el-input v-model="form.bendingTest" placeholder="请输入弯曲试验" />
         </el-form-item>
@@ -201,6 +229,9 @@
         <el-form-item label="表面结构" prop="surfaceStructure">
           <el-input v-model="form.surfaceStructure" placeholder="请输入表面结构" />
         </el-form-item>
+        <el-form-item label="镀层表面结构" prop="coatingSurfaceStructure">
+          <el-input v-model="form.coatingSurfaceStructure" placeholder="请输入镀层表面结构" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -258,23 +289,24 @@
           </div>
         </div>
 
-
-
         <!-- 数据预览表格 -->
         <div v-if="importTableData.length > 0" class="data-preview">
           <el-table ref="importTable" :data="importTableData" border size="small" max-height="340" stripe
             :row-class-name="importTableRowClassName">
             <el-table-column label="#" width="48" type="index" align="center" />
             <el-table-column prop="coilNo" label="入场钢卷号" width="140" />
+            <el-table-column prop="supplierCoilNo" label="厂家卷号" width="120" />
             <el-table-column prop="yieldStrength" label="屈服强度(MPa)" width="110" align="center" />
             <el-table-column prop="tensileStrength" label="抗拉强度(MPa)" width="110" align="center" />
             <el-table-column prop="elongation" label="伸长率(%)" width="80" align="center" />
+            <el-table-column prop="plasticExtensionStrength" label="规定塑性延伸强度(MPa)" width="120" align="center" />
             <el-table-column prop="hardness" label="硬度(HRB)" width="80" align="center" />
+            <el-table-column prop="coatingMass" label="镀层重量(g/m²)" width="100" align="center" />
             <el-table-column prop="bendingTest" label="弯曲试验" width="80" align="center" />
             <el-table-column prop="surfaceQuality" label="表面质量" width="80" align="center" />
             <el-table-column prop="surfaceStructure" label="表面结构" width="80" align="center" />
+            <el-table-column prop="coatingSurfaceStructure" label="镀层表面结构" width="90" align="center" />
             <el-table-column prop="edgeStatus" label="边缘状态" width="80" align="center" />
-
           </el-table>
         </div>
 
@@ -304,9 +336,31 @@
             <div class="result-desc">{{ importErrorMsg }}</div>
           </div>
         </div>
+      </div>
+    </el-dialog>
 
-
-
+    <el-dialog title="选择对应入场卷号" :visible.sync="ambiguousVisible" width="600px" append-to-body :close-on-click-modal="false">
+      <div style="font-size: 12px; color: #909399; margin-bottom: 12px;">
+        厂家卷号匹配到多条入场卷号，请为每行选择对应记录
+      </div>
+      <el-table :data="ambiguousRows" border size="small" max-height="350">
+        <el-table-column label="厂家卷号" prop="supplierCoilNo" width="140" />
+        <el-table-column label="选择入场卷号" min-width="280">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.selected" placeholder="请选择入场卷号" size="small" style="width: 100%;">
+              <el-option
+                v-for="opt in scope.row.options"
+                :key="opt"
+                :label="opt"
+                :value="opt"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmAmbiguous">确 定</el-button>
+        <el-button @click="ambiguousVisible = false">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -320,19 +374,23 @@ import CoilSelector from "@/components/CoilSelector";
 import { listMaterialCoil } from "@/api/wms/coil";
 
 const PHYS_TEMPLATE_HEADERS = [
-  '当前钢卷号', '屈服强度(MPa)', '抗拉强度(MPa)', '伸长率(%)', '硬度(HRB)', '弯曲试验',
-  '表面质量', '表面结构', '边缘状态'
+  '当前钢卷号', '厂家卷号', '屈服强度(MPa)', '抗拉强度(MPa)', '伸长率(%)', '规定塑性延伸强度(MPa)', '硬度(HRB)',
+  '镀层重量(g/m²)', '弯曲试验', '表面质量', '表面结构', '镀层表面结构', '边缘状态'
 ];
 
 const PHYS_HEADER_MAP = {
   '当前钢卷号': 'coilNo',
+  '厂家卷号': 'supplierCoilNo',
   '屈服强度(MPa)': 'yieldStrength',
   '抗拉强度(MPa)': 'tensileStrength',
   '伸长率(%)': 'elongation',
+  '规定塑性延伸强度(MPa)': 'plasticExtensionStrength',
   '硬度(HRB)': 'hardness',
+  '镀层重量(g/m²)': 'coatingMass',
   '弯曲试验': 'bendingTest',
   '表面质量': 'surfaceQuality',
   '表面结构': 'surfaceStructure',
+  '镀层表面结构': 'coatingSurfaceStructure',
   '边缘状态': 'edgeStatus'
 };
 
@@ -372,10 +430,13 @@ export default {
         yieldStrength: undefined,
         tensileStrength: undefined,
         elongation: undefined,
+        plasticExtensionStrength: undefined,
         hardness: undefined,
+        coatingMass: undefined,
         bendingTest: undefined,
         surfaceQuality: undefined,
         surfaceStructure: undefined,
+        coatingSurfaceStructure: undefined,
         edgeStatus: undefined,
       },
       // 表单参数
@@ -400,6 +461,10 @@ export default {
       importLoading: false,
       coilNoOptions: [],
       coilNoLoading: false,
+      tempSupplierCoilNo: '',
+      supplierCoilNoLoading: false,
+      ambiguousVisible: false,
+      ambiguousRows: [],
     };
   },
   created() {
@@ -429,10 +494,13 @@ export default {
         yieldStrength: undefined,
         tensileStrength: undefined,
         elongation: undefined,
+        plasticExtensionStrength: undefined,
         hardness: undefined,
+        coatingMass: undefined,
         bendingTest: undefined,
         surfaceQuality: undefined,
         surfaceStructure: undefined,
+        coatingSurfaceStructure: undefined,
         edgeStatus: undefined,
         remark: undefined,
         delFlag: undefined,
@@ -488,6 +556,34 @@ export default {
         this.coilNoLoading = false;
       });
     },
+    querySupplierCoilNo(queryString, cb) {
+      if (!queryString || queryString.length < 2) {
+        cb([]);
+        return;
+      }
+      this.supplierCoilNoLoading = true;
+      listMaterialCoil({
+        supplierCoilNo: queryString,
+        pageNum: 1,
+        pageSize: 20
+      }).then(response => {
+        const options = (response.rows || []).map(item => ({
+          value: item.supplierCoilNo,
+          label: item.supplierCoilNo,
+          enterCoilNo: item.enterCoilNo
+        }));
+        cb(options);
+      }).finally(() => {
+        this.supplierCoilNoLoading = false;
+      });
+    },
+    handleSelectSupplierCoilNo(item) {
+      if (item.enterCoilNo) {
+        this.form.coilNo = item.enterCoilNo;
+        this.$refs["form"].validateField('coilNo');
+      }
+      this.tempSupplierCoilNo = '';
+    },
     handleBatchAdd(rows) {
       this.loading = true;
       this.buttonLoading = true;
@@ -557,12 +653,89 @@ export default {
       if (!this.importFile || !this.importRawData.length) { this.$message.warning('暂无数据可校验'); return; }
       this.importValidateLoading = true;
       this.importErrorList = [];
-      for (let i = 0; i < this.importRawData.length; i++) {
+      this.ambiguousRows = [];
+      const dataRows = this.importRawData;
+      for (let i = 0; i < dataRows.length; i++) {
         const rowNum = i + 2;
-        let coilNo = '';
-        PHYS_TEMPLATE_HEADERS.forEach((h, j) => { if (PHYS_HEADER_MAP[h] === 'coilNo') coilNo = this.importRawData[i][j]; });
-        if (!coilNo || !String(coilNo).trim()) this.importErrorList.push({ rowNum, errorMsg: '当前钢卷号不能为空' });
+        let coilNo = '', supplierCoilNo = '';
+        PHYS_TEMPLATE_HEADERS.forEach((h, j) => {
+          if (PHYS_HEADER_MAP[h] === 'coilNo') coilNo = dataRows[i][j];
+          if (PHYS_HEADER_MAP[h] === 'supplierCoilNo') supplierCoilNo = dataRows[i][j];
+        });
+        coilNo = String(coilNo || '').trim();
+        supplierCoilNo = String(supplierCoilNo || '').trim();
+        if (!coilNo && !supplierCoilNo) {
+          this.importErrorList.push({ rowNum, errorMsg: '当前钢卷号和厂家卷号不能同时为空' });
+        }
       }
+      // 处理仅填写厂家卷号的行
+      if (this.importErrorList.length === 0) {
+        this.importTableData.forEach((row, idx) => {
+          const cn = (row.coilNo || '').trim();
+          const sn = (row.supplierCoilNo || '').trim();
+          row._sno = sn;
+          row._idx = idx;
+          row._fillCoilNo = cn;
+          if (sn && !cn) row._needMatch = true;
+        });
+        const needMatchRows = this.importTableData.filter(r => r._needMatch);
+        if (needMatchRows.length > 0) {
+          const uniqueSnos = [...new Set(needMatchRows.map(r => r._sno))];
+          const multiMap = {};
+          try {
+            const results = await Promise.all(
+              uniqueSnos.map(sno => listMaterialCoil({ supplierCoilNo: sno, pageNum: 1, pageSize: 50 }))
+            );
+            uniqueSnos.forEach((sno, idx) => {
+              const rows = (results[idx] && results[idx].rows) || [];
+              const enterNos = [...new Set(rows.map(r => r.enterCoilNo).filter(Boolean))];
+              multiMap[sno] = enterNos;
+            });
+          } catch (err) {
+            this.importValidateLoading = false;
+            this.importHandleError('厂家卷号匹配失败：' + err.message);
+            return;
+          }
+          const ambiguousList = [];
+          needMatchRows.forEach(row => {
+            const candidates = multiMap[row._sno] || [];
+            if (candidates.length === 0) {
+              this.importErrorList.push({ rowNum: (row.rowNum || (row._idx + 2)), errorMsg: `厂家卷号"${row._sno}"未匹配到入场卷号` });
+            } else if (candidates.length === 1) {
+              row.coilNo = candidates[0];
+            } else {
+              ambiguousList.push({
+                _idx: row._idx,
+                supplierCoilNo: row._sno,
+                options: candidates,
+                selected: null
+              });
+            }
+          });
+          if (ambiguousList.length > 0) {
+            this.ambiguousRows = ambiguousList;
+            this.importValidateLoading = false;
+            this.ambiguousVisible = true;
+            return;
+          }
+        }
+      }
+      this.finishValidation();
+    },
+    confirmAmbiguous() {
+      const unselected = this.ambiguousRows.filter(r => !r.selected);
+      if (unselected.length > 0) {
+        this.$message.warning('请为所有行选择入场卷号');
+        return;
+      }
+      this.ambiguousRows.forEach(item => {
+        this.importTableData[item._idx].coilNo = item.selected;
+      });
+      this.ambiguousVisible = false;
+      this.importValidateLoading = true;
+      this.finishValidation();
+    },
+    finishValidation() {
       if (this.importErrorList.length > 0) {
         this.$message.error(`数据校验失败，共发现${this.importErrorList.length}条错误`);
       } else {
@@ -585,7 +758,7 @@ export default {
       try {
         const payload = rows.map(row => {
           const item = { coilId: null, coilNo: row.coilNo };
-          ['yieldStrength','tensileStrength','elongation','hardness','bendingTest','surfaceQuality','surfaceStructure','edgeStatus'].forEach(f => { if (row[f]) item[f] = row[f]; });
+          ['yieldStrength','tensileStrength','elongation','plasticExtensionStrength','hardness','coatingMass','bendingTest','surfaceQuality','surfaceStructure','coatingSurfaceStructure','edgeStatus'].forEach(f => { if (row[f]) item[f] = row[f]; });
           return item;
         });
         const addRes = await batchAddPhysicalItem(payload);
@@ -615,10 +788,10 @@ export default {
       this.$refs.importUpload?.clearFiles();
     },
     importDownloadTemplate() {
-      const data = [PHYS_TEMPLATE_HEADERS, ['示例卷号', '300', '420', '35', '85', '合格', '良好', '光面', '良好']];
+      const data = [PHYS_TEMPLATE_HEADERS, ['示例卷号', '示例厂家卷号', '300', '420', '35', '260', '85', '275', '合格', '良好', '光面', '无锌花', '良好']];
       const wb = XLSX.utils.book_new();
       const ws = XLSX.utils.aoa_to_sheet(data);
-      ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 10 }];
+      ws['!cols'] = [{ wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 16 }, { wch: 10 }, { wch: 20 }, { wch: 10 }, { wch: 16 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 12 }, { wch: 10 }];
       XLSX.utils.book_append_sheet(wb, ws, '导入模板');
       XLSX.writeFile(wb, '物理性能导入模板.xlsx');
     },
diff --git a/klp-ui/src/views/mes/qc/inspection/task.vue b/klp-ui/src/views/mes/qc/inspection/task.vue
index b2c67be53..4c15fa848 100644
--- a/klp-ui/src/views/mes/qc/inspection/task.vue
+++ b/klp-ui/src/views/mes/qc/inspection/task.vue
@@ -75,6 +75,7 @@
       <el-table-column label="任务编号" align="center" prop="taskCode" />
       <el-table-column label="任务类型" align="center" prop="taskType" />
       <el-table-column label="入场卷号" align="center" prop="enterCoilNos" />
+      <el-table-column label="厂家卷号" align="center" prop="supplierCoilNos" />
       <el-table-column label="所属单位" align="center" prop="belongCompany" />
       <el-table-column label="方案名称" align="center" prop="schemeName" />
       <el-table-column label="状态" align="center" prop="status" width="90">
@@ -258,27 +259,57 @@
             <el-option label="产品检验" value="产品检验" />
           </el-select>
         </el-form-item>
-        <el-form-item label="入场卷号" prop="enterCoilNos" v-if="taskForm.taskType === '产品检验'">
-          <div style="display: flex; flex-wrap: wrap; gap: 8px; margin-bottom: 8px;">
-            <el-tag
-              v-for="(coilNo, index) in selectedEnterCoilNos"
-              :key="index"
-              closable
-              @close="removeEnterCoilNo(index)"
-            >
-              {{ coilNo }}
-            </el-tag>
+        <template v-if="taskForm.taskType === '产品检验'">
+          <div style="background: #f5f7fa; border: 1px solid #e4e7ed; border-radius: 6px; padding: 12px 16px 8px 16px; margin-bottom: 18px;">
+            <div style="font-size: 12px; color: #909399; margin-bottom: 8px; line-height: 1.6;">
+              <i class="el-icon-info" style="margin-right: 4px;"></i>
+              可输入入场卷号或厂家卷号，两者互通匹配
+            </div>
+            <el-form-item label="入场卷号" prop="enterCoilNos">
+              <div style="display: flex; flex-wrap: wrap; gap: 8px; margin-bottom: 8px;">
+                <el-tag
+                  v-for="(coilNo, index) in selectedEnterCoilNos"
+                  :key="index"
+                  closable
+                  @close="removeEnterCoilNo(index)"
+                >
+                  {{ coilNo }}
+                </el-tag>
+              </div>
+              <el-autocomplete
+                v-model="tempEnterCoilNo"
+                :fetch-suggestions="queryEnterCoilNo"
+                placeholder="输入入场卷号搜索添加"
+                :loading="enterCoilNoLoading"
+                :trigger-on-focus="false"
+                clearable
+                @select="handleSelectEnterCoilNo"
+              />
+              <div style="display: flex; flex-wrap: wrap; gap: 8px; margin-top: 10px;" v-if="selectedSupplierCoilNos.length > 0">
+                <el-tag
+                  v-for="(coilNo, index) in selectedSupplierCoilNos"
+                  :key="'s-' + index"
+                  type="info"
+                  closable
+                  @close="removeSupplierCoilNo(index)"
+                >
+                  {{ coilNo }}
+                </el-tag>
+              </div>
+              <el-autocomplete
+                v-model="tempSupplierCoilNo"
+                :fetch-suggestions="querySupplierCoilNo"
+                placeholder="或输入厂家卷号自动匹配"
+                :loading="supplierCoilNoLoading"
+                :trigger-on-focus="false"
+                clearable
+                size="small"
+                @select="handleSelectSupplierCoilNo"
+                style="margin-top: 6px;"
+              />
+            </el-form-item>
           </div>
-          <el-autocomplete
-            v-model="tempEnterCoilNo"
-            :fetch-suggestions="queryEnterCoilNo"
-            placeholder="2个字符以上自动搜索"
-            :loading="enterCoilNoLoading"
-            :trigger-on-focus="false"
-            clearable
-            @select="handleSelectEnterCoilNo"
-          />
-        </el-form-item>
+        </template>
         <el-form-item label="所属单位" prop="belongCompany">
           <el-input v-model="taskForm.belongCompany" placeholder="请输入所属单位" />
         </el-form-item>
@@ -488,6 +519,9 @@ export default {
       enterCoilNoLoading: false,
       selectedEnterCoilNos: [],
       tempEnterCoilNo: '',
+      selectedSupplierCoilNos: [],
+      tempSupplierCoilNo: '',
+      supplierCoilNoLoading: false,
       attachmentOpen: false,
       attachmentTitle: '',
       attachmentLoading: false,
@@ -558,6 +592,8 @@ export default {
       this.resetTaskForm();
       this.selectedEnterCoilNos = [];
       this.tempEnterCoilNo = '';
+      this.selectedSupplierCoilNos = [];
+      this.tempSupplierCoilNo = '';
       this.taskOpen = true;
       this.taskTitle = "添加检验任务";
     },
@@ -581,6 +617,13 @@ export default {
           this.selectedEnterCoilNos = [];
         }
         this.tempEnterCoilNo = '';
+        // 初始化已选择的厂家卷号
+        if (response.data.supplierCoilNos) {
+          this.selectedSupplierCoilNos = response.data.supplierCoilNos.split(',').filter(item => item.trim());
+        } else {
+          this.selectedSupplierCoilNos = [];
+        }
+        this.tempSupplierCoilNo = '';
         this.taskLoading = false;
         this.taskOpen = true;
         this.taskTitle = "修改检验任务";
@@ -636,7 +679,7 @@ export default {
     handleQuickCreate() {
       this.schemeVisible = true;
     },
-    handleSchemeConfirm({ template, taskCode, taskType, belongCompany, coilIds, enterCoilNos }) {
+    handleSchemeConfirm({ template, taskCode, taskType, belongCompany, coilIds, enterCoilNos, supplierCoilNos }) {
       this.taskLoading = true;
       addInspectionTaskWithItems({
         taskCode: taskCode,
@@ -645,7 +688,8 @@ export default {
         belongCompany: belongCompany,
         taskType: taskType,
         coilIds: coilIds || undefined,
-        enterCoilNos: enterCoilNos || undefined
+        enterCoilNos: enterCoilNos || undefined,
+        supplierCoilNos: supplierCoilNos || undefined
       }).then(() => {
         this.$modal.msgSuccess("快捷创建成功");
         this.getTaskList();
@@ -757,6 +801,43 @@ export default {
       this.selectedEnterCoilNos.splice(index, 1);
       this.taskForm.enterCoilNos = this.selectedEnterCoilNos.join(',');
     },
+    querySupplierCoilNo(queryString, cb) {
+      if (!queryString || queryString.length < 2) {
+        cb([]);
+        return;
+      }
+      this.supplierCoilNoLoading = true;
+      listMaterialCoil({
+        supplierCoilNo: queryString,
+        pageNum: 1,
+        pageSize: 20
+      }).then(response => {
+        const options = (response.rows || []).map(item => ({
+          value: item.supplierCoilNo,
+          label: item.supplierCoilNo,
+          enterCoilNo: item.enterCoilNo
+        })).filter(opt => !this.selectedSupplierCoilNos.includes(opt.value));
+        cb(options);
+      }).finally(() => {
+        this.supplierCoilNoLoading = false;
+      });
+    },
+    handleSelectSupplierCoilNo(item) {
+      if (!this.selectedSupplierCoilNos.includes(item.value)) {
+        this.selectedSupplierCoilNos.push(item.value);
+      }
+      this.taskForm.supplierCoilNos = this.selectedSupplierCoilNos.join(',');
+      if (item.enterCoilNo && !this.selectedEnterCoilNos.includes(item.enterCoilNo)) {
+        this.selectedEnterCoilNos.push(item.enterCoilNo);
+        this.taskForm.enterCoilNos = this.selectedEnterCoilNos.join(',');
+        this.$refs["taskForm"].validateField('enterCoilNos');
+      }
+      this.tempSupplierCoilNo = '';
+    },
+    removeSupplierCoilNo(index) {
+      this.selectedSupplierCoilNos.splice(index, 1);
+      this.taskForm.supplierCoilNos = this.selectedSupplierCoilNos.join(',');
+    },
     cancelTask() {
       this.taskOpen = false;
       this.resetTaskForm();
@@ -787,6 +868,8 @@ export default {
       this.taskCoilList = [];
       this.selectedEnterCoilNos = [];
       this.tempEnterCoilNo = '';
+      this.selectedSupplierCoilNos = [];
+      this.tempSupplierCoilNo = '';
       this.resetForm("taskForm");
     },
 
diff --git a/klp-ui/src/views/mes/roll/grind/index.vue b/klp-ui/src/views/mes/roll/grind/index.vue
index 51d66b9a2..3eb14b49d 100644
--- a/klp-ui/src/views/mes/roll/grind/index.vue
+++ b/klp-ui/src/views/mes/roll/grind/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container grind-page">
     <div class="grind-layout">
 
-      <!-- ── 产线 Tab 列 ── -->
+      <!-- ── 左侧：产线 Tab ── -->
       <div class="line-tabs">
         <div
           :class="['lt-item', filterLineId === null ? 'lt-item--active' : '']"
@@ -16,230 +16,425 @@
         >{{ l.lineName }}</div>
       </div>
 
-      <!-- ── 轧辊列表 ── -->
-      <div class="grind-left">
-        <el-card shadow="never" class="grind-card h-full">
-          <div slot="header" class="card-header">
-            <span class="card-title"><i class="el-icon-s-order" /> 轧辊列表</span>
+      <!-- ── 右侧主体 ── -->
+      <div class="grind-main">
+        <!-- 顶部检索栏 -->
+        <div class="search-bar">
+          <el-input
+            v-model="filterNo"
+            size="small"
+            placeholder="辊号检索"
+            prefix-icon="el-icon-search"
+            clearable
+            style="width:180px"
+            @input="filterRolls"
+          />
+          <el-radio-group v-model="filterType" size="small" @change="filterRolls">
+            <el-radio-button label="">全部类型</el-radio-button>
+            <el-radio-button label="WR">WR</el-radio-button>
+            <el-radio-button label="BR">BR</el-radio-button>
+            <el-radio-button label="CR">CR</el-radio-button>
+          </el-radio-group>
+          <el-radio-group v-model="filterManufacturer" size="small" @change="filterRolls">
+            <el-radio-button label="">全部厂家</el-radio-button>
+            <el-radio-button v-for="mfr in manufacturerOptions" :key="mfr" :label="mfr">{{ mfr }}</el-radio-button>
+          </el-radio-group>
+        </div>
+
+        <!-- 下方：左右布局 -->
+        <div class="content-area">
+          <!-- 左侧：轧辊列表 -->
+          <div class="roll-list-panel">
+            <el-card shadow="never" class="panel-card">
+              <div slot="header" class="card-header">
+                <span class="card-title"><i class="el-icon-s-order" /> 轧辊列表</span>
+                <span class="card-count">{{ filteredRolls.length }}</span>
+                <el-button size="mini" type="text" icon="el-icon-plus" style="margin-left:auto" @click="handleAddRoll">新增轧辊</el-button>
+              </div>
+              <div v-loading="rollLoading" class="roll-list">
+                <div
+                  v-for="r in filteredRolls"
+                  :key="r.rollId"
+                  :class="['roll-item', selectedRollId === r.rollId ? 'roll-item--active' : '']"
+                  @click="selectRoll(r)"
+                >
+                  <div class="ri-no">{{ r.rollNo }}</div>
+                  <div class="ri-meta">
+                    <el-tag size="mini" :type="r.rollType === 'WR' ? 'primary' : 'warning'">{{ r.rollType }}</el-tag>
+                    <span :class="['ri-status', 'st-' + r.status]">{{ statusLabel(r.status) }}</span>
+                    <span class="ri-dia">φ{{ r.currentDia != null ? r.currentDia : r.initialDia }}</span>
+                  </div>
+                  <div v-if="r.manufacturer" class="ri-manufacturer">{{ r.manufacturer }}</div>
+                  <div v-if="filterLineId === null && r.lineName" class="ri-line">{{ r.lineName }}</div>
+                </div>
+                <div v-if="!rollLoading && filteredRolls.length === 0" class="roll-empty">暂无数据</div>
+              </div>
+            </el-card>
           </div>
 
-          <!-- 搜索过滤 -->
-          <div class="roll-filter">
-            <el-input v-model="filterNo" size="small" placeholder="编号搜索" prefix-icon="el-icon-search"
-              clearable @input="filterRolls" style="margin-bottom:8px" />
-            <el-radio-group v-model="filterType" size="small" @change="filterRolls" style="margin-bottom:8px">
-              <el-radio-button label="">全部</el-radio-button>
-              <el-radio-button label="WR">WR</el-radio-button>
-              <el-radio-button label="BR">BR</el-radio-button>
-            </el-radio-group>
+          <!-- 右侧：明细 & 磨削台账 -->
+          <div v-loading="grindLoading" class="detail-panel">
+            <template v-if="!selectedRoll">
+              <div class="grind-empty"><i class="el-icon-arrow-left" /> 请从左侧选择一个轧辊</div>
+            </template>
+
+            <template v-else>
+              <!-- 轧辊基本信息 -->
+              <el-card shadow="never" class="detail-card" style="margin-bottom:10px">
+                <div slot="header" class="card-header">
+                  <span class="card-title"><i class="el-icon-info" /> 轧辊明细</span>
+                  <el-button size="mini" type="text" icon="el-icon-edit" style="margin-left:auto" @click="handleEditRoll(selectedRoll)">修改</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" style="color:#c5221f" @click="handleDelRoll(selectedRoll)">删除</el-button>
+                </div>
+                <div class="roll-header-grid">
+                  <div class="rh-item"><span class="rh-k">轧辊编号</span><span class="rh-v bold">{{ selectedRoll.rollNo }}</span></div>
+                  <div class="rh-item"><span class="rh-k">辊型</span><span class="rh-v">{{ { WR: '工作辊', BR: '支撑辊', CR: '中间辊' }[selectedRoll.rollType] || '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">材质</span><span class="rh-v">{{ selectedRoll.material || '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">初始辊径</span><span class="rh-v">{{ selectedRoll.initialDia != null ? selectedRoll.initialDia + ' mm' : '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">当前辊径</span><span class="rh-v bold accent">{{ effectiveCurrentDia != null ? effectiveCurrentDia + ' mm' : '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">最小辊径</span><span class="rh-v">{{ selectedRoll.minDia != null ? selectedRoll.minDia + ' mm' : '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">磨削次数</span><span class="rh-v">{{ tableData.length ? tableData.length + ' 次' : '0 次' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">粗糙度</span><span class="rh-v">{{ selectedRoll.roughness != null ? selectedRoll.roughness + ' μm' : '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">凸度</span><span class="rh-v">{{ selectedRoll.crown != null ? selectedRoll.crown + ' mm' : '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">状态</span>
+                    <span :class="['rh-v', 'st-' + selectedRoll.status]">{{ statusLabel(selectedRoll.status) }}</span>
+                  </div>
+                  <div class="rh-item"><span class="rh-k">制造日期</span><span class="rh-v">{{ selectedRoll.manufactureDate || '—' }}</span></div>
+                  <div class="rh-item"><span class="rh-k">备注</span><span class="rh-v">{{ selectedRoll.remark || '—' }}</span></div>
+                </div>
+              </el-card>
+
+              <!-- 磨削台账 -->
+              <el-card shadow="never" class="detail-card" body-style="padding:10px;overflow:auto">
+                <div slot="header" class="card-header">
+                  <span class="card-title"><i class="el-icon-document" /> 磨削台账</span>
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    icon="el-icon-plus"
+                    style="margin-left:auto"
+                    :disabled="!!editRow"
+                    @click="startAdd"
+                  >新增磨削记录</el-button>
+                </div>
+
+                <el-table
+                  :data="tableData"
+                  size="small"
+                  border
+                  style="width:100%"
+                  :row-class-name="rowClassName"
+                >
+                  <el-table-column label="序号" type="index" width="46" align="center" />
+
+                  <el-table-column label="磨削时间" align="center" width="200">
+                    <template slot-scope="{row}">
+                      <el-date-picker
+                        v-if="isEditing(row)"
+                        v-model="editRow.grindTime"
+                        type="datetime"
+                        size="mini"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        style="width:182px"
+                        placeholder="请选择"
+                      />
+                      <span v-else>{{ row.grindTime }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="班组" align="center" width="100">
+                    <template slot-scope="{row}">
+                      <el-select
+                        v-if="isEditing(row)"
+                        v-model="editRow.team"
+                        size="mini"
+                        placeholder="班组"
+                        clearable
+                        filterable
+                        allow-create
+                      >
+                        <el-option label="甲班" value="甲班" />
+                        <el-option label="乙班" value="乙班" />
+                      </el-select>
+                      <span v-else>{{ row.team || '—' }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="磨前径(mm)" align="center" width="100">
+                    <template slot-scope="{row}">
+                      <el-input
+                        v-if="isEditing(row)"
+                        v-model="editRow.diaBefore"
+                        size="mini"
+                        style="width:80px"
+                      />
+                      <span v-else>{{ row.diaBefore }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="磨后径(mm)" align="center" width="100">
+                    <template slot-scope="{row}">
+                      <el-input
+                        v-if="isEditing(row)"
+                        v-model="editRow.diaAfter"
+                        size="mini"
+                        style="width:80px"
+                      />
+                      <span v-else>{{ row.diaAfter }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="磨削量(mm)" align="center" width="88">
+                    <template slot-scope="{row}">
+                      <span v-if="isEditing(row)" class="computed-val">
+                        {{ grindAmountOf(editRow) }}
+                      </span>
+                      <span v-else>{{ row.grindAmount }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="辊型" align="center" width="100">
+                    <template slot-scope="{row}">
+                      <el-select
+                        v-if="isEditing(row)"
+                        v-model="editRow.rollShape"
+                        size="mini"
+                        style="width:84px"
+                      >
+                        <el-option label="平" value="平" />
+                        <el-option label="凸" value="凸" />
+                        <el-option label="凹" value="凹" />
+                      </el-select>
+                      <span v-else>{{ row.rollShape || '—' }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="探伤结果" align="center" width="110">
+                    <template slot-scope="{row}">
+                      <el-select
+                        v-if="isEditing(row)"
+                        v-model="editRow.flawResult"
+                        size="mini"
+                        style="width:94px"
+                      >
+                        <el-option label="合格" value="合格" />
+                        <el-option label="不合格" value="不合格" />
+                      </el-select>
+                      <el-tag v-else size="mini" :type="row.flawResult === '合格' ? 'success' : 'danger'">
+                        {{ row.flawResult || '—' }}
+                      </el-tag>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="硬度" align="center" width="80">
+                    <template slot-scope="{row}">
+                      <el-input
+                        v-if="isEditing(row)"
+                        v-model.number="editRow.hardness"
+                        type="number"
+                        size="mini"
+                        style="width:64px"
+                      />
+                      <span v-else>{{ row.hardness || '—' }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="操作者" align="center" width="140">
+                    <template slot-scope="{row}">
+                      <el-select
+                        v-if="isEditing(row)"
+                        v-model="editRow.operator"
+                        size="mini"
+                        placeholder="选填"
+                        clearable
+                        filterable
+                        allow-create
+                      >
+                        <el-option
+                          v-for="item in dict.type.mes_roll_operator"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                      <span v-else class="remark-text">{{ row.operator || '' }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="备注" align="left" width="120">
+                    <template slot-scope="{row}">
+                      <el-input
+                        v-if="isEditing(row)"
+                        v-model="editRow.remark"
+                        size="mini"
+                        placeholder="选填"
+                      />
+                      <span v-else class="remark-text">{{ row.remark || '' }}</span>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="操作" align="center" width="100" fixed="right">
+                    <template slot-scope="{row}">
+                      <template v-if="isEditing(row)">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-check"
+                          :loading="grindSaving"
+                          @click="saveRow"
+                        >保存</el-button>
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-close"
+                          style="color:#909399"
+                          @click="cancelEdit"
+                        >取消</el-button>
+                      </template>
+                      <template v-else>
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-edit"
+                          :disabled="!!editRow"
+                          @click="startEdit(row)"
+                        >修改</el-button>
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-delete"
+                          style="color:#c5221f"
+                          :disabled="!!editRow"
+                          @click="handleDelete(row)"
+                        >删除</el-button>
+                      </template>
+                    </template>
+                  </el-table-column>
+                </el-table>
+
+                <!-- 月度汇总 -->
+                <div v-if="grindList.length > 0" class="monthly-wrap">
+                  <div class="monthly-title">
+                    <span>{{ currentYear }} 年月度汇总</span>
+                    <el-button-group size="mini" style="margin-left:8px">
+                      <el-button icon="el-icon-arrow-left" @click="changeYear(-1)" />
+                      <el-button icon="el-icon-arrow-right" @click="changeYear(1)" />
+                    </el-button-group>
+                  </div>
+                  <el-table :data="monthlyList" size="mini" border style="width:100%;margin-top:8px">
+                    <el-table-column label="月份" prop="month" align="center" width="90" />
+                    <el-table-column label="磨削次数" prop="grindCount" align="center" width="90" />
+                    <el-table-column label="累计磨削量(mm)" prop="totalGrindAmount" align="center" min-width="120" />
+                  </el-table>
+                </div>
+              </el-card>
+            </template>
           </div>
-
-          <div v-loading="rollLoading" class="roll-list">
-            <div
-              v-for="r in filteredRolls"
-              :key="r.rollId"
-              :class="['roll-item', selectedRollId === r.rollId ? 'roll-item--active' : '']"
-              @click="selectRoll(r)"
-            >
-              <div class="ri-no">{{ r.rollNo }}</div>
-              <div class="ri-meta">
-                <el-tag size="mini" :type="r.rollType === 'WR' ? 'primary' : 'warning'">{{ r.rollType }}</el-tag>
-                <span :class="['ri-status', 'st-' + r.status]">{{ statusLabel(r.status) }}</span>
-                <span class="ri-dia">φ{{ r.currentDia != null ? r.currentDia : r.initialDia }}</span>
-              </div>
-              <div v-if="filterLineId === null && r.lineName" class="ri-line">{{ r.lineName }}</div>
-            </div>
-            <div v-if="!rollLoading && filteredRolls.length === 0" class="roll-empty">暂无数据</div>
-          </div>
-        </el-card>
-      </div>
-
-      <!-- ── 右侧：台账 ── -->
-      <div class="grind-right">
-        <template v-if="!selectedRoll">
-          <div class="grind-empty"><i class="el-icon-arrow-left" /> 请从左侧选择一个轧辊</div>
-        </template>
-
-        <template v-else>
-          <!-- 轧辊基本信息头 -->
-          <el-card shadow="never" class="grind-card" style="margin-bottom:12px">
-            <div class="roll-header-grid">
-              <div class="rh-item"><span class="rh-k">轧辊编号</span><span class="rh-v bold">{{ selectedRoll.rollNo }}</span></div>
-              <div class="rh-item"><span class="rh-k">辊型</span><span class="rh-v">{{ selectedRoll.rollType === 'WR' ? '工作辊' : '支撑辊' }}</span></div>
-              <div class="rh-item"><span class="rh-k">材质</span><span class="rh-v">{{ selectedRoll.material || '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">初始辊径</span><span class="rh-v">{{ selectedRoll.initialDia != null ? selectedRoll.initialDia + ' mm' : '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">当前辊径</span><span class="rh-v bold accent">{{ effectiveCurrentDia != null ? effectiveCurrentDia + ' mm' : '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">最小辊径</span><span class="rh-v">{{ selectedRoll.minDia != null ? selectedRoll.minDia + ' mm' : '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">磨削次数</span><span class="rh-v">{{ tableData.length ? tableData.length + ' 次' : '0 次' }}</span></div>
-              <div class="rh-item"><span class="rh-k">粗糙度</span><span class="rh-v">{{ selectedRoll.roughness != null ? selectedRoll.roughness + ' μm' : '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">凸度</span><span class="rh-v">{{ selectedRoll.crown != null ? selectedRoll.crown + ' mm' : '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">状态</span>
-                <span :class="['rh-v', 'st-' + selectedRoll.status]">{{ statusLabel(selectedRoll.status) }}</span>
-              </div>
-              <div class="rh-item"><span class="rh-k">制造日期</span><span class="rh-v">{{ selectedRoll.manufactureDate || '—' }}</span></div>
-              <div class="rh-item"><span class="rh-k">备注</span><span class="rh-v">{{ selectedRoll.remark || '—' }}</span></div>
-            </div>
-          </el-card>
-
-          <!-- 磨削台账：行内编辑 -->
-          <el-card shadow="never" class="grind-card">
-            <div slot="header" class="card-header">
-              <span class="card-title"><i class="el-icon-document" /> 磨削台账</span>
-              <el-button type="primary" size="mini" icon="el-icon-plus"
-                style="margin-left:auto" :disabled="!!editRow" @click="startAdd">新增磨削记录</el-button>
-            </div>
-
-            <el-table v-loading="grindLoading" :data="tableData" size="small" border
-              style="width:100%" :row-class-name="rowClassName">
-              <el-table-column label="序号" type="index" width="46" align="center" />
-
-              <!-- 磨削时间 -->
-              <el-table-column label="磨削时间" align="center" width="200">
-                <template slot-scope="{row}">
-                  <el-date-picker v-if="isEditing(row)" v-model="editRow.grindTime"
-                    type="datetime" size="mini" value-format="yyyy-MM-dd HH:mm:ss"
-                    style="width:182px" placeholder="请选择" />
-                  <span v-else>{{ row.grindTime }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 班组 -->
-              <el-table-column label="班组" align="center" width="80">
-                <template slot-scope="{row}">
-                  <el-input v-if="isEditing(row)" v-model="editRow.team"
-                    size="mini" placeholder="甲班" style="width:64px" />
-                  <span v-else>{{ row.team || '—' }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 磨前直径 -->
-              <el-table-column label="磨前径(mm)" align="center" width="100">
-                <template slot-scope="{row}">
-                  <el-input v-if="isEditing(row)" v-model.number="editRow.diaBefore"
-                    type="number" size="mini" style="width:80px" />
-                  <span v-else>{{ row.diaBefore }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 磨后直径 -->
-              <el-table-column label="磨后径(mm)" align="center" width="100">
-                <template slot-scope="{row}">
-                  <el-input v-if="isEditing(row)" v-model.number="editRow.diaAfter"
-                    type="number" size="mini" style="width:80px" />
-                  <span v-else>{{ row.diaAfter }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 磨削量（只读计算） -->
-              <el-table-column label="磨削量(mm)" align="center" width="88">
-                <template slot-scope="{row}">
-                  <span v-if="isEditing(row)" class="computed-val">
-                    {{ grindAmountOf(editRow) }}
-                  </span>
-                  <span v-else>{{ row.grindAmount }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 辊型 -->
-              <el-table-column label="辊型" align="center" width="100">
-                <template slot-scope="{row}">
-                  <el-select v-if="isEditing(row)" v-model="editRow.rollShape"
-                    size="mini" style="width:84px">
-                    <el-option label="平" value="平" />
-                    <el-option label="凸" value="凸" />
-                    <el-option label="凹" value="凹" />
-                  </el-select>
-                  <span v-else>{{ row.rollShape || '—' }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 探伤结果 -->
-              <el-table-column label="探伤结果" align="center" width="110">
-                <template slot-scope="{row}">
-                  <el-select v-if="isEditing(row)" v-model="editRow.flawResult"
-                    size="mini" style="width:94px">
-                    <el-option label="合格" value="合格" />
-                    <el-option label="不合格" value="不合格" />
-                  </el-select>
-                  <el-tag v-else size="mini" :type="row.flawResult === '合格' ? 'success' : 'danger'">
-                    {{ row.flawResult || '—' }}
-                  </el-tag>
-                </template>
-              </el-table-column>
-
-              <!-- 硬度 -->
-              <el-table-column label="硬度" align="center" width="80">
-                <template slot-scope="{row}">
-                  <el-input v-if="isEditing(row)" v-model.number="editRow.hardness"
-                    type="number" size="mini" style="width:64px" />
-                  <span v-else>{{ row.hardness || '—' }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 操作者（自动填入，仅展示） -->
-              <el-table-column label="操作者" align="center" width="100">
-                <template slot-scope="{row}">
-                  <el-input v-if="isEditing(row)" v-model="editRow.operator"
-                    size="mini" placeholder="选填" />
-                  <span v-else class="remark-text">{{ row.operator || '' }}</span>
-                  <!-- <span :class="isEditing(row) ? 'auto-operator' : ''">
-                    {{ isEditing(row) ? currentUserName : (row.operator || '—') }}
-                  </span> -->
-                </template>
-              </el-table-column>
-
-              <!-- 备注 -->
-              <el-table-column label="备注" align="left" width="120">
-                <template slot-scope="{row}">
-                  <el-input v-if="isEditing(row)" v-model="editRow.remark"
-                    size="mini" placeholder="选填" />
-                  <span v-else class="remark-text">{{ row.remark || '' }}</span>
-                </template>
-              </el-table-column>
-
-              <!-- 操作列 -->
-              <el-table-column label="操作" align="center" width="100" fixed="right">
-                <template slot-scope="{row}">
-                  <template v-if="isEditing(row)">
-                    <el-button size="mini" type="text" icon="el-icon-check"
-                      :loading="grindSaving" @click="saveRow">保存</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-close"
-                      style="color:#909399" @click="cancelEdit">取消</el-button>
-                  </template>
-                  <template v-else>
-                    <el-button size="mini" type="text" icon="el-icon-edit"
-                      :disabled="!!editRow" @click="startEdit(row)">修改</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-delete"
-                      style="color:#c5221f" :disabled="!!editRow" @click="handleDelete(row)">删除</el-button>
-                  </template>
-                </template>
-              </el-table-column>
-            </el-table>
-
-            <!-- 月度汇总 -->
-            <div class="monthly-wrap" v-if="grindList.length > 0">
-              <div class="monthly-title">
-                <span>{{ currentYear }} 年月度汇总</span>
-                <el-button-group size="mini" style="margin-left:8px">
-                  <el-button icon="el-icon-arrow-left" @click="changeYear(-1)" />
-                  <el-button icon="el-icon-arrow-right" @click="changeYear(1)" />
-                </el-button-group>
-              </div>
-              <el-table :data="monthlyList" size="mini" border style="width:100%;margin-top:8px">
-                <el-table-column label="月份" prop="month" align="center" width="90" />
-                <el-table-column label="磨削次数" prop="grindCount" align="center" width="90" />
-                <el-table-column label="累计磨削量(mm)" prop="totalGrindAmount" align="center" min-width="120" />
-              </el-table>
-            </div>
-          </el-card>
-        </template>
+        </div>
       </div>
     </div>
+
+    <!-- 轧辊新增/修改对话框 -->
+    <el-dialog
+      :title="rollFormTitle"
+      :visible.sync="rollFormOpen"
+      width="600px"
+      append-to-body
+      :close-on-click-modal="false"
+      @close="resetRollForm"
+    >
+      <el-form ref="rollForm" :model="rollForm" :rules="rollFormRules" label-width="60px" size="small">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="所属产线" prop="lineId">
+              <el-select v-model="rollForm.lineId" placeholder="请选择产线" style="width:100%" clearable>
+                <el-option v-for="l in productionLines" :key="l.lineId" :label="l.lineName" :value="l.lineId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="辊编号" prop="rollNo">
+              <el-input v-model="rollForm.rollNo" placeholder="请输入轧辊编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="辊型" prop="rollType">
+              <el-select v-model="rollForm.rollType" placeholder="请选择辊型" style="width:100%">
+                <el-option label="工作辊 WR" value="WR" />
+                <el-option label="支撑辊 BR" value="BR" />
+                <el-option label="中间辊 CR" value="CR" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="厂家" prop="manufacturer">
+              <el-input v-model="rollForm.manufacturer" placeholder="请输入厂家" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="8">
+            <el-form-item label="初始直径" prop="initialDia">
+              <el-input v-model="rollForm.initialDia" type="number" style="width:100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="当前直径" prop="currentDia">
+              <el-input v-model="rollForm.currentDia" type="number" style="width:100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="最小直径" prop="minDia">
+              <el-input v-model="rollForm.minDia" type="number" style="width:100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="8">
+            <el-form-item label="材质" prop="material">
+              <el-input v-model="rollForm.material" placeholder="材质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="粗糙度" prop="roughness">
+              <el-input v-model="rollForm.roughness" type="number" style="width:100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="凸度" prop="crown">
+              <el-input v-model="rollForm.crown" type="number" style="width:100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="制造日期" prop="manufactureDate">
+              <el-date-picker
+                v-model="rollForm.manufactureDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择制造日期"
+                style="width:100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="rollForm.remark" type="textarea" :rows="2" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="submitRollForm">确 定</el-button>
+        <el-button size="small" @click="rollFormOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listRollInfo, getRollInfo } from '@/api/mes/roll/rollInfo'
+import { listRollInfo, getRollInfo, addRollInfo, updateRollInfo, delRollInfo } from '@/api/mes/roll/rollInfo'
 import { listRollGrind, addRollGrind, updateRollGrind, delRollGrind, getMonthlyStats } from '@/api/mes/roll/rollGrind'
 import { listProductionLine } from '@/api/wms/productionLine'
 import rollLineMixin from '../rollLineMixin'
@@ -247,46 +442,47 @@ import rollLineMixin from '../rollLineMixin'
 export default {
   name: 'GrindRoom',
   mixins: [rollLineMixin],
+  dicts: ['mes_roll_operator'],
   data() {
     return {
-      // 产线列表
       productionLines: [],
       filterLineId: null,
-      lineTabOrder: [],   // 本地记录的点击顺序（最近点过的在前）
+      lineTabOrder: [],
 
-      // 左侧辊列表
       rollLoading: false,
       allRolls: [],
       filteredRolls: [],
       filterNo: '',
       filterType: '',
+      filterManufacturer: '',
 
-      // 右侧选中辊
       selectedRollId: null,
       selectedRoll: null,
 
-      // 磨削记录
       grindLoading: false,
       grindList: [],
 
-      // 月度汇总
       currentYear: new Date().getFullYear(),
       monthlyList: [],
 
-      // 行内编辑：editRow 不为 null 时表示当前正在编辑/新增的行数据
-      // __isNew: true  → 新增行；存在 grindId → 修改行
       editRow: null,
-      grindSaving: false
+      grindSaving: false,
+
+      rollFormOpen: false,
+      rollFormTitle: '',
+      rollForm: {},
+      rollFormRules: {
+        rollNo: [{ required: true, message: '轧辊编号不能为空', trigger: 'blur' }],
+        rollType: [{ required: true, message: '请选择辊型', trigger: 'change' }]
+      }
     }
   },
 
   computed: {
-    // 当前登录用户名（RuoYi Plus 的 store 路径）
     currentUserName() {
       return this.$store.state.user.name || this.$store.getters.name || ''
     },
 
-    // 产线 tab 按本地点击顺序排序
     sortedProductionLines() {
       const order = this.lineTabOrder
       return [...this.productionLines].sort((a, b) => {
@@ -299,11 +495,15 @@ export default {
       })
     },
 
-    // 有效当前辊径：优先取 currentDia，无则取最新磨削记录的磨后径
+    manufacturerOptions() {
+      const set = new Set()
+      this.allRolls.forEach(r => {
+        if (r.manufacturer) set.add(r.manufacturer)
+      })
+      return [...set].sort()
+    },
+
     effectiveCurrentDia() {
-      if (this.selectedRoll && this.selectedRoll.currentDia != null) {
-        return parseFloat(this.selectedRoll.currentDia)
-      }
       if (this.grindList.length > 0) {
         const latest = [...this.grindList].sort((a, b) => {
           const ta = a.grindTime ? new Date(a.grindTime).getTime() : 0
@@ -315,7 +515,6 @@ export default {
       return null
     },
 
-    // 表格数据：新增时在顶部插入一个编辑行占位
     tableData() {
       if (this.editRow && this.editRow.__isNew) {
         return [this.editRow, ...this.grindList]
@@ -324,20 +523,17 @@ export default {
     }
   },
 
-  created() {},
-
   methods: {
     onLineResolved() {
       this.filterLineId = this.lineId
       const uid = this.$store.state.user?.userId || 0
-      try { this.lineTabOrder = JSON.parse(localStorage.getItem(`grind_line_order_${uid}`) || '[]') } catch {}
+      try { this.lineTabOrder = JSON.parse(localStorage.getItem(`grind_line_order_${uid}`) || '[]') } catch { /* ignore */ }
       listProductionLine({ pageNum: 1, pageSize: 100 }).then(res => {
         this.productionLines = res.rows || []
       })
       this.loadRolls()
     },
 
-    // ── 轧辊列表 ──────────────────────────────────────
     loadRolls() {
       this.rollLoading = true
       listRollInfo({ pageNum: 1, pageSize: 500, lineId: this.filterLineId }).then(res => {
@@ -361,9 +557,10 @@ export default {
     },
     filterRolls() {
       this.filteredRolls = this.allRolls.filter(r => {
-        const matchNo   = !this.filterNo   || r.rollNo.includes(this.filterNo)
+        const matchNo = !this.filterNo || r.rollNo.includes(this.filterNo)
         const matchType = !this.filterType || r.rollType === this.filterType
-        return matchNo && matchType
+        const matchMfr = !this.filterManufacturer || r.manufacturer === this.filterManufacturer
+        return matchNo && matchType && matchMfr
       })
     },
     selectRoll(r) {
@@ -377,7 +574,6 @@ export default {
       this.loadGrindList(r.rollId)
     },
 
-    // ── 磨削记录 ──────────────────────────────────────
     loadGrindList(rollId) {
       this.grindLoading = true
       listRollGrind(rollId).then(res => {
@@ -400,7 +596,6 @@ export default {
       this.loadMonthlyStats()
     },
 
-    // ── 行内编辑 ──────────────────────────────────────
     isEditing(row) {
       if (!this.editRow) return false
       if (row.__isNew && this.editRow.__isNew) return true
@@ -413,20 +608,20 @@ export default {
     startAdd() {
       const now = new Date()
       const pad = n => String(n).padStart(2, '0')
-      const grindTime = `${now.getFullYear()}-${pad(now.getMonth()+1)}-${pad(now.getDate())} ` +
+      const grindTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ` +
                         `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
       this.editRow = {
-        __isNew:    true,
-        rollId:     this.selectedRollId,
+        __isNew: true,
+        rollId: this.selectedRollId,
         grindTime,
-        team:       undefined,
-        diaBefore:  this.effectiveCurrentDia != null ? this.effectiveCurrentDia : undefined,
-        diaAfter:   undefined,
-        rollShape:  '平',
+        team: undefined,
+        diaBefore: this.effectiveCurrentDia != null ? this.effectiveCurrentDia : undefined,
+        diaAfter: undefined,
+        rollShape: '平',
         flawResult: '合格',
-        hardness:   undefined,
-        operator:   this.currentUserName,
-        remark:     undefined
+        hardness: undefined,
+        operator: this.currentUserName,
+        remark: undefined
       }
     },
     startEdit(row) {
@@ -440,10 +635,7 @@ export default {
       const r = this.editRow
       if (!r.grindTime) { this.$modal.msgWarning('请填写磨削时间'); return }
       if (r.diaBefore == null) { this.$modal.msgWarning('请填写磨前直径'); return }
-      if (r.diaAfter  == null) { this.$modal.msgWarning('请填写磨后直径'); return }
-
-      // 自动带入操作人
-      r.operator = this.currentUserName
+      if (r.diaAfter == null) { this.$modal.msgWarning('请填写磨后直径'); return }
 
       this.grindSaving = true
       const isNew = !!r.__isNew
@@ -472,7 +664,6 @@ export default {
       })
     },
 
-    // ── 计算磨削量 ──────────────────────────────────────
     grindAmountOf(row) {
       const b = parseFloat(row.diaBefore)
       const a = parseFloat(row.diaAfter)
@@ -480,9 +671,88 @@ export default {
       return '—'
     },
 
-    // 辅助
     statusLabel(s) {
       return { Online: '在线', Standby: '备用', Offline: '离线', Scrapped: '报废' }[s] || s
+    },
+
+    // ── 轧辊 CRUD ──────────────────────────────────────
+    handleAddRoll() {
+      this.rollFormTitle = '新增轧辊'
+      this.rollForm = {
+        lineId: this.filterLineId || null,
+        rollNo: undefined,
+        rollType: this.filterType || undefined,
+        manufacturer: this.filterManufacturer || '',
+        initialDia: undefined,
+        currentDia: undefined,
+        minDia: undefined,
+        material: '',
+        roughness: undefined,
+        crown: undefined,
+        manufactureDate: '',
+        remark: '',
+        status: 'Offline'
+      }
+      this.rollFormOpen = true
+    },
+    handleEditRoll(row) {
+      getRollInfo(row.rollId).then(res => {
+        this.rollFormTitle = '修改轧辊'
+        const data = res.data || {}
+        this.rollForm = {
+          rollId: data.rollId,
+          lineId: data.lineId,
+          rollNo: data.rollNo,
+          rollType: data.rollType,
+          manufacturer: data.manufacturer || '',
+          initialDia: data.initialDia,
+          currentDia: data.currentDia,
+          minDia: data.minDia,
+          material: data.material || '',
+          roughness: data.roughness,
+          crown: data.crown,
+          manufactureDate: data.manufactureDate || '',
+          remark: data.remark || '',
+          status: data.status
+        }
+        this.rollFormOpen = true
+      })
+    },
+    handleDelRoll(row) {
+      this.$modal.confirm(`确认删除轧辊【${row.rollNo}】？此操作不可恢复。`).then(() => {
+        return delRollInfo(row.rollId)
+      }).then(() => {
+        this.$modal.msgSuccess('删除成功')
+        if (this.selectedRollId === row.rollId) {
+          this.selectedRollId = null
+          this.selectedRoll = null
+          this.grindList = []
+        }
+        this.loadRolls()
+      })
+    },
+    submitRollForm() {
+      this.$refs.rollForm.validate(valid => {
+        if (!valid) return
+        const form = { ...this.rollForm }
+        const numFields = ['initialDia', 'currentDia', 'minDia', 'roughness', 'crown']
+        numFields.forEach(k => {
+          if (form[k] != null) form[k] = Number(form[k])
+        })
+        const action = form.rollId ? updateRollInfo : addRollInfo
+        action(form).then(() => {
+          this.$modal.msgSuccess(form.rollId ? '修改成功' : '新增成功')
+          this.rollFormOpen = false
+          this.loadRolls()
+          if (this.selectedRollId === form.rollId) {
+            this.selectedRoll = { ...this.selectedRoll, ...form }
+          }
+        })
+      })
+    },
+    resetRollForm() {
+      this.rollForm = {}
+      this.$nextTick(() => { this.$refs.rollForm && this.$refs.rollForm.clearValidate() })
     }
   }
 }
@@ -492,7 +762,7 @@ export default {
 .grind-page   { background: #f4f5f7; height: 100%; }
 .grind-layout { display: flex; gap: 12px; height: 100%; }
 
-/* 产线 Tab 列 */
+/* ── 左侧产线 Tab ── */
 .line-tabs {
   width: 64px;
   flex-shrink: 0;
@@ -522,30 +792,87 @@ export default {
   font-weight: 600;
 }
 
-/* 轧辊列表 */
-.grind-left  { width: 220px; flex-shrink: 0; }
-.grind-right { flex: 1; min-width: 0; }
+/* ── 右侧主体 ── */
+.grind-main {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
 
-.grind-card { border: 1px solid #dcdee0; border-radius: 4px; }
-.h-full     { height: calc(100vh - 120px); display: flex; flex-direction: column; }
+/* 顶部检索栏 */
+.search-bar {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+  padding: 10px 14px;
+  background: #fff;
+  border: 1px solid #dcdee0;
+  border-radius: 4px;
+  flex-shrink: 0;
+}
+
+/* 下方内容区：左右分栏 */
+.content-area {
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  gap: 10px;
+}
+
+/* 左侧轧辊列表面板 */
+.roll-list-panel {
+  width: 240px;
+  flex-shrink: 0;
+  height: calc(100vh - 140px);
+  overflow-y: auto;
+}
+
+/* 右侧明细面板 */
+.detail-panel {
+  flex: 1;
+  min-width: 0;
+  overflow-y: auto;
+}
+
+/* 明细卡片 */
+.detail-card {
+  border: 1px solid #dcdee0;
+  border-radius: 4px;
+}
+.detail-card ::v-deep .el-card__body {
+  overflow: auto;
+}
+
+/* 通用卡片 */
+.panel-card {
+  border: 1px solid #dcdee0;
+  border-radius: 4px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.panel-card ::v-deep .el-card__body {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
 
 .card-header { display: flex; align-items: center; gap: 8px; }
 .card-title  { font-size: 13px; font-weight: 600; color: #3d4b5c; }
+.card-count  { font-size: 11px; color: #9aa0a6; background: #f0f2f5; padding: 1px 8px; border-radius: 10px; margin-left: auto; }
 
-/* 辊列表 */
-.roll-filter { padding: 0 0 4px; }
-::v-deep .el-card .el-card__body {
-  overflow-y: scroll;
-  overflow-x: hidden;
-}
-.roll-list   { overflow-y: auto; flex: 1; min-height: 0; padding: 0; }
+/* 轧辊列表 */
+.roll-list   { padding: 0; }
 .roll-item   { padding: 8px 12px; cursor: pointer; border-bottom: 1px solid #f0f2f5; }
 .roll-item:hover     { background: #f5f7fa; }
 .roll-item--active   { background: #e8f4ff !important; border-left: 3px solid #409eff; }
-.ri-no   { font-family: 'Consolas', monospace; font-size: 13px; font-weight: 600; color: #1f2329; }
-.ri-meta { display: flex; align-items: center; gap: 6px; margin-top: 3px; }
-.ri-dia  { font-size: 11px; color: #9aa0a6; }
-.ri-line { font-size: 10px; color: #b0b3bb; margin-top: 2px; }
+.ri-no     { font-family: 'Consolas', monospace; font-size: 13px; font-weight: 600; color: #1f2329; }
+.ri-meta   { display: flex; align-items: center; gap: 6px; margin-top: 3px; }
+.ri-dia    { font-size: 11px; color: #9aa0a6; }
+.ri-manufacturer { font-size: 10px; color: #909399; margin-top: 2px; }
+.ri-line   { font-size: 10px; color: #b0b3bb; margin-top: 2px; }
 .ri-status { font-size: 11px; }
 .roll-empty { text-align: center; color: #c0c4cc; padding: 20px 0; font-size: 12px; }
 
@@ -573,17 +900,18 @@ export default {
 
 /* 行内编辑 */
 .computed-val  { color: #409eff; font-weight: 600; font-size: 13px; }
-.auto-operator { color: #0a7c42; font-size: 12px; }
 .remark-text   { font-size: 12px; color: #5f6368; }
 
-/* 去掉 number input 的默认上下箭头，保持表格整洁 */
 .el-table :deep(input[type=number]::-webkit-inner-spin-button),
 .el-table :deep(input[type=number]::-webkit-outer-spin-button) { -webkit-appearance: none; }
 .el-table :deep(input[type=number]) { -moz-appearance: textfield; }
 </style>
 
-<!-- 编辑行高亮（非 scoped，作用于 el-table 的 row-class-name） -->
 <style>
 .el-table .editing-row { background: #fffbf0 !important; }
 .el-table .editing-row:hover > td { background: #fffbf0 !important; }
+
+.el-table ::v-deep .cell {
+  padding: 0;
+}
 </style>
diff --git a/klp-ui/src/views/wms/coil/components/CoilInfo.vue b/klp-ui/src/views/wms/coil/components/CoilInfo.vue
index f5f6dc7dc..b0bf216b2 100644
--- a/klp-ui/src/views/wms/coil/components/CoilInfo.vue
+++ b/klp-ui/src/views/wms/coil/components/CoilInfo.vue
@@ -1,20 +1,16 @@
 <template>
-  <el-descriptions
-    :column="column"
-    :border="border"
-    size="small"
-    :title="title"
-  >
+  <el-descriptions :column="column" :border="border" size="small" :title="title">
     <template slot="extra">
       <slot name="extra"></slot>
     </template>
-    <el-descriptions-item
-      v-for="(item, index) in filteredFields"
-      :key="index"
-      :label="item.label"
-      :span="item.span || 1"
-    >
-      <template>
+    <el-descriptions-item v-for="(item, index) in filteredFields" :key="index" :label="item.label"
+      :span="item.span || 1">
+      <template v-if="item.children">
+        <span v-for="(child, cIndex) in item.children" :key="cIndex" style="margin-right: 12px;">
+          {{ child.label }}: {{ child.value || '-' }}
+        </span>
+      </template>
+      <template v-else>
         {{ item.value || '-' }}
       </template>
     </el-descriptions-item>
@@ -37,7 +33,7 @@ export default {
       type: Boolean,
       default: false
     },
-       // 只显示有值的字段
+    // 只显示有值的字段
     showOnlyValue: {
       type: Boolean,
       default: false
@@ -66,9 +62,22 @@ export default {
         { label: '切边要求', key: 'trimmingRequirement' },
         { label: '原料材质', key: 'packingStatus' },
         { label: '包装要求', key: 'packagingRequirement' },
-        { label: '实测厚度[mm]', key: 'actualThickness' },
+        // 设置对照属性，两个数量显示在一个格子里
+        {
+          label: '长度[m]',
+          children: [
+            { label: '实测', key: 'actualLength' },
+            { label: '理论', key: 'theoreticalLength' }
+          ]
+        },
+        {
+          label: '厚度[mm]',
+          children: [
+            { label: '实测', key: 'actualThickness' },
+            { label: '理论', key: 'theoreticalThickness' }
+          ]
+        },
         { label: '实测宽度[mm]', key: 'actualWidth' },
-        { label: '长度[m]', key: 'length' },
         { label: '毛重[t]', key: 'grossWeight' },
         { label: '净重[t]', key: 'netWeight' },
         { label: '生产开始', key: 'productionStartTime' },
@@ -80,13 +89,29 @@ export default {
       ]
     },
     filteredFields() {
-      let fields = this.fields.map(item => ({
-        ...item,
-        value: this.coilInfo[item.key]
-      }))
+      let fields = this.fields.map(item => {
+        if (item.children) {
+          return {
+            ...item,
+            children: item.children.map(child => ({
+              ...child,
+              value: this.coilInfo[child.key]
+            }))
+          }
+        }
+        return {
+          ...item,
+          value: this.coilInfo[item.key]
+        }
+      })
 
       if (this.showOnlyValue) {
-        fields = fields.filter(item => item.value !== undefined && item.value !== null && item.value !== '')
+        fields = fields.filter(item => {
+          if (item.children) {
+            return item.children.some(child => child.value !== undefined && child.value !== null && child.value !== '')
+          }
+          return item.value !== undefined && item.value !== null && item.value !== ''
+        })
       }
 
       return fields
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
index 6bad8327d..7243025c0 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
@@ -295,6 +295,7 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   padding: 1em;
   /* width: 680.315px; */
@@ -318,7 +319,7 @@ export default {
   font-size: 12px;
   border: 1px solid #000;
   box-sizing: border-box;
-  font-family: 'Arial', sans-serif;
+  font-family: var(--label-font);
 }
 
 .company-header {
@@ -434,9 +435,9 @@ export default {
 .nob {
   width: 100%;
   height: 100%;
-  font-weight: bold;
+  font-weight: 900;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   border: none;
   outline: none;
   background: transparent;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue
index aaa554fd6..cff9f4bd1 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue
@@ -58,13 +58,14 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 50em; /* 容器宽度（可根据需求调整） */
   min-height: 30em; /* 容器最小高度 */
   border: 1px solid #000;
   padding: 2px;
   box-sizing: border-box;
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   font-size: 8px;
   line-height: 1.2;
   display: flex;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
index c9023b724..80ccd49e1 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
@@ -296,6 +296,7 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   padding: 1em;
   /* width: 680.315px; */
@@ -319,7 +320,7 @@ export default {
   font-size: 12px;
   border: 1px solid #000;
   box-sizing: border-box;
-  font-family: 'Arial', sans-serif;
+  font-family: var(--label-font);
 }
 
 .company-header {
@@ -437,9 +438,9 @@ export default {
   height: 100%;
   border: none;
   outline: none;
-  font-weight: bold;
+  font-weight: 900;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   background: transparent;
   text-align: center;
   font-size: 1.2em;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
index d4f2e1d11..a9351b538 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
@@ -21,7 +21,7 @@
               </div>
               <div
                 style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;"
-                class="value-cell">
+                class="value-cell enter-coil-no">
                 {{ content.enterCoilNo || '' }}
               </div>
             </div>
@@ -279,6 +279,7 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 25em;
   height: 20em;
@@ -287,9 +288,8 @@ export default {
   /* 启用Flex布局 */
   flex-direction: column;
   /* 子元素垂直排列 */
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   box-sizing: border-box;
-  /* 确保内边距/边框不影响总尺寸 */
 }
 
 .material-label-table {
@@ -327,15 +327,21 @@ export default {
   text-align: center;
   font-weight: bold;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
+  font-weight: 900;
 }
 
+.enter-coil-no {
+  font-size: 1.1em;
+}
+
+
 .nob {
   width: 100%;
   height: 100%;
-  font-weight: bold;
+  font-weight: 900;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   border: none;
   outline: none;
   background: transparent;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
index 844ddec99..5287df5f4 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -302,6 +302,7 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   padding: 1em;
   /* width: 680.315px; */
@@ -325,7 +326,7 @@ export default {
   font-size: 12px;
   border: 1px solid #000;
   box-sizing: border-box;
-  font-family: 'Arial', sans-serif;
+  font-family: var(--label-font);
 }
 
 .company-header {
@@ -443,9 +444,9 @@ export default {
   height: 100%;
   border: none;
   outline: none;
-  font-weight: bold;
+  font-weight: 900;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   background: transparent;
   text-align: center;
   font-size: 1.2em;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue
index 704bc5992..8be09084c 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue
@@ -50,13 +50,14 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 50em; /* 容器宽度（可根据需求调整） */
   min-height: 30em; /* 容器最小高度 */
   border: 1px solid #000;
   padding: 2px;
   box-sizing: border-box;
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   font-size: 8px;
   line-height: 1.2;
   display: flex;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue
index 1c9bb07b2..455618da8 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue
@@ -60,13 +60,14 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .sample-label-container {
   width: 50em;
   height: 40em;
   border: 1px solid #000;
   padding: 2px;
   box-sizing: border-box;
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   font-size: 10px;
   line-height: 1.5;
   display: flex;
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
index f0338b0ce..30ebe5e41 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
@@ -166,11 +166,12 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 25em;
   height: 20em;
   padding: 16px;
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   box-sizing: border-box;
 }
 
@@ -199,7 +200,8 @@ export default {
   align-items: center;
   justify-content: center;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
+  font-weight: 900;
 }
 
 /* 公司名称单元格 */
@@ -260,7 +262,7 @@ export default {
   justify-content: center;
   font-weight: bold;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   font-size: 1em;
 }
 
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
index b2bf89fee..44eee28b6 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
@@ -7,11 +7,11 @@
       <!-- 第一行：冷卷号、热卷号 -->
       <div class="grid-cell label-cell">冷卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob">{{ content.currentCoilNo || '' }}</div>
+        <div class="nob current-coil-no">{{ content.currentCoilNo || '' }}</div>
       </div>
       <div class="grid-cell label-cell">热卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob">{{ content.enterCoilNo || '' }}</div>
+        <div class="nob enter-coil-no">{{ content.enterCoilNo || '' }}</div>
       </div>
       
       <!-- 第二行：规格、钢种 -->
@@ -170,11 +170,12 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 45em;
   height: 25em;
   padding: 16px;
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   box-sizing: border-box;
 }
 
@@ -253,12 +254,17 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-weight: bold;
+  font-weight: 900;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   font-size: 1.2em;
 }
 
+.current-coil-no, .enter-coil-no {
+  font-size: 1.1em !important;
+}
+
+
 /* 打印样式 */
 @media print {
   @page {
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
index d36450b8e..6b322eebb 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
@@ -184,6 +184,7 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 25em;
   height: 20em;
@@ -192,7 +193,7 @@ export default {
   /* 启用Flex布局 */
   flex-direction: column;
   /* 子元素垂直排列 */
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   box-sizing: border-box;
   /* 确保内边距/边框不影响总尺寸 */
 }
@@ -248,7 +249,7 @@ export default {
   white-space: normal;
   font-weight: bold;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   font-size: 1.2em;
 }
 
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
index eee80e5cc..ff6ee320e 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
@@ -7,11 +7,11 @@
       <!-- 第一行：冷卷号、热卷号 -->
       <div class="grid-cell label-cell">冷卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob">{{ content.currentCoilNo || '' }}</div>
+        <div class="nob current-coil-no">{{ content.currentCoilNo || '' }}</div>
       </div>
       <div class="grid-cell label-cell">热卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob">{{ content.enterCoilNo || '' }}</div>
+        <div class="nob enter-coil-no">{{ content.enterCoilNo || '' }}</div>
       </div>
       
       <!-- 第二行：规格、钢种 -->
@@ -170,11 +170,12 @@ export default {
 </script>
 
 <style scoped>
+@import './label-common.css';
 .label-container {
   width: 45em;
   height: 25em;
   padding: 16px;
-  font-family: "SimSun", serif;
+  font-family: var(--label-font);
   box-sizing: border-box;
 }
 
@@ -254,12 +255,17 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  font-weight: bold;
+  font-weight: 900;
   color: #000;
-  font-family: '黑体', serif;
+  font-family: var(--label-font);
   font-size: 1.2em;
 }
 
+.current-coil-no, .enter-coil-no {
+  font-size: 1.1em !important;
+}
+
+
 /* 打印样式 */
 @media print {
   @page {
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css b/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css
new file mode 100644
index 000000000..f3c778cc8
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/label-common.css
@@ -0,0 +1,3 @@
+:root {
+  --label-font: '黑体', 'Courier New', 'SimSun', serif;
+}
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index e5c49d1db..c27b546e5 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -103,8 +103,8 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button icon="el-icon-download" size="mini" @click="handleNewExport" v-if="showNewExport">导出</el-button>
-        <el-button type="danger" plain icon="el-icon-close" size="mini" :disabled="multiple" :loading="buttonLoading"
-          @click="handleBatchRemoveFromWaybill">批量移出发货单</el-button>
+        <el-button type="danger" v-if="showWaybill" plain icon="el-icon-close" size="mini" :disabled="multiple"
+          :loading="buttonLoading" @click="handleBatchRemoveFromWaybill">批量移出发货单</el-button>
       </el-form-item>
 
       <!-- <el-form-item style="float: right;" v-if="showWaybill" v-loading="loading">
@@ -2475,6 +2475,10 @@ export default {
   overflow: hidden;
 }
 
+.el-table .el-button+.el-button {
+  margin-left: 0;
+}
+
 ::v-deep .el-table {
   margin-top: 0;
 }
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index f6ca23da9..b7736ea44 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="split-coil-container" v-loading="loading">
+  <div v-loading="loading" class="split-coil-container">
     <!-- 左右分栏布局 -->
     <el-row :gutter="20">
       <!-- 左侧：钢卷信息 + 新增按钮 + 已分条列表 -->
@@ -7,26 +7,41 @@
         <div class="coil-info-card">
           <el-row :gutter="20" flex justify="end">
             <!-- 新增分条按钮 -->
-            <el-button type="primary" icon="el-icon-plus" @click="addSplitForm" :loading="buttonLoading"
-              v-if="actionStatus != 2">
+            <el-button
+              v-if="actionStatus != 2"
+              type="primary"
+              icon="el-icon-plus"
+              :loading="buttonLoading"
+              @click="addSplitForm"
+            >
               新增分条
             </el-button>
 
             <!-- 完成分条按钮 -->
-            <el-button type="success" icon="el-icon-check" @click="completeSplit" :disabled="splitList.length === 0"
-              :loading="buttonLoading" v-if="actionStatus != 2">
+            <el-button
+              v-if="actionStatus != 2"
+              type="success"
+              icon="el-icon-check"
+              :disabled="splitList.length === 0"
+              :loading="buttonLoading"
+              @click="completeSplit"
+            >
               完成整体分条
             </el-button>
 
-            <el-button type="primary" icon="el-icon-refresh" @click="refresh" :loading="buttonLoading">
+            <el-button type="primary" icon="el-icon-refresh" :loading="buttonLoading" @click="refresh">
               刷新
             </el-button>
           </el-row>
 
           <el-descriptions :column="2" border title="待分条钢卷信息">
             <template slot="extra">
-              <el-button v-if="showSplitForm" type="info" @click="copyFromSourceCoil"
-                icon="el-icon-document-copy">复制源卷信息</el-button>
+              <el-button
+                v-if="showSplitForm"
+                type="info"
+                icon="el-icon-document-copy"
+                @click="copyFromSourceCoil"
+              >复制源卷信息</el-button>
             </template>
             <el-descriptions-item label="入场钢卷号">{{ coilInfo.enterCoilNo || '-' }}</el-descriptions-item>
             <el-descriptions-item label="当前钢卷号">{{ coilInfo.currentCoilNo || '-' }}</el-descriptions-item>
@@ -47,9 +62,15 @@
           </el-descriptions>
           <!-- 已分条钢卷列表 -->
 
-          <el-descriptions :column="1" border title="已分出的钢卷列表"></el-descriptions>
-          <el-table v-loading="splitListLoading" :data="splitList" @row-click="handleSplitItemClick"
-            highlight-current-row border stripe>
+          <el-descriptions :column="1" border title="已分出的钢卷列表" />
+          <el-table
+            v-loading="splitListLoading"
+            :data="splitList"
+            highlight-current-row
+            border
+            stripe
+            @row-click="handleSplitItemClick"
+          >
             <el-table-column prop="enterCoilNo" label="入场钢卷号" />
 
             <el-table-column prop="currentCoilNo" label="当前钢卷号" />
@@ -88,28 +109,25 @@
             </el-table-column>
           </el-table>
 
-          <!-- <el-descriptions :column="1" border title="镀锌二级数据"
-            v-if="actionType == 501 && showSplitForm"></el-descriptions>
-          <el-table v-if="actionType == 501 && showSplitForm" v-loading="zincLoading" :data="zincList" border stripe
-            @row-click="handleZincItemClick" highlight-current-row>
-            <el-table-column type="index" label="序号" width="50" />
-            <el-table-column prop="enterCoilNo" label="入场钢卷号" />
-            <el-table-column prop="createTime" label="生产开始时间" />
-            <el-table-column prop="endTime" label="生产结束时间" />
-            <el-table-column prop="shiftNo" label="班组" />
-          </el-table> -->
-
           <!-- 今日排产单 -->
           <div v-if="planSheetList.length > 0" class="plan-sheet-section">
-            <el-descriptions :column="1" border :title="'最近排产单（' + planSheetLineName + '）'">
-            </el-descriptions>
+            <el-descriptions :column="1" border :title="'最近排产单（' + planSheetLineName + '）'" />
             <el-tabs v-model="activePlanSheetId" type="card">
-              <el-tab-pane v-for="sheet in planSheetList" :key="sheet.planSheetId"
+              <el-tab-pane
+                v-for="sheet in planSheetList"
+                :key="sheet.planSheetId"
                 :name="sheet.planSheetId"
-                :label="sheet.planCode || ('排产单' + sheet.planSheetId)" />
+                :label="sheet.planCode || ('排产单' + sheet.planSheetId)"
+              />
             </el-tabs>
-            <el-table v-loading="planSheetLoading" :data="activePlanSheetDetails" border stripe size="mini"
-              max-height="400">
+            <el-table
+              v-loading="planSheetLoading"
+              :data="activePlanSheetDetails"
+              border
+              stripe
+              size="mini"
+              max-height="400"
+            >
               <el-table-column type="index" label="序号" width="50" />
               <el-table-column label="订单信息" header-align="center">
                 <el-table-column prop="contractCode" label="合同号" width="140" show-overflow-tooltip />
@@ -138,8 +156,7 @@
 
           <!-- 今日排产单空状态 -->
           <div v-if="planSheetList.length === 0 && planSheetLineName && !planSheetLoading" class="plan-sheet-section">
-            <el-descriptions :column="1" border :title="'最近排产单（' + planSheetLineName + '）'">
-            </el-descriptions>
+            <el-descriptions :column="1" border :title="'最近排产单（' + planSheetLineName + '）'" />
             <el-empty description="今天暂无排产单" :image-size="80" />
           </div>
         </div>
@@ -147,19 +164,31 @@
 
       <!-- 右侧：分条表单 / 分条详情 -->
       <el-col :span="12">
-        <div class="split-form-card" v-if="showSplitForm">
+        <div v-if="showSplitForm" class="split-form-card">
           <el-card title="分条钢卷信息录入" shadow="hover">
+            <el-alert v-if="!isExemptFromValidation" type="warning" :closable="false" show-icon style="margin-bottom:12px">
+              <template slot="title">
+                子卷的<b>净重</b>和<b>实测厚度</b>均不能超过父卷；完成分条时所有子卷净重总和不能超过父卷净重
+              </template>
+            </el-alert>
             <el-form ref="splitFormRef" :model="splitForm" :rules="rules" label-width="100px" style="max-width: 800px;">
               <el-form-item label="入场钢卷号" prop="enterCoilNo">
                 <el-input v-model="splitForm.enterCoilNo" placeholder="请输入入场钢卷号" disabled />
               </el-form-item>
+              <el-form-item v-if="isGrindAction" label="镀铬卷号" prop="chromePlateCoilNo">
+                <el-input v-model="splitForm.chromePlateCoilNo" placeholder="请输入镀铬卷号" />
+              </el-form-item>
               <el-form-item label="当前钢卷号" prop="currentCoilNo">
                 <el-input v-model="splitForm.currentCoilNo" placeholder="请输入当前钢卷号" />
                 <current-coil-no :current-coil-no="splitForm.currentCoilNo" />
               </el-form-item>
               <el-form-item label="所在库位" prop="warehouseId">
-                <warehouse-select v-model="splitForm.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;"
-                  clearable />
+                <warehouse-select
+                  v-model="splitForm.warehouseId"
+                  placeholder="请选择仓库/库区/库位"
+                  style="width: 100%;"
+                  clearable
+                />
               </el-form-item>
               <el-form-item label="班组" prop="team">
                 <el-select v-model="splitForm.team" placeholder="请选择班组" style="width: 100%">
@@ -174,16 +203,30 @@
                 </el-select>
               </el-form-item>
               <el-form-item :label="getItemLabel" prop="itemId">
-                <product-select v-if="splitForm.itemType === 'product'" v-model="splitForm.itemId" placeholder="请选择成品"
-                  style="width: 100%;" clearable />
-                <raw-material-select v-else-if="splitForm.itemType === 'raw_material'" v-model="splitForm.itemId"
-                  placeholder="请选择原料" style="width: 100%;" clearable />
+                <product-select
+                  v-if="splitForm.itemType === 'product'"
+                  v-model="splitForm.itemId"
+                  placeholder="请选择成品"
+                  style="width: 100%;"
+                  clearable
+                />
+                <raw-material-select
+                  v-else-if="splitForm.itemType === 'raw_material'"
+                  v-model="splitForm.itemId"
+                  placeholder="请选择原料"
+                  style="width: 100%;"
+                  clearable
+                />
                 <div v-else>请先选择材料类型</div>
               </el-form-item>
               <el-form-item label="质量状态" prop="qualityStatus">
                 <el-select v-model="splitForm.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
-                  <el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label"
-                    :value="item.value" />
+                  <el-option
+                    v-for="item in dict.type.coil_quality_status"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="切边要求" prop="trimmingRequirement">
@@ -213,39 +256,64 @@
                 <el-input v-model="splitForm.length" placeholder="请输入长度" type="number" />
               </el-form-item>
               <el-form-item label="实测长度(m)" prop="actualLength">
-                <el-input-number :controls="false" v-model="splitForm.actualLength" placeholder="请输入实测长度" type="number"
-                  :step="0.01" />
+                <el-input-number
+                  v-model="splitForm.actualLength"
+                  :controls="false"
+                  placeholder="请输入实测长度"
+                  type="number"
+                  :step="0.01"
+                />
               </el-form-item>
               <el-form-item label="实测厚度(mm)" prop="actualThickness">
-                <el-input-number :controls="false" v-model="splitForm.actualThickness" placeholder="请输入实测厚度"
-                  type="number" :step="0.01" />
+                <el-input-number
+                  v-model="splitForm.actualThickness"
+                  :controls="false"
+                  placeholder="请输入实测厚度"
+                  type="number"
+                  :step="0.01"
+                />
               </el-form-item>
               <el-form-item label="实测宽度(mm)" prop="actualWidth">
-                <el-input-number :controls="false" v-model="splitForm.actualWidth" placeholder="请输入实测宽度" type="number"
-                  :step="0.01" />
+                <el-input-number
+                  v-model="splitForm.actualWidth"
+                  :controls="false"
+                  placeholder="请输入实测宽度"
+                  type="number"
+                  :step="0.01"
+                />
               </el-form-item>
               <el-form-item label="业务目的" prop="businessPurpose">
                 <el-select v-model="splitForm.businessPurpose" placeholder="业务目的" filterable>
-                  <el-option v-for="item in dict.type.coil_business_purpose" :key="item.value" :value="item.value"
-                    :label="item.label" />
+                  <el-option
+                    v-for="item in dict.type.coil_business_purpose"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="调制度" prop="temperGrade">
                 <el-input v-model="splitForm.temperGrade" placeholder="请输入调制度" />
               </el-form-item>
               <el-form-item label="镀层种类" prop="coatingType">
-                <MemoInput storageKey="coatingType" v-model="splitForm.coatingType" placeholder="请输入镀层种类" />
+                <MemoInput v-model="splitForm.coatingType" storage-key="coatingType" placeholder="请输入镀层种类" />
               </el-form-item>
               <el-form-item label="钢卷表面处理" prop="coilSurfaceTreatment">
-                <MemoInput storageKey="surfaceTreatmentDesc" v-model="splitForm.coilSurfaceTreatment"
-                  placeholder="请输入钢卷表面处理" />
+                <MemoInput
+                  v-model="splitForm.coilSurfaceTreatment"
+                  storage-key="surfaceTreatmentDesc"
+                  placeholder="请输入钢卷表面处理"
+                />
               </el-form-item>
               <el-form-item label="生产开始时间" prop="productionStartTime">
                 <TimeInput v-model="splitForm.productionStartTime" @input="calculateProductionDuration" />
               </el-form-item>
               <el-form-item label="生产结束时间" prop="productionEndTime">
-                <TimeInput v-model="splitForm.productionEndTime" @input="calculateProductionDuration"
-                  :show-now-button="true" />
+                <TimeInput
+                  v-model="splitForm.productionEndTime"
+                  :show-now-button="true"
+                  @input="calculateProductionDuration"
+                />
               </el-form-item>
               <el-form-item label="生产耗时" prop="productionDuration">
                 <el-input v-model="splitForm.formattedDuration" placeholder="自动计算" disabled />
@@ -260,19 +328,28 @@
 
               <el-form-item label="异常信息">
                 <div class="abnormal-container">
-                  <div v-for="(abnormal, index) in abnormals" :key="index" class="abnormal-item"
-                    @click="editAbnormal(index)">
+                  <div
+                    v-for="(abnormal, index) in abnormals"
+                    :key="index"
+                    class="abnormal-item"
+                    @click="editAbnormal(index)"
+                  >
                     <div class="abnormal-content">
                       <div class="abnormal-info">
                         <div class="abnormal-position">{{ getAbnormalPositionText(abnormal.position) }}</div>
                         <div class="abnormal-code">{{ getAbnormalCodeText(abnormal.defectCode) }}</div>
                       </div>
-                      <el-button type="danger" size="mini" icon="el-icon-close" class="abnormal-delete"
-                        @click.stop="deleteAbnormal(index)"></el-button>
+                      <el-button
+                        type="danger"
+                        size="mini"
+                        icon="el-icon-close"
+                        class="abnormal-delete"
+                        @click.stop="deleteAbnormal(index)"
+                      />
                     </div>
                   </div>
                   <div class="abnormal-add" @click="addAbnormal">
-                    <i class="el-icon-plus"></i>
+                    <i class="el-icon-plus" />
                   </div>
                 </div>
               </el-form-item>
@@ -287,23 +364,27 @@
         </div>
 
         <!-- 分条钢卷详情（选中列表项时显示） -->
-        <div class="split-detail-card" v-else-if="selectedSplitItem">
+        <div v-else-if="selectedSplitItem" class="split-detail-card">
           <el-card title="分条钢卷详情" shadow="hover">
-            <CoilInfoRender :coilInfo="selectedSplitItem" :column="2" border />
+            <CoilInfoRender :coil-info="selectedSplitItem" :column="2" border />
           </el-card>
         </div>
 
         <!-- 初始提示 -->
-        <div class="empty-tip" v-else>
-          <el-empty description="请选择左侧已分条钢卷查看详情，或点击「新增分条」创建新分条"></el-empty>
+        <div v-else class="empty-tip">
+          <el-empty description="请选择左侧已分条钢卷查看详情，或点击「新增分条」创建新分条" />
         </div>
       </el-col>
     </el-row>
 
     <!-- 异常表单弹窗 -->
-    <el-dialog :title="currentAbnormalIndex === -1 ? '新增异常' : '编辑异常'" :visible.sync="abnormalDialogVisible"
-      width="600px" append-to-body>
-      <abnormal-form ref="abnormalForm" v-model="abnormalForm" :show-coil-selector="false"></abnormal-form>
+    <el-dialog
+      :title="currentAbnormalIndex === -1 ? '新增异常' : '编辑异常'"
+      :visible.sync="abnormalDialogVisible"
+      width="600px"
+      append-to-body
+    >
+      <abnormal-form ref="abnormalForm" v-model="abnormalForm" :show-coil-selector="false" />
       <div slot="footer" class="dialog-footer">
         <el-button @click="abnormalDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="saveAbnormal">确 定</el-button>
@@ -313,7 +394,7 @@
     <!-- 缓存数据展示弹窗 -->
     <el-dialog title="发现暂存数据" :visible.sync="cacheDialogVisible" width="800px" append-to-body>
       <div>
-        <el-alert title="检测到您之前有暂存的分条数据，是否恢复使用？" type="info" show-icon :closable="false"></el-alert>
+        <el-alert title="检测到您之前有暂存的分条数据，是否恢复使用？" type="info" show-icon :closable="false" />
         <el-divider content-position="left">暂存的表单数据</el-divider>
         <el-descriptions :column="2" border size="small">
           <el-descriptions-item label="入场钢卷号">{{ parsedCacheData && parsedCacheData.splitForm &&
@@ -334,10 +415,15 @@
           <el-descriptions-item label="备注">{{ parsedCacheData && parsedCacheData.splitForm &&
             parsedCacheData.splitForm.remark || '-' }}</el-descriptions-item>
         </el-descriptions>
-        <el-divider v-if="parsedCacheData && parsedCacheData.abnormals && parsedCacheData.abnormals.length > 0"
-          content-position="left">暂存的异常信息 ({{ parsedCacheData.abnormals.length }}条)</el-divider>
-        <div v-if="parsedCacheData && parsedCacheData.abnormals && parsedCacheData.abnormals.length > 0"
-          class="abnormal-container" style="margin-bottom: 20px;">
+        <el-divider
+          v-if="parsedCacheData && parsedCacheData.abnormals && parsedCacheData.abnormals.length > 0"
+          content-position="left"
+        >暂存的异常信息 ({{ parsedCacheData.abnormals.length }}条)</el-divider>
+        <div
+          v-if="parsedCacheData && parsedCacheData.abnormals && parsedCacheData.abnormals.length > 0"
+          class="abnormal-container"
+          style="margin-bottom: 20px;"
+        >
           <div v-for="(abnormal, index) in parsedCacheData.abnormals" :key="index" class="abnormal-item">
             <div class="abnormal-content">
               <div class="abnormal-info">
@@ -358,44 +444,26 @@
 </template>
 
 <script>
-import { getMaterialCoil, listMaterialCoil, createSpecialChild, completeSpecialSplit, updateMaterialCoilSimple, checkCoilNo, delMaterialCoil, getFirstHeatCoilMaterial } from '@/api/wms/coil'
+import { getMaterialCoil, listMaterialCoil, createSpecialChild, completeSpecialSplit, updateMaterialCoilSimple, delMaterialCoil, getFirstHeatCoilMaterial } from '@/api/wms/coil'
 import { completeAction, getPendingAction, updatePendingAction } from '@/api/wms/pendingAction'
 import { saveCoilCache, getCoilCacheByCoilId, delCoilCache } from '@/api/wms/coilCache'
-import { getGalvanize1TypingPrefill } from '@/api/pocket/acidTyping';
+import { getGalvanize1TypingPrefill } from '@/api/pocket/acidTyping'
 import { listPlanSheet } from '@/api/aps/planSheet'
 import { listPlanDetail } from '@/api/aps/planDetail'
-import ProductSelect from "@/components/KLPService/ProductSelect";
-import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
-import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
-import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
-import TimeInput from "@/components/TimeInput";
-import AbnormalForm from '../components/AbnormalForm';
-import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
-import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
-import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
-import ContractSelect from "@/components/KLPService/ContractSelect";
-import { addCoilContractRel } from "@/api/wms/coilContractRel";
+import ProductSelect from '@/components/KLPService/ProductSelect'
+import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect'
+import WarehouseSelect from '@/components/KLPService/WarehouseSelect'
+import ActualWarehouseSelect from '@/components/KLPService/ActualWarehouseSelect'
+import TimeInput from '@/components/TimeInput'
+import AbnormalForm from '../components/AbnormalForm'
+import { generateCoilNoPrefix } from '@/utils/coil/coilNo'
+import ProductInfo from '@/components/KLPService/Renderer/ProductInfo'
+import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo'
+import ContractSelect from '@/components/KLPService/ContractSelect'
+import { addCoilContractRel } from '@/api/wms/coilContractRel'
 
 export default {
   name: 'StepSplit',
-  props: {
-    actionId: {
-      type: [String, Number],
-      required: true,
-    },
-    coilId: {
-      type: String,
-      required: true,
-    },
-    actionStatus: {
-      type: Number,
-      default: 0,
-    },
-    actionType: {
-      type: Number,
-      required: true,
-    },
-  },
   components: {
     ProductSelect,
     RawMaterialSelect,
@@ -405,7 +473,25 @@ export default {
     AbnormalForm,
     ProductInfo,
     RawMaterialInfo,
-    ContractSelect,
+    ContractSelect
+  },
+  props: {
+    actionId: {
+      type: [String, Number],
+      required: true
+    },
+    coilId: {
+      type: String,
+      required: true
+    },
+    actionStatus: {
+      type: Number,
+      default: 0
+    },
+    actionType: {
+      type: Number,
+      required: true
+    }
   },
   dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'],
   data() {
@@ -439,10 +525,11 @@ export default {
         temperGrade: '',
         coatingType: '',
         remark: '',
+        chromePlateCoilNo: '',
         productionStartTime: '',
         productionEndTime: '',
         productionDuration: '',
-        formattedDuration: '',
+        formattedDuration: ''
       },
       // 已分条钢卷列表
       splitList: [],
@@ -455,22 +542,22 @@ export default {
       // 表单验证规则
       rules: {
         currentCoilNo: [
-          { required: true, message: "当前钢卷号不能为空", trigger: "blur" },
+          { required: true, message: '当前钢卷号不能为空', trigger: 'blur' },
           {
             // 当前钢卷号必须大于等于10位
             validator: (rule, value, callback) => {
               if (value.length < 11) {
-                callback(new Error('当前钢卷号必须大于等于11位'));
+                callback(new Error('当前钢卷号必须大于等于11位'))
               } else {
-                callback();
+                callback()
               }
             }, trigger: 'blur'
-          },
+          }
         ],
         materialType: [{ required: true, message: '请选择材料类型', trigger: 'change' }],
         itemId: [{ required: true, message: '请选择成品/原料', trigger: 'change' }],
         netWeight: [{ required: true, message: '请输入净重', trigger: 'blur' }],
-        warehouseId: [{ required: true, message: '请选择所在库位', trigger: 'change' }],
+        warehouseId: [{ required: true, message: '请选择所在库位', trigger: 'change' }]
       },
       buttonLoading: false,
       currentAction: {},
@@ -504,7 +591,7 @@ export default {
       planSheetList: [],
       planSheetDetailMap: {},
       planSheetLoading: false,
-      activePlanSheetId: null,
+      activePlanSheetId: null
     }
   },
   computed: {
@@ -518,20 +605,26 @@ export default {
         11: '酸轧线',
         200: '酸轧线',
         520: '酸轧线',
+
         206: '镀锌线',
         501: '镀锌线',
         521: '镀锌线',
+
         203: '脱脂线',
         502: '脱脂线',
         522: '脱脂线',
+
         204: '拉矫线',
         503: '拉矫线',
         523: '拉矫线',
+
         205: '双机架',
         504: '双机架',
         524: '双机架',
+
+        206: '镀铬线',
         505: '镀铬线',
-        525: '镀铬线',
+        525: '镀铬线'
       }
       return mapping[this.actionType] || ''
     },
@@ -545,6 +638,14 @@ export default {
     activePlanSheetDetails() {
       return this.planSheetDetailMap[this.activePlanSheetId] || []
     },
+    // 是否是镀铬操作
+    isGrindAction() {
+      return this.actionType == 505 || this.actionType == 525 || this.actionType == 206
+    },
+    // 镀锌/酸轧产线免验净重和厚度范围
+    isExemptFromValidation() {
+      return [11, 200, 520, 206, 501, 521].includes(Number(this.actionType))
+    }
   },
   watch: {
     coilId: {
@@ -558,13 +659,13 @@ export default {
           // 更新父钢卷ID
           this.splitForm.parentCoilId = val
         }
-      },
+      }
     },
     actionId: {
       immediate: true,
       handler(val) {
         // 若actionId变化需要重新加载数据，可在此补充逻辑
-      },
+      }
     },
     actionType: {
       immediate: true,
@@ -589,7 +690,7 @@ export default {
         const res = await listPlanSheet({
           lineName: this.planSheetLineName,
           pageSize: 3,
-          pageNum: 1,
+          pageNum: 1
         })
         this.planSheetList = res.rows || []
         this.planSheetDetailMap = {}
@@ -610,7 +711,7 @@ export default {
         const res = await listPlanDetail({
           planSheetId,
           pageSize: 100,
-          pageNum: 1,
+          pageNum: 1
         })
         const details = res.rows || []
         details.sort((a, b) => {
@@ -624,7 +725,6 @@ export default {
       }
     },
 
-
     // 查询待分条的钢卷信息
     async getCoilInfo() {
       try {
@@ -633,14 +733,13 @@ export default {
           this.coilInfo = res.data || {}
           // 获取最早的热轧卷板材质
           try {
-            const firstHeatMaterial = await getFirstHeatCoilMaterial(this.coilId);
+            const firstHeatMaterial = await getFirstHeatCoilMaterial(this.coilId)
             if (firstHeatMaterial.code === 200 && firstHeatMaterial.msg) {
               this.firstHeatMaterial = firstHeatMaterial.msg
             }
           } catch {
 
           }
-
         } else {
           this.$message.error('查询钢卷信息失败：' + res.msg)
         }
@@ -653,7 +752,7 @@ export default {
       this.zincLoading = true
       const res = await getGalvanize1TypingPrefill({
         pageSize: 10,
-        pageNum: 1,
+        pageNum: 1
       })
       this.zincList = res.rows || []
       this.zincLoading = false
@@ -664,7 +763,7 @@ export default {
     },
 
     async handleDeleteSplit(row) {
-      this.$modal.confirm('确认删除该分卷吗？').then(async () => {
+      this.$modal.confirm('确认删除该分卷吗？').then(async() => {
         try {
           await delMaterialCoil(row.coilId)
           this.$message.success('删除成功')
@@ -693,7 +792,7 @@ export default {
         }
         const action = await getPendingAction(this.actionId)
         this.currentAction = action.data || {}
-        const coilIds = action.data.remark;
+        const coilIds = action.data.remark
         console.log('coilIds', coilIds)
         if (!coilIds) {
           this.splitList = []
@@ -714,7 +813,7 @@ export default {
           actionType: action.data.actionType,
           coilId: action.data.coilId,
           currentCoilNo: action.data.currentCoilNo,
-          remark: res.rows.map(item => item.coilId).join(','),
+          remark: res.rows.map(item => item.coilId).join(',')
         })
       } catch (error) {
         this.$message.error('查询分条列表异常：' + error.message)
@@ -729,6 +828,10 @@ export default {
       this.selectedSplitItem = null
       this.resetSplitForm()
       this.splitForm.enterCoilNo = this.coilInfo.enterCoilNo || ''
+      // 如果是镀铬工序，设置默认镀铬卷号：取父卷入场卷号（多个逗号分隔时取第一个）
+      if (this.isGrindAction && this.coilInfo.enterCoilNo) {
+        this.splitForm.chromePlateCoilNo = this.coilInfo.enterCoilNo.split(',')[0].trim()
+      }
       // 查询是否有缓存
       try {
         const res = await getCoilCacheByCoilId(this.coilId)
@@ -773,26 +876,27 @@ export default {
         temperGrade: '',
         coatingType: '',
         remark: '',
+        chromePlateCoilNo: '',
         productionStartTime: this.currentAction.createTime,
         productionEndTime: '',
         productionDuration: '',
         formattedDuration: '',
-        parentCoilId: this.coilId,
+        parentCoilId: this.coilId
       }
       // 重置异常信息
-      this.abnormals = [];
+      this.abnormals = []
     },
 
     // 材料类型变更处理
     handleMaterialTypeChange(val) {
       // 清空物品选择
-      this.splitForm.itemId = null;
+      this.splitForm.itemId = null
 
       // 根据材料类型设置物品类型
       if (val === '成品') {
-        this.splitForm.itemType = 'product';
+        this.splitForm.itemType = 'product'
       } else if (val === '原料') {
-        this.splitForm.itemType = 'raw_material';
+        this.splitForm.itemType = 'raw_material'
       }
     },
 
@@ -812,7 +916,7 @@ export default {
         itemType: 'product',
         materialType: '成品',
         length: row.exitLength,
-        netWeight: row.exitNetWeight,
+        netWeight: row.exitNetWeight
       }
     },
 
@@ -832,6 +936,22 @@ export default {
       if (!valid) {
         return
       }
+
+      // 校验子卷净重和实测厚度不超过父卷（镀锌/酸轧除外）
+      if (!this.isExemptFromValidation) {
+        const parentNetWeight = parseFloat(this.coilInfo.netWeight) || 0
+        const parentThickness = parseFloat(this.coilInfo.actualThickness) || 0
+        const childNetWeight = parseFloat(this.splitForm.netWeight) || 0
+        const childThickness = parseFloat(this.splitForm.actualThickness) || 0
+        if (childNetWeight > 0 && parentNetWeight > 0 && childNetWeight > parentNetWeight) {
+          this.$message.error(`子卷净重(${childNetWeight}T)不能超过父卷净重(${parentNetWeight}T)`)
+          return
+        }
+        if (childThickness > 0 && parentThickness > 0 && childThickness > parentThickness) {
+          this.$message.error(`子卷实测厚度(${childThickness}mm)不能超过父卷实测厚度(${parentThickness}mm)`)
+          return
+        }
+      }
       try {
         // 区分新增/编辑：有coilId则为编辑，否则为新增
         let res
@@ -841,7 +961,7 @@ export default {
         const splitData = {
           ...this.splitForm,
           abnormals: this.abnormals
-        };
+        }
 
         if (this.splitForm.coilId) {
           // 编辑分条：调用更新接口
@@ -853,7 +973,7 @@ export default {
           if (this.splitForm.contractId) {
             addCoilContractRel({
               coilId: res.data.coilId,
-              contractId: this.splitForm.contractId,
+              contractId: this.splitForm.contractId
             })
           }
         }
@@ -877,15 +997,34 @@ export default {
 
     // 完成整体分条
     async completeSplit() {
+      // 校验所有子卷（镀锌/酸轧除外）
+      if (!this.isExemptFromValidation) {
+        const parentThickness = parseFloat(this.coilInfo.actualThickness) || 0
+        const parentNetWeight = parseFloat(this.coilInfo.netWeight) || 0
+        let totalChildNetWeight = 0
+        for (const child of this.splitList) {
+          const childThickness = parseFloat(child.actualThickness) || 0
+          const childNetWeight = parseFloat(child.netWeight) || 0
+          totalChildNetWeight += childNetWeight
+          if (childThickness > 0 && parentThickness > 0 && childThickness > parentThickness) {
+            this.$message.error(`子卷【${child.currentCoilNo}】实测厚度(${childThickness}mm)超过父卷实测厚度(${parentThickness}mm)，请先修正`)
+            return
+          }
+        }
+        if (totalChildNetWeight > 0 && parentNetWeight > 0 && totalChildNetWeight > parentNetWeight) {
+          this.$message.error(`所有子卷净重总和(${totalChildNetWeight.toFixed(3)}T)超过父卷净重(${parentNetWeight}T)，请先修正`)
+          return
+        }
+      }
       this.$confirm('确认完成整体分条操作？完成后将无法修改分条信息', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
-        type: 'warning',
-      }).then(async () => {
+        type: 'warning'
+      }).then(async() => {
         const loading = this.$loading({
           lock: true,
           text: '正在记录分条操作...',
-          background: 'rgba(0, 0, 0, 0.7)',
+          background: 'rgba(0, 0, 0, 0.7)'
         })
         try {
           this.buttonLoading = true
@@ -918,51 +1057,51 @@ export default {
     },
     // 格式化毫秒值为xx天xx小时xx分钟
     formatDuration(milliseconds) {
-      if (!milliseconds || milliseconds < 0) return '';
+      if (!milliseconds || milliseconds < 0) return ''
 
-      const seconds = Math.floor(milliseconds / 1000);
-      const minutes = Math.floor(seconds / 60);
-      const hours = Math.floor(minutes / 60);
-      const days = Math.floor(hours / 24);
+      const seconds = Math.floor(milliseconds / 1000)
+      const minutes = Math.floor(seconds / 60)
+      const hours = Math.floor(minutes / 60)
+      const days = Math.floor(hours / 24)
 
-      const remainingHours = hours % 24;
-      const remainingMinutes = minutes % 60;
+      const remainingHours = hours % 24
+      const remainingMinutes = minutes % 60
 
-      let result = '';
-      if (days > 0) result += `${days}天`;
-      if (remainingHours > 0) result += `${remainingHours}小时`;
-      if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+      let result = ''
+      if (days > 0) result += `${days}天`
+      if (remainingHours > 0) result += `${remainingHours}小时`
+      if (remainingMinutes > 0) result += `${remainingMinutes}分钟`
 
-      return result || '0分钟';
+      return result || '0分钟'
     },
     // 计算生产耗时
     calculateProductionDuration() {
-      const { productionStartTime, productionEndTime } = this.splitForm;
+      const { productionStartTime, productionEndTime } = this.splitForm
       if (productionStartTime && productionEndTime) {
-        const start = new Date(productionStartTime).getTime();
-        const end = new Date(productionEndTime).getTime();
+        const start = new Date(productionStartTime).getTime()
+        const end = new Date(productionEndTime).getTime()
         if (end < start) {
           this.$message({
             message: '结束时间不能早于开始时间',
-            type: 'error',
-          });
-          this.$set(this.splitForm, 'productionDuration', '');
-          this.$set(this.splitForm, 'formattedDuration', '');
+            type: 'error'
+          })
+          this.$set(this.splitForm, 'productionDuration', '')
+          this.$set(this.splitForm, 'formattedDuration', '')
         } else {
-          const durationMs = end - start;
-          const durationMinutes = Math.round(durationMs / (1000 * 60));
-          this.$set(this.splitForm, 'productionDuration', durationMinutes);
-          this.$set(this.splitForm, 'formattedDuration', this.formatDuration(durationMinutes * 60 * 1000));
+          const durationMs = end - start
+          const durationMinutes = Math.round(durationMs / (1000 * 60))
+          this.$set(this.splitForm, 'productionDuration', durationMinutes)
+          this.$set(this.splitForm, 'formattedDuration', this.formatDuration(durationMinutes * 60 * 1000))
         }
       } else {
-        this.$set(this.splitForm, 'productionDuration', '');
-        this.$set(this.splitForm, 'formattedDuration', '');
+        this.$set(this.splitForm, 'productionDuration', '')
+        this.$set(this.splitForm, 'formattedDuration', '')
       }
     },
 
     // 新增异常
     addAbnormal() {
-      this.currentAbnormalIndex = -1;
+      this.currentAbnormalIndex = -1
       this.abnormalForm = {
         coilId: this.splitForm.coilId || null,
         position: null,
@@ -972,15 +1111,15 @@ export default {
         defectCode: null,
         degree: null,
         remark: null
-      };
-      this.abnormalDialogVisible = true;
+      }
+      this.abnormalDialogVisible = true
     },
 
     // 编辑异常
     editAbnormal(index) {
-      this.currentAbnormalIndex = index;
-      this.abnormalForm = { ...this.abnormals[index] };
-      this.abnormalDialogVisible = true;
+      this.currentAbnormalIndex = index
+      this.abnormalForm = { ...this.abnormals[index] }
+      this.abnormalDialogVisible = true
     },
 
     // 保存异常
@@ -988,19 +1127,19 @@ export default {
       this.$refs.abnormalForm.validate(valid => {
         if (valid) {
           // 计算缺陷长度
-          this.abnormalForm.length = this.abnormalForm.endPosition - this.abnormalForm.startPosition;
+          this.abnormalForm.length = this.abnormalForm.endPosition - this.abnormalForm.startPosition
 
           if (this.currentAbnormalIndex === -1) {
             // 新增异常
-            this.abnormals.push({ ...this.abnormalForm });
+            this.abnormals.push({ ...this.abnormalForm })
           } else {
             // 编辑异常
-            this.abnormals[this.currentAbnormalIndex] = { ...this.abnormalForm };
+            this.abnormals[this.currentAbnormalIndex] = { ...this.abnormalForm }
           }
 
-          this.abnormalDialogVisible = false;
+          this.abnormalDialogVisible = false
         }
-      });
+      })
     },
 
     // 删除异常
@@ -1010,32 +1149,32 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.abnormals.splice(index, 1);
-      });
+        this.abnormals.splice(index, 1)
+      })
     },
 
     // 获取异常位置文本
     getAbnormalPositionText(position) {
-      if (!position) return '';
-      const dict = this.dict.type.coil_abnormal_position;
-      if (!dict) return position;
-      const item = dict.find(item => item.value === position);
-      return item ? item.label : position;
+      if (!position) return ''
+      const dict = this.dict.type.coil_abnormal_position
+      if (!dict) return position
+      const item = dict.find(item => item.value === position)
+      return item ? item.label : position
     },
 
     // 获取异常代码文本
     getAbnormalCodeText(code) {
-      if (!code) return '';
-      const dict = this.dict.type.coil_abnormal_code;
-      if (!dict) return code;
-      const item = dict.find(item => item.value === code);
-      return item ? item.label : code;
+      if (!code) return ''
+      const dict = this.dict.type.coil_abnormal_code
+      if (!dict) return code
+      const item = dict.find(item => item.value === code)
+      return item ? item.label : code
     },
 
     // 复制源卷信息到分条表单
     copyFromSourceCoil() {
       // 复制除了指定字段之外的其他字段
-      const excludeFields = ['enterCoilNo', 'currentCoilNo', 'coilId', 'createTime', 'createBy'];
+      const excludeFields = ['enterCoilNo', 'currentCoilNo', 'coilId', 'createTime', 'createBy']
 
       // 构建要复制的字段
       const copiedFields = {
@@ -1057,20 +1196,21 @@ export default {
         actualWidth: parseFloat(this.coilInfo.actualWidth) || null,
         temperGrade: this.coilInfo.temperGrade,
         coatingType: this.coilInfo.coatingType,
+        chromePlateCoilNo: this.coilInfo.chromePlateCoilNo,
         remark: this.coilInfo.remark,
         productionStartTime: this.coilInfo.productionStartTime,
         productionEndTime: this.coilInfo.productionEndTime,
         productionDuration: this.coilInfo.productionDuration,
         formattedDuration: this.coilInfo.productionDuration ? this.formatDuration(this.coilInfo.productionDuration * 60 * 1000) : ''
-      };
+      }
 
       // 合并到分条表单
       this.splitForm = {
         ...this.splitForm,
         ...copiedFields
-      };
+      }
 
-      this.$message.success('已复制源卷信息，请根据需要修改');
+      this.$message.success('已复制源卷信息，请根据需要修改')
     },
 
     // 暂存表单内容
@@ -1114,7 +1254,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(async () => {
+      }).then(async() => {
         try {
           await delCoilCache(this.currentCache.cacheId)
           this.$message.success('删除缓存成功')
@@ -1124,7 +1264,7 @@ export default {
         }
       })
     }
-  },
+  }
 }
 </script>
 
@@ -1237,4 +1377,4 @@ export default {
 .plan-sheet-section {
   margin-top: 16px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 862e4e123..a65086c03 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -60,14 +60,20 @@
       </div>
       <!-- 右侧：更新表单 -->
       <div>
-        <el-card class="form-card">
-          <div slot="header" class="card-header">
-            <span><i class="el-icon-edit-outline"></i> {{ '更新信息' }}</span>
-            <div>
-              <el-button size="small" @click="saveTemp" :loading="loading">暂存内容</el-button>
-              <el-button type="primary" size="small" @click="handleSave" :loading="loading">保存更新</el-button>
+          <el-card class="form-card">
+            <div slot="header" class="card-header">
+              <span><i class="el-icon-edit-outline"></i> {{ '更新信息' }}</span>
+              <div>
+                <el-button size="small" @click="saveTemp" :loading="loading">暂存内容</el-button>
+                <el-button type="primary" size="small" @click="handleSave" :loading="loading">保存更新</el-button>
+              </div>
             </div>
-          </div>
+
+            <el-alert v-if="!isExemptFromValidation" type="warning" :closable="false" show-icon style="margin-bottom:12px">
+              <template slot="title">
+                更新后的<b>净重</b>和<b>实测厚度</b>均不能超过源卷的对应值
+              </template>
+            </el-alert>
 
           <div v-if="matchedSpec" style="margin-bottom:10px">
             <el-tag type="success" size="small">
@@ -530,6 +536,10 @@ export default {
     isDrAction() {
       return this.actionType === 504 || this.actionType === 524
     },
+    /** 镀锌/酸轧产线免验净重和厚度范围 */
+    isExemptFromValidation() {
+      return [11, 120, 200, 201, 520, 202, 501, 521].includes(Number(this.actionType))
+    },
     // 动态显示标签
     getItemLabel() {
       if (this.updateForm.materialType === '成品') {
@@ -814,6 +824,22 @@ export default {
           }
         }
 
+        // 校验净重和实测厚度不超过源卷（镀锌/酸轧除外）
+        if (!this.isExemptFromValidation) {
+          const parentNetWeight = parseFloat(this.currentInfo.netWeight) || 0
+          const parentThickness = parseFloat(this.currentInfo.actualThickness) || 0
+          const updateNetWeight = parseFloat(this.updateForm.netWeight) || 0
+          const updateThickness = parseFloat(this.updateForm.actualThickness) || 0
+          if (updateNetWeight > 0 && parentNetWeight > 0 && updateNetWeight > parentNetWeight) {
+            this.$message.error(`更新后净重(${updateNetWeight}T)不能超过源卷净重(${parentNetWeight}T)`)
+            return false
+          }
+          if (updateThickness > 0 && parentThickness > 0 && updateThickness > parentThickness) {
+            this.$message.error(`更新后实测厚度(${updateThickness}mm)不能超过源卷实测厚度(${parentThickness}mm)`)
+            return false
+          }
+        }
+
         const loadingInstance = this.$loading({
           lock: true,
           text: '正在更新钢卷信息，请稍后...',
diff --git a/klp-ui/src/views/wms/delivery/components/DugeWayBill1.vue b/klp-ui/src/views/wms/delivery/components/DugeWayBill1.vue
index 3c97c8123..407e71a20 100644
--- a/klp-ui/src/views/wms/delivery/components/DugeWayBill1.vue
+++ b/klp-ui/src/views/wms/delivery/components/DugeWayBill1.vue
@@ -477,16 +477,14 @@ export default {
       const blob = new Blob([pdfBytes], { type: 'application/pdf' });
       const url = URL.createObjectURL(blob);
 
-      const win = window.open(url, '_blank');
-      if (!win) {
-        this.$message.error('打印失败，请检查浏览器设置');
-        // const a = document.createElement('a');
-        // a.href = url;
-        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        // document.body.appendChild(a);
-        // a.click();
-        // document.body.removeChild(a);
-      }
+      const a = document.createElement('a');
+      a.target = '_blank';
+      a.href = url;
+      // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.pdf`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
     },
     async exportExcel() {
       try {
diff --git a/klp-ui/src/views/wms/delivery/components/DugeWayBill2.vue b/klp-ui/src/views/wms/delivery/components/DugeWayBill2.vue
index 12281830c..1b0934d63 100644
--- a/klp-ui/src/views/wms/delivery/components/DugeWayBill2.vue
+++ b/klp-ui/src/views/wms/delivery/components/DugeWayBill2.vue
@@ -475,16 +475,14 @@ export default {
       const blob = new Blob([pdfBytes], { type: 'application/pdf' });
       const url = URL.createObjectURL(blob);
 
-      const win = window.open(url, '_blank');
-      if (!win) {
-        this.$message.error('打印失败，请检查浏览器设置');
-        // const a = document.createElement('a');
-        // a.href = url;
-        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        // document.body.appendChild(a);
-        // a.click();
-        // document.body.removeChild(a);
-      }
+      const a = document.createElement('a');
+      a.target = '_blank';
+      a.href = url;
+      // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.pdf`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
     },
     async exportExcel() {
       try {
diff --git a/klp-ui/src/views/wms/delivery/components/ZincWayBill1.vue b/klp-ui/src/views/wms/delivery/components/ZincWayBill1.vue
index a29d9d7d3..fe555f594 100644
--- a/klp-ui/src/views/wms/delivery/components/ZincWayBill1.vue
+++ b/klp-ui/src/views/wms/delivery/components/ZincWayBill1.vue
@@ -477,16 +477,14 @@ export default {
       const blob = new Blob([pdfBytes], { type: 'application/pdf' });
       const url = URL.createObjectURL(blob);
 
-      const win = window.open(url, '_blank');
-      if (!win) {
-        this.$message.error('打印失败，请检查浏览器设置');
-        // const a = document.createElement('a');
-        // a.href = url;
-        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        // document.body.appendChild(a);
-        // a.click();
-        // document.body.removeChild(a);
-      }
+      const a = document.createElement('a');
+      a.target = '_blank';
+      a.href = url;
+      // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.pdf`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
     },
     async exportExcel() {
       try {
diff --git a/klp-ui/src/views/wms/delivery/components/ZincWayBill2.vue b/klp-ui/src/views/wms/delivery/components/ZincWayBill2.vue
index 2c97fe3c8..b0cf2b85a 100644
--- a/klp-ui/src/views/wms/delivery/components/ZincWayBill2.vue
+++ b/klp-ui/src/views/wms/delivery/components/ZincWayBill2.vue
@@ -35,7 +35,8 @@
           </div>
           <div class="header-right">
             <span class="label">订单号：</span>
-            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.orderId ? localWaybill.orderCode : localWaybill.principalPhone }}</div>
+            <div class="editable-input transparent-input" contenteditable>{{ localWaybill.orderId ?
+              localWaybill.orderCode : localWaybill.principalPhone }}</div>
           </div>
           <div class="header-right">
             <span class="label">合同号：</span>
@@ -475,16 +476,14 @@ export default {
       const blob = new Blob([pdfBytes], { type: 'application/pdf' });
       const url = URL.createObjectURL(blob);
 
-      const win = window.open(url, '_blank');
-      if (!win) {
-        this.$message.error('打印失败，请检查浏览器设置');
-        // const a = document.createElement('a');
-        // a.href = url;
-        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        // document.body.appendChild(a);
-        // a.click();
-        // document.body.removeChild(a);
-      }
+      const a = document.createElement('a');
+      a.target = '_blank';
+      a.href = url;
+      // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.pdf`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
     },
     async exportExcel() {
       try {
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill.vue b/klp-ui/src/views/wms/delivery/components/wayBill.vue
index 4d61c7eab..a1780f303 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill.vue
@@ -476,16 +476,14 @@ export default {
       const blob = new Blob([pdfBytes], { type: 'application/pdf' });
       const url = URL.createObjectURL(blob);
 
-      const win = window.open(url, '_blank');
-      if (!win) {
-        this.$message.error('打印失败，请检查浏览器设置');
-        // const a = document.createElement('a');
-        // a.href = url;
-        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        // document.body.appendChild(a);
-        // a.click();
-        // document.body.removeChild(a);
-      }
+      const a = document.createElement('a');
+      a.target = '_blank';
+      a.href = url;
+      // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.pdf`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
     },
     async exportExcelByXLSX() {
       try {
diff --git a/klp-ui/src/views/wms/delivery/components/wayBill2.vue b/klp-ui/src/views/wms/delivery/components/wayBill2.vue
index d6ba5d218..338ac02f3 100644
--- a/klp-ui/src/views/wms/delivery/components/wayBill2.vue
+++ b/klp-ui/src/views/wms/delivery/components/wayBill2.vue
@@ -475,16 +475,14 @@ export default {
       const blob = new Blob([pdfBytes], { type: 'application/pdf' });
       const url = URL.createObjectURL(blob);
 
-      const win = window.open(url, '_blank');
-      if (!win) {
-        this.$message.error('打印失败，请检查浏览器设置');
-        // const a = document.createElement('a');
-        // a.href = url;
-        // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || new Date().getTime()}.pdf`;
-        // document.body.appendChild(a);
-        // a.click();
-        // document.body.removeChild(a);
-      }
+      const a = document.createElement('a');
+      a.target = '_blank';
+      a.href = url;
+      // a.download = `发货单_${this.waybill.waybillName || this.waybill.waybillNo || Date.now()}.pdf`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
     },
     async exportExcelByXLSX() {
       try {
diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue
index 862c3b84a..669b19329 100644
--- a/klp-ui/src/views/wms/delivery/waybill/index.vue
+++ b/klp-ui/src/views/wms/delivery/waybill/index.vue
@@ -56,11 +56,6 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable
-                @keyup.enter.native="handleQuery" />
-            </el-form-item>
-
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
diff --git a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
index 4bb16ad94..1716ea734 100644
--- a/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/attendanceCheck.vue
@@ -171,7 +171,7 @@
             <el-form-item label="总体状态">
               <el-select v-if="isEdit" v-model="editForm.overallStatus" placeholder="请选择状态">
                 <el-option label="正常" value="normal" />
-                <el-option label="迟到/早退" value="abnormal" />
+                <el-option label="迟到/早退/缺卡" value="abnormal" />
                 <el-option label="半天旷工" value="absent_half" />
                 <el-option label="全天旷工" value="absent_full" />
               </el-select>
@@ -396,7 +396,7 @@
         <el-descriptions title="考勤汇总" :column="5" border style="margin-bottom: 20px;">
           <el-descriptions-item label="姓名">{{ currentPersonData.employeeName }}</el-descriptions-item>
           <el-descriptions-item label="正常">{{ personSummary.normal }}天</el-descriptions-item>
-          <el-descriptions-item label="迟到/早退">{{ personSummary.abnormal }}天</el-descriptions-item>
+          <el-descriptions-item label="迟到/早退/缺卡">{{ personSummary.abnormal }}天</el-descriptions-item>
           <el-descriptions-item label="半天旷工">{{ personSummary.absentHalf }}天</el-descriptions-item>
           <el-descriptions-item label="全天旷工">{{ personSummary.absentFull }}天</el-descriptions-item>
           <el-descriptions-item label="无记录">{{ personSummary.noRecord }}天</el-descriptions-item>
@@ -456,7 +456,7 @@
           </div>
           <div class="calendar-legend">
             <span class="legend-item"><span class="legend-dot normal"></span>正常</span>
-            <span class="legend-item"><span class="legend-dot late"></span>迟到/早退</span>
+            <span class="legend-item"><span class="legend-dot late"></span>迟到/早退/缺卡</span>
             <span class="legend-item"><span class="legend-dot absent-half"></span>半天旷工</span>
             <span class="legend-item"><span class="legend-dot absent-full"></span>全天旷工</span>
             <span class="legend-item"><span class="legend-dot no-record"></span>无记录</span>
@@ -957,6 +957,8 @@ export default {
         case 'absent_half': return 'status-absent-half'
         case 'absent_full': return 'status-absent-full'
         case 'abnormal': return 'status-abnormal'
+        case 'missed_start': return 'status-missed'
+        case 'missed_end': return 'status-missed'
         default: return 'status-default'
       }
     },
@@ -972,8 +974,10 @@ export default {
         case 'early_two': return '早退II'
         case 'absent_half': return '半天旷工'
         case 'absent_full': return '全天旷工'
-        case 'abnormal': return '迟到/早退'
+        case 'abnormal': return '迟到/早退/缺卡'
         case 'missed': return '未打卡'
+        case 'missed_start': return '上班漏打卡'
+        case 'missed_end': return '下班漏打卡'
         default: return '无'
       }
     },
@@ -1325,6 +1329,10 @@ export default {
   background-color: #c0c4cc;
 }
 
+.status-missed {
+  background-color: #e6a23c;
+}
+
 .shift-name {
   font-size: 12px;
   color: #606266;
diff --git a/klp-ui/src/views/wms/hrm/attendance/sync.vue b/klp-ui/src/views/wms/hrm/attendance/sync.vue
index f1019ce81..ec31b126a 100644
--- a/klp-ui/src/views/wms/hrm/attendance/sync.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/sync.vue
@@ -1,66 +1,66 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="" prop="pin">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="员工编号" prop="pin">
         <el-input
           v-model="queryParams.pin"
-          placeholder="请输入"
+          placeholder="请输入员工编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="ename">
+      <el-form-item label="姓名" prop="ename">
         <el-input
           v-model="queryParams.ename"
-          placeholder="请输入"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="deptname">
+      <el-form-item label="部门" prop="deptname">
         <el-input
           v-model="queryParams.deptname"
-          placeholder="请输入"
+          placeholder="请输入部门"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="sn">
+      <el-form-item label="考勤编号" prop="sn">
         <el-input
           v-model="queryParams.sn"
-          placeholder="请输入"
+          placeholder="请输入考勤编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="checktime">
+      <el-form-item label="打卡日期" prop="checktime">
         <el-date-picker clearable
           v-model="queryParams.checktime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择">
+          placeholder="请选择打卡日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="verify">
+      <el-form-item label="验证状态" prop="verify">
         <el-input
           v-model="queryParams.verify"
-          placeholder="请输入"
+          placeholder="请输入验证状态"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="stateno">
+      <el-form-item label="状态编码" prop="stateno">
         <el-input
           v-model="queryParams.stateno"
-          placeholder="请输入"
+          placeholder="请输入状态编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="state">
+      <el-form-item label="状态" prop="state">
         <el-input
           v-model="queryParams.state"
-          placeholder="请输入"
+          placeholder="请输入状态"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -68,7 +68,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="warning" icon="el-icon-upload" size="mini" :disabled="!lastSyncTime" @click="handleSync">同步</el-button>
+        <el-button type="warning" icon="el-icon-upload" size="mini" @click="handleSync">同步</el-button>
       </el-form-item>
     </el-form>
 
@@ -124,42 +124,42 @@
 
     <!-- 添加或修改考勤记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="" prop="pin">
-          <el-input v-model="form.pin" placeholder="请输入" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="员工编号" prop="pin">
+          <el-input v-model="form.pin" placeholder="请输入员工编号" />
         </el-form-item>
-        <el-form-item label="" prop="ename">
-          <el-input v-model="form.ename" placeholder="请输入" />
+        <el-form-item label="姓名" prop="ename">
+          <el-input v-model="form.ename" placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="" prop="deptname">
-          <el-input v-model="form.deptname" placeholder="请输入" />
+        <el-form-item label="部门" prop="deptname">
+          <el-input v-model="form.deptname" placeholder="请输入部门" />
         </el-form-item>
-        <el-form-item label="" prop="sn">
-          <el-input v-model="form.sn" placeholder="请输入" />
+        <el-form-item label="考勤编号" prop="sn">
+          <el-input v-model="form.sn" placeholder="请输入考勤编号" />
         </el-form-item>
-        <el-form-item label="" prop="checktime">
+        <el-form-item label="打卡时间" prop="checktime">
           <el-date-picker clearable
             v-model="form.checktime"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择">
+            placeholder="请选择打卡时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="" prop="verify">
-          <el-input v-model="form.verify" placeholder="请输入" />
+        <el-form-item label="验证状态" prop="verify">
+          <el-input v-model="form.verify" placeholder="请输入验证状态" />
         </el-form-item>
-        <el-form-item label="" prop="stateno">
-          <el-input v-model="form.stateno" placeholder="请输入" />
+        <el-form-item label="状态编码" prop="stateno">
+          <el-input v-model="form.stateno" placeholder="请输入状态编码" />
         </el-form-item>
-        <el-form-item label="" prop="state">
-          <el-input v-model="form.state" placeholder="请输入" />
+        <el-form-item label="状态" prop="state">
+          <el-input v-model="form.state" placeholder="请输入状态" />
         </el-form-item>
-        <el-form-item label="" prop="createdAt">
+        <el-form-item label="创建时间" prop="createdAt">
           <el-date-picker clearable
             v-model="form.createdAt"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择">
+            placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -168,12 +168,30 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 同步对话框 -->
+    <el-dialog title="同步考勤数据" :visible.sync="syncDialogVisible" width="420px" append-to-body>
+      <el-form ref="syncForm" :model="syncFormData" :rules="syncRules" label-width="80px">
+        <el-form-item label="同步月份" prop="syncMonth">
+          <el-date-picker
+            v-model="syncFormData.syncMonth"
+            type="month"
+            value-format="yyyy-MM"
+            placeholder="请选择同步月份"
+            style="width: 100%">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="syncLoading" type="primary" @click="doSync">确定同步</el-button>
+        <el-button @click="syncDialogVisible = false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listRecords, getRecords, delRecords, addRecords, updateRecords, syncRecords } from "@/api/wms/attendance";
-import { getConfigKey, updateConfigByKey } from '@/api/system/config'
 
 export default {
   name: "Records",
@@ -181,6 +199,18 @@ export default {
     return {
       // 按钮loading
       buttonLoading: false,
+      // 同步loading
+      syncLoading: false,
+      // 同步弹窗
+      syncDialogVisible: false,
+      // 同步表单
+      syncFormData: {
+        syncMonth: ""
+      },
+      // 同步表单校验
+      syncRules: {
+        syncMonth: [{ required: true, message: "请选择同步月份", trigger: "change" }]
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -215,20 +245,12 @@ export default {
       },
       // 表单参数
       form: {},
-      lastSyncTime: undefined
     };
   },
   created() {
-    this.getLastSyncTime();
     this.getList();
   },
   methods: {
-    // 最后同步时间
-    getLastSyncTime() {
-      getConfigKey('hrm.attendance.lastsync').then(response => {
-        this.lastSyncTime = response.msg
-      })
-    },
     /** 查询考勤记录列表 */
 
     getList() {
@@ -246,23 +268,32 @@ export default {
     },
     // 同步按钮
     handleSync() {
-      this.buttonLoading = true;
-      if (!this.lastSyncTime) {
-        this.$modal.msgError("请先查询最后同步时间");
-        return;
-      }
-      this.$modal.confirm('确认同步吗？', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        syncRecords(this.lastSyncTime).then(response => {
-          console.log(response)
-          updateConfigByKey('hrm.attendance.lastsync', response.endtime)
-          this.$modal.msgSuccess("同步成功");
+      this.syncFormData.syncMonth = "";
+      this.syncDialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs.syncForm && this.$refs.syncForm.clearValidate();
+      });
+    },
+    // 执行同步
+    doSync() {
+      this.$refs.syncForm.validate(valid => {
+        if (!valid) return;
+        const { syncMonth } = this.syncFormData;
+        const [year, month] = syncMonth.split('-');
+        const lastDay = new Date(year, month, 0).getDate();
+        const starttime = `${syncMonth}-01 00:00:00`;
+        const endtime = `${syncMonth}-${String(lastDay).padStart(2, '0')} 23:59:59`;
+
+        this.syncLoading = true;
+        syncRecords({ starttime, endtime }).then(res => {
+          const msg = `${res.message}（同步区间：${res.starttime} ~ ${res.endtime}，共 ${res.records_synced} 条记录）`;
+          this.$modal.msgSuccess(msg);
+          this.syncLoading = false;
+          this.syncDialogVisible = false;
           this.getList();
+        }).catch(() => {
+          this.syncLoading = false;
         });
-        this.buttonLoading = false;
       });
     },
     // 表单重置
diff --git a/klp-ui/src/views/wms/report/components/setting/columns.vue b/klp-ui/src/views/wms/report/components/setting/columns.vue
index 3bc33fa30..700f893c8 100644
--- a/klp-ui/src/views/wms/report/components/setting/columns.vue
+++ b/klp-ui/src/views/wms/report/components/setting/columns.vue
@@ -154,7 +154,11 @@ export default {
         { label: '厂家', value: 'manufacturer' },
         { label: '表面处理', value: 'surfaceTreatmentDesc' },
         { label: '镀层质量', value: 'zincLayer' },
-        { label: '长度', value: 'length' },
+        { label: '实测长度', value: 'actualLength' },
+        { label: '理论长度', value: 'theoreticalLength' },
+        { label: '实测厚度', value: 'actualThickness' },
+        { label: '理论厚度', value: 'theoreticalThickness' },
+        { label: '实测宽度', value: 'actualWidth' },
         { label: '毛重', value: 'grossWeight' },
         { label: '净重', value: 'netWeight' },
         { label: '创建时间', value: 'createTime' },
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index 21bd8ca31..0b901cd39 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -87,9 +87,9 @@
     </el-dialog>
 
     <!-- 自定义导出列选择弹窗 -->
-    <el-dialog title="自定义导出 - 选择导出列" :visible.sync="customExportVisible" width="750px">
+    <el-dialog title="自定义导出 - 选择导出列" :visible.sync="customExportVisible" width="850px" top="5vh">
       <div class="custom-export-toolbar">
-        <el-input v-model="columnSearch" placeholder="搜索列名" prefix-icon="el-icon-search" clearable size="small" style="width: 220px" />
+        <el-input v-model="columnSearch" placeholder="搜索列名" prefix-icon="el-icon-search" clearable size="small" style="width: 200px" />
         <div class="custom-export-actions">
           <el-button size="small" @click="selectAllColumns">全选</el-button>
           <el-button size="small" @click="invertColumns">反选</el-button>
@@ -97,25 +97,47 @@
         </div>
       </div>
       <div class="custom-export-body">
-        <el-checkbox-group v-model="selectedColumns">
-          <div v-for="(group, gName) in groupedColumns" :key="gName" class="column-group">
-            <div class="column-group-title">{{ gName }}</div>
-            <div class="column-group-items">
-              <el-checkbox
-                v-for="field in group"
-                :key="field.key"
-                :label="field.key"
-                :style="{ display: columnSearch && !filterMatch(field) ? 'none' : '' }"
-              >{{ field.label }}</el-checkbox>
-            </div>
+        <div class="export-left">
+          <div class="export-panel-title">可选列</div>
+          <div class="export-left-scroll">
+            <el-checkbox-group v-model="selectedColumns">
+              <div v-for="(group, gName) in groupedColumns" :key="gName" class="column-group">
+                <div class="column-group-title">{{ gName }}</div>
+                <div class="column-group-items">
+                  <el-checkbox
+                    v-for="field in group"
+                    :key="field.key"
+                    :label="field.key"
+                    :style="{ display: columnSearch && !filterMatch(field) ? 'none' : '' }"
+                  >{{ field.label }}</el-checkbox>
+                </div>
+              </div>
+            </el-checkbox-group>
           </div>
-        </el-checkbox-group>
+        </div>
+        <div class="export-right">
+          <div class="export-panel-title">
+            导出顺序
+            <span class="order-count">{{ orderedColumns.length }}</span>
+          </div>
+          <div class="export-right-scroll">
+            <draggable v-model="orderedColumns" class="ordered-list" ghost-class="ghost" handle=".drag-handle">
+              <div v-for="field in orderedColumns" :key="field" class="ordered-item">
+                <i class="el-icon-rank drag-handle"></i>
+                <span class="order-index">{{ orderedColumns.indexOf(field) + 1 }}</span>
+                <span class="order-label">{{ exportColumns[field] || field }}</span>
+                <i class="el-icon-close order-remove" @click.stop="removeOrderedField(field)"></i>
+              </div>
+            </draggable>
+            <div v-if="orderedColumns.length === 0" class="empty-tip">勾选左侧列后出现在此处，可拖拽排序</div>
+          </div>
+        </div>
       </div>
       <div slot="footer" class="custom-export-footer">
-        <span class="selected-tip">已选 <b>{{ selectedColumns.length }}</b> / {{ flatColumns.length }} 列</span>
+        <span class="selected-tip">已选 <b>{{ orderedColumns.length }}</b> / {{ flatColumns.length }} 列</span>
         <el-button @click="customExportVisible = false">取消</el-button>
-        <el-button type="primary" @click="doCustomExport" :disabled="selectedColumns.length === 0">
-          导出选中列
+        <el-button type="primary" @click="doCustomExport" :disabled="orderedColumns.length === 0">
+          导出
         </el-button>
       </div>
     </el-dialog>
@@ -140,6 +162,7 @@ import TimeRangePicker from "@/views/wms/report/components/timeRangePicker.vue";
 import HierarchicalPivot from "@/views/wms/report/components/hierarchicalPivot/index.vue";
 import CrossTable from "@/views/wms/report/components/crossTable/index.vue";
 import { saveReportFile } from "@/views/wms/report/js/reportFile";
+import draggable from 'vuedraggable';
 
 
 export default {
@@ -155,6 +178,7 @@ export default {
     TimeRangePicker,
     HierarchicalPivot,
     CrossTable,
+    draggable,
   },
   dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
   data() {
@@ -184,13 +208,14 @@ export default {
       customExportVisible: false,
       exportColumns: {},
       selectedColumns: [],
+      orderedColumns: [],
       columnSearch: '',
       columnGroups: {
         '基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'],
         '钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'],
         '时间': ['createTime', 'exportTime', 'exportBy'],
-        '物理属性': ['netWeight', 'length', 'specification', 'actualThickness'],
-        '材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType'],
+        '物理属性': ['netWeight', 'length', 'specification', 'actualThickness', 'theoreticalThickness', 'theoreticalLength'],
+        '材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo'],
         '用途': ['purpose', 'businessPurpose'],
         '状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],
         '其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'saleName', 'remark', 'team'],
@@ -287,6 +312,22 @@ export default {
     },
 
   },
+  watch: {
+    selectedColumns: {
+      immediate: false,
+      handler(nv, ov) {
+        const newSet = new Set(nv)
+        const oldSet = ov ? new Set(ov) : new Set()
+        // 移除取消勾选的列
+        this.orderedColumns = this.orderedColumns.filter(f => newSet.has(f))
+        // 新勾选的追加到末尾
+        const added = nv.filter(f => !oldSet.has(f))
+        if (added.length) {
+          this.orderedColumns.push(...added)
+        }
+      }
+    }
+  },
   methods: {
     // 加载列设置
     loadColumns() {
@@ -354,14 +395,17 @@ export default {
         this.customExportVisible = true
       })
     },
-    // 执行自定义导出
+    // 执行自定义导出（按 orderedColumns 顺序）
     doCustomExport() {
       this.customExportVisible = false
-      this.download('wms/materialCoil/exportCustom', {
+      this.download('wms/materialCoil/exportCustomOrdered', {
         coilIds: this.coilIds,
-        columns: this.selectedColumns.join(','),
+        columnsOrdered: this.orderedColumns.join(','),
       }, `materialCoil_${new Date().getTime()}.xlsx`)
     },
+    removeOrderedField(field) {
+      this.selectedColumns = this.selectedColumns.filter(f => f !== field)
+    },
     filterMatch(field) {
       const keyword = this.columnSearch.toLowerCase()
       return !keyword || field.label.toLowerCase().includes(keyword) || field.key.toLowerCase().includes(keyword)
@@ -406,8 +450,8 @@ export default {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 16px;
-  padding-bottom: 12px;
+  margin-bottom: 12px;
+  padding-bottom: 10px;
   border-bottom: 1px solid #ebeef5;
 }
 .custom-export-actions {
@@ -415,29 +459,134 @@ export default {
   gap: 8px;
 }
 .custom-export-body {
-  max-height: 420px;
+  display: flex;
+  gap: 16px;
+  height: 420px;
+}
+.export-left {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-width: 0;
+}
+.export-right {
+  width: 260px;
+  display: flex;
+  flex-direction: column;
+  border-left: 1px solid #ebeef5;
+  padding-left: 16px;
+}
+.export-panel-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.order-count {
+  background: #409eff;
+  color: #fff;
+  font-size: 11px;
+  padding: 1px 7px;
+  border-radius: 10px;
+  font-weight: normal;
+}
+.export-left-scroll {
+  flex: 1;
+  overflow-y: auto;
+  padding-right: 8px;
+}
+.export-right-scroll {
+  flex: 1;
   overflow-y: auto;
 }
 .column-group {
-  margin-bottom: 14px;
+  margin-bottom: 12px;
 }
 .column-group-title {
-  font-size: 13px;
+  font-size: 12px;
   font-weight: 600;
-  color: #606266;
-  margin-bottom: 8px;
-  padding-left: 2px;
-  border-left: 3px solid #409eff;
+  color: #909399;
+  margin-bottom: 6px;
   padding-left: 8px;
+  border-left: 2px solid #dcdfe6;
 }
 .column-group-items {
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 4px 12px;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 2px 8px;
 }
 .column-group-items .el-checkbox {
   margin-right: 0;
 }
+.ordered-list {
+  min-height: 60px;
+}
+.ordered-item {
+  display: flex;
+  align-items: center;
+  padding: 6px 8px;
+  margin-bottom: 4px;
+  background: #f5f7fa;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  cursor: default;
+  transition: background .2s;
+}
+.ordered-item:hover {
+  background: #ecf5ff;
+  border-color: #c6e2ff;
+}
+.ordered-item.ghost {
+  opacity: 0.4;
+  background: #409eff;
+}
+.drag-handle {
+  color: #c0c4cc;
+  cursor: grab;
+  margin-right: 6px;
+}
+.drag-handle:active {
+  cursor: grabbing;
+}
+.order-index {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  font-size: 11px;
+  color: #909399;
+  background: #e4e7ed;
+  border-radius: 50%;
+  margin-right: 6px;
+  flex-shrink: 0;
+}
+.order-label {
+  flex: 1;
+  font-size: 13px;
+  color: #303133;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.order-remove {
+  color: #c0c4cc;
+  cursor: pointer;
+  font-size: 12px;
+  flex-shrink: 0;
+}
+.order-remove:hover {
+  color: #f56c6c;
+}
+.empty-tip {
+  color: #c0c4cc;
+  font-size: 12px;
+  text-align: center;
+  padding-top: 30px;
+}
 .custom-export-footer {
   display: flex;
   align-items: center;
diff --git a/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue b/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
new file mode 100644
index 000000000..79b46aa65
--- /dev/null
+++ b/klp-ui/src/views/wms/warehouse/components/Warehouse3D.vue
@@ -0,0 +1,1051 @@
+<template>
+  <div class="wh3d-wrapper" :class="'wh3d-' + themeMode" :style="cssVars">
+    <div class="wh3d-header">
+      <h1>钢卷库 3D 可视化系统</h1>
+      <span class="tag">地面存放 · 最大叠放 2 层 · 无货架</span>
+      <span class="fps">FPS: <b>{{ fps }}</b></span>
+    </div>
+    <div class="wh3d-main">
+      <div class="wh3d-view" ref="viewEl">
+        <div class="wh3d-vbt">
+          <button v-for="v in viewBtns" :key="v.k" :class="{ act: viewMode === v.k }" @click="setView(v.k)">{{ v.l }}</button>
+          <button class="theme-toggle" @click="toggleTheme" :title="'切换为' + (themeMode === 'dark' ? '浅色' : '深色') + '主题'">
+            {{ themeMode === 'dark' ? '浅色' : '深色' }}
+          </button>
+        </div>
+
+        <div class="wh3d-help">
+          <div class="hh">操作说明</div>
+          <div class="hr"><kbd>左键</kbd> 旋转视角</div>
+          <div class="hr"><kbd>右键</kbd> 平移视角</div>
+          <div class="hr"><kbd>滚轮</kbd> 缩放</div>
+          <div class="hr"><kbd>点击</kbd> 查看钢卷详情</div>
+          <div class="hr"><kbd>R</kbd> 复位视角 · <kbd>Esc</kbd> 关闭</div>
+        </div>
+
+        <div class="wh3d-axis">
+          <span>X 轴 · 列 (C)</span>
+          <span class="vt">Z 轴 · 排 (R)</span>
+        </div>
+
+        <div class="wh3d-dlg" v-show="detail" v-loading="detailLoading">
+          <button class="x" @click="closeDetail">×</button>
+          <h3>钢卷 {{ detail && detail.coilNo }}</h3>
+          <div class="rw"><span class="k">库位</span><span class="v">{{ detail && (detail.warehouseName || detail.posKey) }} · 第 {{ detail && detail.layer }} 层</span></div>
+          <div class="rw"><span class="k">钢卷号</span><span class="v">{{ detail && detail.coilNo }}</span></div>
+          <div class="rw"><span class="k">入库钢卷号</span><span class="v">{{ detail && (detail.enterCoilNo || '-') }}</span></div>
+          <div class="rw"><span class="k">材质</span><span class="v">{{ detail && detail.material }}</span></div>
+          <div class="rw"><span class="k">规格</span><span class="v">{{ detail && detail.specification }}</span></div>
+          <div class="rw"><span class="k">毛重(kg)</span><span class="v">{{ detail && fmtNum(detail.grossWeight) }}</span></div>
+          <div class="rw"><span class="k">净重(kg)</span><span class="v">{{ detail && fmtNum(detail.netWeight) }}</span></div>
+          <div class="rw"><span class="k">质量状态</span><span class="v">{{ detail && detail.qualityStatus }}</span></div>
+
+          <div class="sec-title">移库信息</div>
+          <table class="sec-tbl" v-if="detail && detail.moves && detail.moves.length">
+            <thead><tr><th>时间</th><th>库位</th><th>操作</th><th>出入库</th></tr></thead>
+            <tbody>
+              <tr v-for="(m, i) in detail.moves" :key="i">
+                <td>{{ m.time }}</td>
+                <td>{{ m.warehouse }}</td>
+                <td>{{ m.operationType }}</td>
+                <td>{{ m.inOutType }}</td>
+              </tr>
+            </tbody>
+          </table>
+          <div v-else-if="detail && !detailLoading" class="sec-empty">暂无移库记录</div>
+
+          <div class="sec-title">生产追溯</div>
+          <div v-if="detail && detail.trace && detail.trace.steps && detail.trace.steps.length" class="trace">
+            <div v-for="(step, i) in traceSteps" :key="i" class="trace-step">
+              <div class="ts-head">
+                <span class="ts-action">{{ step.action }}</span>
+                <span class="ts-time">{{ step.time }}</span>
+              </div>
+              <div class="ts-op" v-if="step.operation">操作员：{{ step.operation }}</div>
+              <div class="ts-coils" v-if="step.newCoilInfoList && step.newCoilInfoList.length">
+                <span v-for="(c, idx) in step.newCoilInfoList" :key="idx" class="ts-tag" v-if="c && c.currentCoilNo && c.currentCoilNo !== '-'">
+                  {{ c.currentCoilNo }}
+                </span>
+              </div>
+            </div>
+          </div>
+          <div v-else-if="detail && !detailLoading" class="sec-empty">暂无追溯数据</div>
+        </div>
+      </div>
+
+      <div class="wh3d-info">
+        <h2>库区统计</h2>
+        <div class="ss">
+          <div class="sg">
+            <div class="sc"><div class="l">总库位</div><div class="v">{{ stats.total }}</div></div>
+            <div class="sc"><div class="l">已占用</div><div class="v">{{ stats.used }}</div></div>
+            <div class="sc"><div class="l">空闲位</div><div class="v">{{ stats.free }}</div></div>
+            <div class="sc"><div class="l">占用率</div><div class="v primary">{{ stats.pct }}</div></div>
+            <div class="sc"><div class="l">钢卷总数</div><div class="v">{{ stats.coils }}</div></div>
+            <div class="sc"><div class="l">双层叠放</div><div class="v">{{ stats.doubled }}</div></div>
+          </div>
+        </div>
+        <h2>钢卷明细</h2>
+        <div class="ctb">
+          <table>
+            <thead><tr><th>库位</th><th>钢卷号</th><th>规格</th><th>重量</th></tr></thead>
+            <tbody>
+              <tr v-for="c in tableRows" :key="c.id"
+                  :class="{ sel: detail && detail.id === c.id }"
+                  @click="showCoilDetail(c.id)">
+                <td>{{ c.posKey }} L{{ c.layer }}</td>
+                <td>{{ c.coilNo }}</td>
+                <td>{{ c.specification }}</td>
+                <td>{{ fmtNum(c.grossWeight) }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as THREE from 'three';
+import { listMaterialCoil, getMaterialCoilTrace } from '@/api/wms/coil';
+import { getCoilWarehouseOperationLogByCoilId } from '@/api/wms/coilWarehouseOperationLog';
+
+const OP_TYPE_MAP = { 1: '收货', 2: '加工', 3: '调拨', 4: '发货' };
+const IN_OUT_MAP = { 1: '入库', 2: '出库' };
+
+function formatDate(d) {
+  if (!d) return '-';
+  const dt = typeof d === 'string' ? new Date(d.replace(' ', 'T')) : new Date(d);
+  if (isNaN(dt.getTime())) return String(d);
+  const p = (n) => (n < 10 ? '0' + n : '' + n);
+  return `${dt.getFullYear()}-${p(dt.getMonth() + 1)}-${p(dt.getDate())} ${p(dt.getHours())}:${p(dt.getMinutes())}`;
+}
+
+const GRADE_LIST = ['SPHC', 'SPHD', 'Q195', 'Q235', 'DC01', 'DC03', 'SUS304'];
+const CELL_W = 3.2, CELL_D = 3.2, GAP = 0.5;
+const COIL_OD = 1.6, COIL_W = 1.1;
+
+function pad2(n) { return n < 10 ? '0' + n : '' + n; }
+
+function parseCode(code) {
+  if (!code) return null;
+  const reg = /^([A-Za-z0-9]{3})([^-]+)-X?(\d{2})-(\d+)$/;
+  const m = code.match(reg);
+  if (!m) return null;
+  return { column: Number(m[2]), row: Number(m[3]), layer: Number(m[4]) };
+}
+
+function hexToInt(hex) {
+  if (!hex) return 0x409eff;
+  return parseInt(hex.replace('#', ''), 16);
+}
+
+export default {
+  name: 'Warehouse3D',
+  props: {
+    warehouseList: { type: Array, default: () => [] },
+    parentId: { type: [String, Number], default: '' },
+  },
+  data() {
+    return {
+      fps: '--',
+      viewMode: 'iso',
+      detail: null,
+      stats: { total: 0, used: 0, free: 0, pct: '0%', coils: 0, doubled: 0 },
+      coilList: [],
+      cols: 14,
+      rows: 6,
+      themeMode: localStorage.getItem('wh3d-theme') || 'dark',
+      materialCoils: [],
+      detailLoading: false,
+      viewBtns: [
+        { k: 'iso', l: '等轴' },
+        { k: 'top', l: '俯视' },
+        { k: 'front', l: '正视' },
+        { k: 'side', l: '侧视' },
+      ],
+    };
+  },
+  computed: {
+    themeColor() {
+      return (this.$store && this.$store.state.settings && this.$store.state.settings.theme) || '#409EFF';
+    },
+    palette() {
+      // 整套色板根据 themeMode 切换；3D 场景与 DOM 都用同一份
+      if (this.themeMode === 'light') {
+        return {
+          sceneBg: 0xf5f7fa,
+          ground: 0xe4eaf2,
+          gridMajor: 0x9aa5b1,
+          gridMinor: 0xdcdfe6,
+          slot: 0xeef2f7,
+          slotOpacity: 0.55,
+          coilBody: 0x303133,
+          coilEnd: 0x9aa5b1,
+          coilHole: 0x1a1a1a,
+          ambient: 0.95, dirMain: 1.0, dirFill: 0.4, hemiSky: 0xffffff, hemiGround: 0xcccccc,
+          highlightEmissive: 0xf39c12,
+          highlightColor: hexToInt(this.themeColor),
+        };
+      }
+      return {
+        sceneBg: 0x080c14,
+        ground: 0x111a26,
+        gridMajor: 0x1e3a5f,
+        gridMinor: 0x0f1923,
+        slot: 0x1a3a1a,
+        slotOpacity: 0.55,
+        coilBody: 0x1a1a1a,
+        coilEnd: 0x9aa5b1,
+        coilHole: 0x000000,
+        ambient: 0.6, dirMain: 1.1, dirFill: 0.35, hemiSky: 0x445566, hemiGround: 0x111820,
+        highlightEmissive: 0xf39c12,
+        highlightColor: hexToInt(this.themeColor),
+      };
+    },
+    cssVars() {
+      return { '--wh3d-primary': this.themeColor };
+    },
+    tableRows() {
+      return this.coilList.slice().sort((a, b) => {
+        if (a.posKey !== b.posKey) return a.posKey.localeCompare(b.posKey);
+        return a.layer - b.layer;
+      });
+    },
+    traceSteps() {
+      if (!this.detail || !this.detail.trace || !this.detail.trace.steps) return [];
+      return this.detail.trace.steps.slice().reverse();
+    },
+  },
+  watch: {
+    warehouseList() { if (this._ready) this.fetchAndRebuild(); },
+    parentId() { if (this._ready) this.fetchAndRebuild(); },
+    themeColor() { if (this._ready) this.rebuild(); },
+    themeMode() {
+      if (!this._ready) return;
+      this.scene.background = new THREE.Color(this.palette.sceneBg);
+      this.rebuild();
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initScene();
+      this._ready = true;
+      this.fetchAndRebuild();
+    });
+  },
+  beforeDestroy() {
+    this._destroyed = true;
+    if (this._raf) cancelAnimationFrame(this._raf);
+    window.removeEventListener('resize', this._onResize);
+    document.removeEventListener('keydown', this._onKey);
+    if (this.renderer) {
+      this.renderer.dispose && this.renderer.dispose();
+      if (this.renderer.domElement && this.renderer.domElement.parentNode) {
+        this.renderer.domElement.parentNode.removeChild(this.renderer.domElement);
+      }
+    }
+  },
+  methods: {
+    fmtNum(n) { return n == null ? '-' : Number(n).toLocaleString(); },
+
+    deriveGrid() {
+      let maxC = 0, maxR = 0;
+      (this.warehouseList || []).forEach((w) => {
+        const info = parseCode(w.actualWarehouseCode);
+        if (info) {
+          if (info.column > maxC) maxC = info.column;
+          if (info.row > maxR) maxR = info.row;
+        }
+      });
+      this.cols = Math.max(maxC, 8);
+      this.rows = Math.max(maxR, 4);
+    },
+
+    initScene() {
+      this.deriveGrid();
+      this.scene = new THREE.Scene();
+      this.scene.background = new THREE.Color(this.palette.sceneBg);
+
+      const el = this.$refs.viewEl;
+      const w = Math.max(el.clientWidth - 310, 100);
+      const h = Math.max(el.clientHeight, 100);
+
+      this.camera = new THREE.PerspectiveCamera(50, w / h, 0.1, 200);
+      this.camTarget = { x: 0, y: 1.5, z: 0 };
+      this.camR = 36; this.camTheta = 0.6; this.camPhi = 0.55;
+      this.updateCamera();
+
+      this.renderer = new THREE.WebGLRenderer({ antialias: true });
+      this.renderer.setPixelRatio(Math.min(window.devicePixelRatio, 2));
+      this.renderer.shadowMap.enabled = true;
+      this.renderer.shadowMap.type = THREE.PCFSoftShadowMap;
+      this.renderer.setSize(w, h);
+      el.appendChild(this.renderer.domElement);
+
+      const P = this.palette;
+      this.scene.add(new THREE.AmbientLight(0xffffff, P.ambient));
+      const dl = new THREE.DirectionalLight(0xffffff, P.dirMain);
+      dl.position.set(20, 30, 18);
+      dl.castShadow = true;
+      dl.shadow.mapSize.set(1024, 1024);
+      this.scene.add(dl);
+      const fill = new THREE.DirectionalLight(0xa0c0ff, P.dirFill);
+      fill.position.set(-15, 20, -10);
+      this.scene.add(fill);
+      this.scene.add(new THREE.HemisphereLight(P.hemiSky, P.hemiGround, 0.5));
+
+      this.clock = new THREE.Clock();
+      this.raycaster = new THREE.Raycaster();
+      this.mouseVec = new THREE.Vector2();
+
+      this.buildGround();
+      this.buildAllCoils();
+      this.updateStats();
+
+      const dom = this.renderer.domElement;
+      dom.addEventListener('click', this.onCanvasClick);
+      dom.addEventListener('mousedown', this.onMouseDown);
+      dom.addEventListener('mousemove', this.onMouseMove);
+      dom.addEventListener('mouseup', this.onMouseUp);
+      dom.addEventListener('wheel', this.onMouseWheel, { passive: false });
+      dom.addEventListener('contextmenu', (e) => e.preventDefault());
+      this._onResize = () => this.resizeRenderer();
+      this._onKey = (e) => {
+        if (e.key === 'r' || e.key === 'R') this.setView('iso');
+        if (e.key === 'Escape') this.closeDetail();
+      };
+      window.addEventListener('resize', this._onResize);
+      document.addEventListener('keydown', this._onKey);
+
+      this.fpsCount = 0; this.fpsTime = 0;
+      this.animate();
+    },
+
+    clearScene() {
+      const dispose = (obj) => {
+        if (obj.geometry) obj.geometry.dispose();
+        if (obj.material) {
+          if (Array.isArray(obj.material)) obj.material.forEach((m) => m.dispose());
+          else obj.material.dispose();
+        }
+      };
+      const children = this.scene.children.slice();
+      children.forEach((o) => {
+        if (o.isLight) return;
+        o.traverse && o.traverse(dispose);
+        this.scene.remove(o);
+      });
+    },
+
+    rebuild() {
+      if (!this.scene) return;
+      this.detail = null;
+      this.clearScene();
+      // 重新加灯（clearScene 保留灯，但主题变化时需要刷新强度，所以也清掉并重建）
+      const lights = this.scene.children.filter((o) => o.isLight);
+      lights.forEach((l) => this.scene.remove(l));
+      const P = this.palette;
+      this.scene.background = new THREE.Color(P.sceneBg);
+      this.scene.add(new THREE.AmbientLight(0xffffff, P.ambient));
+      const dl = new THREE.DirectionalLight(0xffffff, P.dirMain);
+      dl.position.set(20, 30, 18);
+      dl.castShadow = true;
+      this.scene.add(dl);
+      const fill = new THREE.DirectionalLight(0xa0c0ff, P.dirFill);
+      fill.position.set(-15, 20, -10);
+      this.scene.add(fill);
+      this.scene.add(new THREE.HemisphereLight(P.hemiSky, P.hemiGround, 0.5));
+      this.buildGround();
+      this.buildAllCoils();
+      this.updateStats();
+    },
+
+    toggleTheme() {
+      this.themeMode = this.themeMode === 'dark' ? 'light' : 'dark';
+      localStorage.setItem('wh3d-theme', this.themeMode);
+    },
+
+    resizeRenderer() {
+      if (!this.renderer) return;
+      const el = this.$refs.viewEl;
+      const w = Math.max(el.clientWidth - 310, 100);
+      const h = Math.max(el.clientHeight, 100);
+      this.renderer.setSize(w, h);
+      this.camera.aspect = w / h;
+      this.camera.updateProjectionMatrix();
+    },
+
+    updateCamera() {
+      const c = this.camera;
+      c.position.x = this.camTarget.x + this.camR * Math.sin(this.camPhi) * Math.cos(this.camTheta);
+      c.position.y = this.camTarget.y + this.camR * Math.cos(this.camPhi);
+      c.position.z = this.camTarget.z + this.camR * Math.sin(this.camPhi) * Math.sin(this.camTheta);
+      c.lookAt(this.camTarget.x, this.camTarget.y, this.camTarget.z);
+    },
+
+    createTextSprite(text, size, color) {
+      const canvas = document.createElement('canvas');
+      const px = Math.floor(size * 256);
+      canvas.width = px * 3;
+      canvas.height = px;
+      const ctx = canvas.getContext('2d');
+      ctx.fillStyle = color || '#5dade2';
+      ctx.font = 'bold ' + Math.floor(size * 64) + 'px sans-serif';
+      ctx.textAlign = 'center';
+      ctx.textBaseline = 'middle';
+      ctx.fillText(text, canvas.width / 2, canvas.height / 2);
+      const tex = new THREE.CanvasTexture(canvas);
+      tex.minFilter = THREE.LinearFilter;
+      const mat = new THREE.SpriteMaterial({ map: tex, transparent: true, depthTest: false });
+      const sp = new THREE.Sprite(mat);
+      sp.renderOrder = 10;
+      return sp;
+    },
+
+    buildGround() {
+      const tw = this.cols * CELL_W + GAP * (this.cols - 1);
+      const td = this.rows * CELL_D + GAP * (this.rows - 1);
+
+      const P = this.palette;
+      const gnd = new THREE.Mesh(
+        new THREE.PlaneGeometry(tw + 8, td + 8),
+        new THREE.MeshStandardMaterial({ color: P.ground, roughness: 0.95 })
+      );
+      gnd.rotation.x = -Math.PI / 2;
+      gnd.receiveShadow = true;
+      this.scene.add(gnd);
+
+      const grid = new THREE.GridHelper(
+        Math.max(tw, td) + 6,
+        Math.max(this.cols, this.rows) * 2,
+        P.gridMajor,
+        P.gridMinor
+      );
+      grid.position.y = 0.01;
+      this.scene.add(grid);
+
+      for (let c = 0; c < this.cols; c++) {
+        for (let r = 0; r < this.rows; r++) {
+          const cx = -tw / 2 + c * (CELL_W + GAP) + CELL_W / 2;
+          const cz = -td / 2 + r * (CELL_D + GAP) + CELL_D / 2;
+          const key = pad2(c + 1) + pad2(r + 1);
+          const b = new THREE.Mesh(
+            new THREE.PlaneGeometry(CELL_W - 0.1, CELL_D - 0.1),
+            new THREE.MeshStandardMaterial({ color: P.slot, roughness: 0.8, transparent: true, opacity: 0.4 })
+          );
+          b.rotation.x = -Math.PI / 2;
+          b.position.set(cx, 0.02, cz);
+          b.userData = { isSlot: true, key };
+          this.scene.add(b);
+        }
+      }
+
+      const labelColor = this.themeMode === 'light' ? '#3A71A8' : '#5dade2';
+      const subColor = this.themeMode === 'light' ? '#909399' : '#7f8c8d';
+      for (let c = 0; c < this.cols; c++) {
+        const cx = -tw / 2 + c * (CELL_W + GAP) + CELL_W / 2;
+        const sp = this.createTextSprite('C' + pad2(c + 1), 0.5, labelColor);
+        sp.position.set(cx, 0.1, -td / 2 - 2.2);
+        sp.scale.set(2.6, 0.9, 1);
+        this.scene.add(sp);
+      }
+      for (let r = 0; r < this.rows; r++) {
+        const cz = -td / 2 + r * (CELL_D + GAP) + CELL_D / 2;
+        const sp = this.createTextSprite('R' + (r + 1), 0.5, labelColor);
+        sp.position.set(-tw / 2 - 2.5, 0.1, cz);
+        sp.scale.set(2.2, 0.9, 1);
+        this.scene.add(sp);
+      }
+      const origin = this.createTextSprite('原点 (0,0)', 0.42, subColor);
+      origin.position.set(-tw / 2 - 2.5, 0.1, -td / 2 - 2.2);
+      origin.scale.set(3, 0.8, 1);
+      this.scene.add(origin);
+    },
+
+    buildAllCoils() {
+      this.coilList = [];
+      const tw = this.cols * CELL_W + GAP * (this.cols - 1);
+      const td = this.rows * CELL_D + GAP * (this.rows - 1);
+
+      // 1) actualWarehouseId → 库位坐标和层号（来自 warehouseList 中的库位编码）
+      const slotIndex = {};
+      (this.warehouseList || []).forEach((w) => {
+        const info = parseCode(w.actualWarehouseCode);
+        if (!info) return;
+        const c = info.column - 1, r = info.row - 1;
+        if (c < 0 || c >= this.cols || r < 0 || r >= this.rows) return;
+        slotIndex[w.actualWarehouseId] = {
+          c, r,
+          key: pad2(c + 1) + pad2(r + 1),
+          layer: info.layer || 1,
+          code: w.actualWarehouseCode,
+        };
+      });
+
+      // 2) 按库位 + 层分组真实钢卷
+      const occupiedMap = {};
+      (this.materialCoils || []).forEach((mc) => {
+        const slot = slotIndex[mc.actualWarehouseId];
+        if (!slot) return;
+        if (!occupiedMap[slot.key]) occupiedMap[slot.key] = {};
+        if (!occupiedMap[slot.key][slot.layer]) occupiedMap[slot.key][slot.layer] = mc;
+      });
+
+      for (let c = 0; c < this.cols; c++) {
+        for (let r = 0; r < this.rows; r++) {
+          const key = pad2(c + 1) + pad2(r + 1);
+          if (!occupiedMap[key]) continue;
+          const cx = -tw / 2 + c * (CELL_W + GAP) + CELL_W / 2;
+          const cz = -td / 2 + r * (CELL_D + GAP) + CELL_D / 2;
+
+          [1, 2].forEach((layer) => {
+            const mc = occupiedMap[key][layer];
+            if (!mc) return;
+            const g = this.createCoilGroup();
+            const y = layer === 1 ? COIL_OD / 2 : (COIL_OD / 2 + COIL_OD + 0.08);
+            g.position.set(cx, y, cz);
+            g.userData = { coilId: mc.coilId };
+            this.scene.add(g);
+            this.coilList.push({
+              id: mc.coilId,
+              coilNo: mc.currentCoilNo || mc.enterCoilNo || ('#' + mc.coilId),
+              enterCoilNo: mc.enterCoilNo,
+              posKey: key,
+              layer,
+              specification: mc.specification || '-',
+              material: mc.material || '-',
+              grossWeight: mc.grossWeight,
+              netWeight: mc.netWeight,
+              qualityStatus: mc.qualityStatus || '-',
+              warehouseId: mc.actualWarehouseId,
+              warehouseName: mc.actualWarehouseName,
+              mesh: g,
+              moves: null,
+              trace: null,
+            });
+          });
+          this.updateSlotColor(key);
+        }
+      }
+    },
+
+    async fetchAndRebuild() {
+      await this.fetchMaterialCoils();
+      this.rebuild();
+    },
+
+    async fetchMaterialCoils() {
+      if (!this.parentId) { this.materialCoils = []; return; }
+      try {
+        const res = await listMaterialCoil({
+          actualWarehouseId: this.parentId,
+          pageNum: 1,
+          pageSize: 9999,
+        });
+        this.materialCoils = res.rows || res.data || [];
+      } catch (err) {
+        console.error('[Warehouse3D] 查询钢卷失败', err);
+        this.materialCoils = [];
+      }
+    },
+
+    updateSlotColor(key) {
+      const P = this.palette;
+      this.scene.traverse((obj) => {
+        if (obj.userData && obj.userData.isSlot && obj.userData.key === key) {
+          obj.material.color.setHex(P.slot);
+          obj.material.opacity = P.slotOpacity;
+        }
+      });
+    },
+
+    createCoilGroup() {
+      const P = this.palette;
+      const g = new THREE.Group();
+      const cyl = new THREE.Mesh(
+        new THREE.CylinderGeometry(COIL_OD / 2, COIL_OD / 2, COIL_W, 28),
+        new THREE.MeshStandardMaterial({
+          color: P.coilBody, roughness: 0.55, metalness: 0.85,
+          emissive: 0x000000, emissiveIntensity: 1,
+        })
+      );
+      cyl.rotation.x = Math.PI / 2;
+      cyl.castShadow = true;
+      cyl.userData.isCoilBody = true;
+      g.add(cyl);
+      const rGeo = new THREE.TorusGeometry(COIL_OD / 2, 0.06, 8, 24);
+      const rMat = new THREE.MeshStandardMaterial({ color: P.coilEnd, roughness: 0.3, metalness: 0.95 });
+      const rn1 = new THREE.Mesh(rGeo, rMat); rn1.position.z = COIL_W / 2 - 0.03; g.add(rn1);
+      const rn2 = new THREE.Mesh(rGeo, rMat); rn2.position.z = -(COIL_W / 2 - 0.03); g.add(rn2);
+      const hole = new THREE.Mesh(
+        new THREE.CylinderGeometry(0.22, 0.22, COIL_W + 0.1, 12),
+        new THREE.MeshStandardMaterial({ color: P.coilHole })
+      );
+      hole.rotation.x = Math.PI / 2;
+      g.add(hole);
+      return g;
+    },
+
+    onCanvasClick(e) {
+      if (this._didDrag) { this._didDrag = false; return; }
+      const rect = this.renderer.domElement.getBoundingClientRect();
+      this.mouseVec.x = ((e.clientX - rect.left) / rect.width) * 2 - 1;
+      this.mouseVec.y = -((e.clientY - rect.top) / rect.height) * 2 + 1;
+      this.raycaster.setFromCamera(this.mouseVec, this.camera);
+      const targets = [];
+      this.scene.traverse((o) => { if (o.userData && o.userData.coilId) targets.push(o); });
+      const hits = this.raycaster.intersectObjects(targets, true);
+      if (hits.length > 0) {
+        let obj = hits[0].object;
+        while (obj.parent && !(obj.userData && obj.userData.coilId)) obj = obj.parent;
+        if (obj.userData && obj.userData.coilId) {
+          this.showCoilDetail(obj.userData.coilId);
+          return;
+        }
+      }
+      this.closeDetail();
+    },
+
+    async showCoilDetail(cid) {
+      const coil = this.coilList.find((c) => c.id === cid);
+      if (!coil) return;
+      this.detail = coil;
+      this.applyHighlight();
+      if (coil.moves && coil.trace) return;
+      this.detailLoading = true;
+      try {
+        const [mvRes, trRes] = await Promise.all([
+          getCoilWarehouseOperationLogByCoilId({ coilId: coil.id }),
+          getMaterialCoilTrace({ coilId: coil.id, currentCoilNo: coil.coilNo }),
+        ]);
+        coil.moves = (mvRes.data || mvRes.rows || []).map((log) => ({
+          time: formatDate(log.createTime),
+          warehouse: (log.warehouse && (log.warehouse.actualWarehouseName || log.warehouse.actualWarehouseCode)) || '-',
+          operationType: OP_TYPE_MAP[log.operationType] || '-',
+          inOutType: IN_OUT_MAP[log.inOutType] || '-',
+          remark: log.remark || '',
+        }));
+        coil.trace = trRes.data || null;
+      } catch (err) {
+        console.error('[Warehouse3D] 查询追溯失败', err);
+        coil.moves = coil.moves || [];
+        coil.trace = coil.trace || null;
+      } finally {
+        this.detailLoading = false;
+        if (this.detail && this.detail.id === cid) this.detail = { ...coil };
+      }
+    },
+
+    closeDetail() {
+      this.detail = null;
+      this.applyHighlight();
+    },
+
+    applyHighlight() {
+      const P = this.palette;
+      this.coilList.forEach((c) => {
+        if (!c.mesh) return;
+        c.mesh.traverse((ch) => {
+          if (ch.userData && ch.userData.isCoilBody) {
+            ch.material.color.setHex(P.coilBody);
+            ch.material.emissive.setHex(0x000000);
+            ch.material.emissiveIntensity = 1;
+          }
+        });
+      });
+      if (this.detail) {
+        const c = this.coilList.find((x) => x.id === this.detail.id);
+        if (c && c.mesh) {
+          c.mesh.traverse((ch) => {
+            if (ch.userData && ch.userData.isCoilBody) {
+              ch.material.color.setHex(P.highlightColor);
+              ch.material.emissive.setHex(P.highlightEmissive);
+              ch.material.emissiveIntensity = 0.9;
+            }
+          });
+        }
+      }
+    },
+
+    onMouseDown(e) {
+      e.preventDefault();
+      this._didDrag = false;
+      this._dragStartX = e.clientX; this._dragStartY = e.clientY;
+      if (e.button === 0) this.isRotating = true;
+      if (e.button === 2) this.isPanning = true;
+      this.prevMX = e.clientX; this.prevMY = e.clientY;
+    },
+    onMouseUp() { this.isRotating = false; this.isPanning = false; },
+    onMouseMove(e) {
+      if (this.isRotating || this.isPanning) {
+        if (Math.abs(e.clientX - this._dragStartX) + Math.abs(e.clientY - this._dragStartY) > 4) {
+          this._didDrag = true;
+        }
+      }
+      if (this.isRotating) {
+        const dx = e.clientX - this.prevMX, dy = e.clientY - this.prevMY;
+        this.camTheta -= dx * 0.005;
+        this.camPhi = Math.max(0.15, Math.min(1.45, this.camPhi + dy * 0.005));
+        this.updateCamera();
+      }
+      if (this.isPanning) {
+        const dx = e.clientX - this.prevMX, dy = e.clientY - this.prevMY;
+        this.camTarget.x += (-dx * Math.cos(this.camTheta) + dy * Math.sin(this.camTheta)) * 0.04;
+        this.camTarget.z += (-dx * Math.sin(this.camTheta) - dy * Math.cos(this.camTheta)) * 0.04;
+        this.updateCamera();
+      }
+      this.prevMX = e.clientX; this.prevMY = e.clientY;
+    },
+    onMouseWheel(e) {
+      this.camR = Math.max(8, Math.min(80, this.camR + e.deltaY * 0.03));
+      this.updateCamera();
+      e.preventDefault();
+    },
+
+    setView(type) {
+      this.viewMode = type;
+      if (type === 'iso') { this.camR = 36; this.camTheta = 0.6; this.camPhi = 0.55; this.camTarget = { x: 0, y: 1.5, z: 0 }; }
+      if (type === 'top') { this.camR = 34; this.camTheta = 0; this.camPhi = 0.01; this.camTarget = { x: 0, y: 0, z: 0 }; }
+      if (type === 'front') { this.camR = 32; this.camTheta = 0; this.camPhi = 1.5; this.camTarget = { x: 0, y: 2, z: 0 }; }
+      if (type === 'side') { this.camR = 32; this.camTheta = Math.PI / 2; this.camPhi = 1.5; this.camTarget = { x: 0, y: 2, z: 0 }; }
+      this.updateCamera();
+    },
+
+    updateStats() {
+      const total = this.cols * this.rows;
+      const usedKeys = {};
+      let doubled = 0;
+      this.coilList.forEach((c) => {
+        usedKeys[c.posKey] = true;
+        if (c.layer === 2) doubled++;
+      });
+      const used = Object.keys(usedKeys).length;
+      this.stats = {
+        total, used, free: total - used,
+        pct: total > 0 ? Math.round(used / total * 100) + '%' : '0%',
+        coils: this.coilList.length, doubled,
+      };
+    },
+
+    animate() {
+      if (this._destroyed) return;
+      this._raf = requestAnimationFrame(this.animate);
+      const t = Date.now() * 0.001;
+
+      // 仅给选中钢卷一个柔和呼吸高亮，其它一律保持静态
+      if (this.detail) {
+        const c = this.coilList.find((x) => x.id === this.detail.id);
+        if (c && c.mesh) {
+          const pulse = 0.6 + 0.4 * Math.abs(Math.sin(t * 2.5));
+          c.mesh.traverse((ch) => {
+            if (ch.userData && ch.userData.isCoilBody) ch.material.emissiveIntensity = pulse;
+          });
+        }
+      }
+
+      this.fpsCount++;
+      this.fpsTime += this.clock.getDelta();
+      if (this.fpsTime >= 1) { this.fps = this.fpsCount; this.fpsCount = 0; this.fpsTime = 0; }
+      this.renderer.render(this.scene, this.camera);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.wh3d-wrapper {
+  background: #0a0e17;
+  color: #c8d6e5;
+  font-family: 'Segoe UI', 'Microsoft YaHei', sans-serif;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  border-radius: 8px;
+  overflow: hidden;
+  border: 1px solid #1e3a5f;
+}
+.wh3d-header {
+  background: linear-gradient(90deg, #0d1320, #111827, #0d1320);
+  border-bottom: 1px solid #1e3a5f;
+  padding: 10px 20px;
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  h1 { color: #5dade2; font-size: 15px; font-weight: 600; letter-spacing: 1px; margin: 0; }
+  .tag { font-size: 10px; color: #7f8c8d; background: #1a2233; padding: 3px 8px; border-radius: 3px; }
+  .fps { margin-left: auto; font-size: 12px; color: #2ecc71; }
+}
+.wh3d-main { display: flex; flex: 1; overflow: hidden; }
+.wh3d-view {
+  position: relative;
+  flex: 1;
+  background: #080c14;
+  overflow: hidden;
+}
+.wh3d-info {
+  width: 310px;
+  background: #0f1923;
+  border-left: 1px solid #1e3a5f;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  h2 {
+    font-size: 13px; color: #5dade2;
+    padding: 10px 14px 8px;
+    border-bottom: 1px solid #1a2a3a;
+    background: #0d1320; margin: 0;
+    font-weight: 600;
+  }
+  .ss { padding: 10px 14px; border-bottom: 1px solid #1a2a3a; }
+  .sg { display: grid; grid-template-columns: 1fr 1fr; gap: 6px; }
+  .sc {
+    background: #151f2e; border: 1px solid #1e3a5f; border-radius: 4px; padding: 7px 10px;
+    .l { font-size: 10px; color: #576574; margin-bottom: 2px; }
+    .v {
+      font-size: 15px; font-weight: 700; color: #2ecc71;
+      &.primary { color: var(--wh3d-primary); }
+    }
+  }
+  .ctb {
+    flex: 1; overflow-y: auto;
+    table { width: 100%; font-size: 11px; border-collapse: collapse; }
+    th {
+      position: sticky; top: 0;
+      background: #0d1320; color: #5dade2;
+      padding: 5px 6px; text-align: left;
+      font-weight: 600; font-size: 10px;
+      border-bottom: 1px solid #1e3a5f;
+    }
+    td { padding: 5px 6px; border-bottom: 1px solid #0f1923; color: #8395a7; }
+    tr { cursor: pointer; }
+    tr:hover { background: #151f2e; }
+    tr.sel { background: #1a3a5f; td { color: #5dade2; } }
+    .ok { color: #2ecc71; }
+    .pn { color: #e67e22; }
+    .ng { color: #e74c3c; }
+  }
+}
+
+.wh3d-vbt {
+  position: absolute; top: 10px; right: 10px; z-index: 5;
+  display: flex; gap: 4px;
+  button {
+    background: #1a2a3a; border: 1px solid #2a4a6f; color: #8395a7;
+    padding: 5px 12px; font-size: 11px; border-radius: 3px; cursor: pointer;
+    transition: all 0.15s;
+    &:hover { background: #1a3a5f; color: #5dade2; border-color: #5dade2; }
+    &.act { background: #1a3a5f; color: #5dade2; border-color: #5dade2; font-weight: 600; }
+    &.theme-toggle {
+      margin-left: 8px;
+      border-color: var(--wh3d-primary);
+      color: var(--wh3d-primary);
+    }
+  }
+}
+
+/* ====== 浅色主题覆盖 ====== */
+.wh3d-light {
+  background: #fff !important;
+  color: #303133 !important;
+  border-color: #ebeef5 !important;
+  .wh3d-header {
+    background: #fafbfc;
+    border-bottom-color: #ebeef5;
+    h1 { color: var(--wh3d-primary); }
+    .tag { color: #909399; background: #f4f4f5; }
+    .fps { color: #67C23A; }
+  }
+  .wh3d-view { background: #f5f7fa; }
+  .wh3d-info {
+    background: #fff;
+    border-left-color: #ebeef5;
+    h2 { color: #303133; background: #fafbfc; border-bottom-color: #ebeef5; }
+    .ss { border-bottom-color: #ebeef5; }
+    .sc {
+      background: #fafbfc; border-color: #ebeef5;
+      .l { color: #909399; }
+      .v { color: #67C23A; &.primary { color: var(--wh3d-primary); } }
+    }
+    .ctb {
+      th { background: #fafbfc; color: #606266; border-bottom-color: #ebeef5; }
+      td { color: #606266; border-bottom-color: #f2f3f5; }
+      tr:hover { background: #ecf5ff; }
+      tr.sel { background: var(--wh3d-primary); td { color: #fff; } }
+    }
+  }
+  .wh3d-vbt button {
+    background: #fff; border-color: #dcdfe6; color: #606266;
+    &:hover { background: #ecf5ff; color: var(--wh3d-primary); border-color: var(--wh3d-primary); }
+    &.act { background: var(--wh3d-primary); color: #fff; border-color: var(--wh3d-primary); }
+    &.theme-toggle { border-color: var(--wh3d-primary); color: var(--wh3d-primary); background: #fff; }
+  }
+  .wh3d-help {
+    background: rgba(255, 255, 255, 0.95);
+    border-color: #ebeef5;
+    color: #606266;
+    .hh { color: var(--wh3d-primary); border-bottom-color: #ebeef5; }
+    .hr kbd {
+      background: #f4f4f5; border-color: #dcdfe6;
+      color: var(--wh3d-primary);
+    }
+  }
+  .wh3d-axis {
+    background: rgba(255, 255, 255, 0.92);
+    border-color: #ebeef5;
+    color: var(--wh3d-primary);
+    .vt { color: #E6A23C; }
+  }
+  .wh3d-dlg {
+    background: #fff; border-color: var(--wh3d-primary);
+    box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+    h3 { color: var(--wh3d-primary); border-bottom-color: #ebeef5; }
+    .k { color: #909399; }
+    .v { color: #303133; }
+    .x { color: #909399; &:hover { color: #303133; } }
+  }
+}
+
+.wh3d-help {
+  position: absolute; top: 10px; left: 10px;
+  background: rgba(15, 25, 35, 0.92);
+  border: 1px solid #1e3a5f; border-radius: 6px;
+  padding: 10px 14px; z-index: 5;
+  font-size: 11px; color: #8395a7;
+  min-width: 180px;
+  .hh {
+    color: #5dade2; font-weight: 600; font-size: 12px;
+    margin-bottom: 8px; padding-bottom: 6px;
+    border-bottom: 1px solid #1e3a5f;
+  }
+  .hr {
+    line-height: 1.9;
+    kbd {
+      display: inline-block;
+      background: #1a2a3a;
+      border: 1px solid #2a4a6f;
+      border-bottom-width: 2px;
+      border-radius: 3px;
+      padding: 1px 6px;
+      margin-right: 6px;
+      color: #5dade2;
+      font-family: monospace;
+      font-size: 10px;
+      min-width: 32px;
+      text-align: center;
+    }
+  }
+}
+
+.wh3d-axis {
+  position: absolute; bottom: 10px; left: 10px;
+  background: rgba(15, 25, 35, 0.85);
+  border: 1px solid #1e3a5f; border-radius: 4px;
+  padding: 5px 10px;
+  z-index: 5;
+  font-size: 11px; color: #5dade2;
+  display: flex; gap: 14px;
+  .vt { color: #f39c12; }
+}
+
+.wh3d-dlg {
+  position: absolute; top: 56px; right: 20px;
+  width: 340px; max-height: calc(100% - 80px);
+  overflow-y: auto;
+  background: #0f1923;
+  border: 1px solid var(--wh3d-primary); border-radius: 6px;
+  padding: 14px; z-index: 20;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.7);
+  h3 {
+    color: var(--wh3d-primary);
+    font-size: 13px; margin: 0 0 10px;
+    padding-bottom: 6px;
+    border-bottom: 1px solid #1e3a5f;
+  }
+  .rw { display: flex; justify-content: space-between; margin-bottom: 6px; font-size: 12px; }
+  .k { color: #576574; }
+  .v {
+    color: #c8d6e5; font-weight: 600;
+    &.ok { color: #2ecc71; }
+    &.pn { color: #e67e22; }
+    &.ng { color: #e74c3c; }
+  }
+  .x {
+    position: absolute; top: 8px; right: 10px;
+    background: none; border: none;
+    color: #576574; cursor: pointer; font-size: 18px;
+    &:hover { color: #c8d6e5; }
+  }
+  .sec-title {
+    margin: 14px 0 8px;
+    padding: 4px 8px;
+    font-size: 12px; font-weight: 600;
+    color: var(--wh3d-primary);
+    background: #0a1422;
+    border-left: 3px solid var(--wh3d-primary);
+    border-radius: 0 3px 3px 0;
+  }
+  .sec-tbl {
+    width: 100%; font-size: 11px;
+    border-collapse: collapse;
+    th {
+      background: #0d1320; color: #5dade2;
+      padding: 4px 6px; text-align: left; font-weight: 600;
+      border-bottom: 1px solid #1e3a5f;
+    }
+    td {
+      padding: 4px 6px;
+      color: #8395a7;
+      border-bottom: 1px solid #1a2a3a;
+    }
+  }
+  .trace { display: flex; flex-direction: column; gap: 8px; }
+  .trace-step {
+    border-left: 2px solid var(--wh3d-primary);
+    padding: 4px 8px;
+    background: rgba(30, 58, 95, 0.25);
+    border-radius: 0 3px 3px 0;
+    font-size: 11.5px;
+    .ts-head { display: flex; justify-content: space-between; margin-bottom: 3px; }
+    .ts-action { color: var(--wh3d-primary); font-weight: 600; }
+    .ts-time { color: #576574; }
+    .ts-op { color: #8395a7; margin-bottom: 3px; }
+    .ts-coils { display: flex; flex-wrap: wrap; gap: 3px; }
+    .ts-tag {
+      display: inline-block;
+      padding: 1px 6px;
+      background: #1a2a3a;
+      border: 1px solid #1e3a5f;
+      border-radius: 2px;
+      color: #c8d6e5;
+      font-size: 10.5px;
+    }
+  }
+  .sec-empty {
+    padding: 10px;
+    color: #576574;
+    font-size: 11.5px;
+    text-align: center;
+    font-style: italic;
+  }
+}
+
+.wh3d-light .wh3d-dlg {
+  .sec-title {
+    background: #ecf5ff;
+    color: var(--wh3d-primary);
+  }
+  .sec-tbl {
+    th { background: #fafbfc; color: #606266; border-bottom-color: #ebeef5; }
+    td { color: #606266; border-bottom-color: #f2f3f5; }
+  }
+  .trace-step {
+    background: #ecf5ff;
+    .ts-time { color: #909399; }
+    .ts-op { color: #606266; }
+    .ts-tag { background: #fff; border-color: #dcdfe6; color: #606266; }
+  }
+  .sec-empty { color: #909399; }
+}
+</style>
diff --git a/klp-ui/src/views/wms/warehouse/overview.vue b/klp-ui/src/views/wms/warehouse/overview.vue
index 17dd2e9c3..2157ec845 100644
--- a/klp-ui/src/views/wms/warehouse/overview.vue
+++ b/klp-ui/src/views/wms/warehouse/overview.vue
@@ -10,18 +10,23 @@
         </el-tree>
       </div>
 
-      <!-- 右侧仓库信息区域 - 替换为 Bird 组件 -->
+      <!-- 右侧仓库信息区域 - 2D / 3D 双视图 tab -->
       <div class="warehouse-container" v-if="selectedNodeId" v-loading="rightLoading" element-loading-text="加载中..."
         element-loading-spinner="el-icon-loading">
-        <!-- 导出所有二维码 -->
-        <!-- <button buttonLoading type="primary" @click="exportAllQrcodes">导出二维码</button> -->
-        <WarehouseBird 
-          :id="selectedNodeId"
-          :warehouse-list="warehouseList" 
-          @open-init-dialog="openInitDialog" 
-          @split-warehouse="handleSplitWarehouse"
-          @merge-warehouse="handleMergeWarehouse"
-        />
+        <el-tabs v-model="activeTab" class="overview-tabs">
+          <el-tab-pane label="平面视图" name="bird">
+            <WarehouseBird
+              :id="selectedNodeId"
+              :warehouse-list="warehouseList"
+              @open-init-dialog="openInitDialog"
+              @split-warehouse="handleSplitWarehouse"
+              @merge-warehouse="handleMergeWarehouse"
+            />
+          </el-tab-pane>
+          <el-tab-pane label="数字孪生 3D" name="three">
+            <Warehouse3D v-if="activeTab === 'three'" :warehouse-list="warehouseList" :parent-id="selectedNodeId" />
+          </el-tab-pane>
+        </el-tabs>
       </div>
 
       <!-- 未选中节点提示 -->
@@ -66,12 +71,13 @@
 <script>
 import { listActualWarehouse, treeActualWarehouseTwoLevel, getActualWarehouse, generateLocations, splitActualWarehouse, mergeActualWarehouse } from "@/api/wms/actualWarehouse";
 import WarehouseBird from './components/WarehouseBird.vue';
+import Warehouse3D from './components/Warehouse3D.vue';
 import jsPDF from 'jspdf';
 import QRCode from 'qrcode';
 
 export default {
   name: "Overview",
-  components: { WarehouseBird },
+  components: { WarehouseBird, Warehouse3D },
   data() {
     // 自定义验证规则：正整数
     const positiveIntegerValidator = (rule, value, callback) => {
@@ -99,6 +105,7 @@ export default {
       selectedNodeId: "",
       selectedNode: null,
       warehouseList: [], // 透传给 Bird 组件的原始数据
+      activeTab: 'bird',
       // 初始化弹窗相关
       initDialogVisible: false,
       initForm: {
@@ -457,7 +464,31 @@ export default {
   .warehouse-container {
     flex: 1;
     height: 100%;
-    overflow-y: auto;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+
+    ::v-deep .overview-tabs {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .el-tabs__header { margin: 0 0 8px; }
+
+      .el-tabs__content {
+        flex: 1;
+        overflow: hidden;
+      }
+
+      .el-tab-pane {
+        height: 100%;
+        overflow: auto;
+      }
+
+      .el-tab-pane:has(> .wh3d-wrapper) {
+        overflow: hidden;
+      }
+    }
   }
 
   .empty-select-tip {
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
index 22ce9eb46..ed6e896b7 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java
@@ -148,7 +148,10 @@ public class WmsDeliveryWaybillDetailController extends BaseController {
             return new TableDataInfo<>();
         }
         bo.setCoilIds(boundCoilIds.stream().map(String::valueOf).collect(java.util.stream.Collectors.joining(",")));
-        bo.setStatusFirst(true); // 未发货的排在前面
+        bo.setStatusFirst(true);
+        if (planId == null) {
+            bo.setOrderByPlanDesc(true);
+        }
         return iWmsMaterialCoilService.queryPageListWithBindInfo(bo, pageQuery);
     }
 
diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
index d6054043b..beeeef8eb 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
@@ -5,8 +5,6 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Arrays;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.stream.Collectors;
 import java.util.HashMap;
@@ -33,7 +31,6 @@ import com.klp.common.core.validate.AddGroup;
 import com.klp.common.core.validate.EditGroup;
 import com.klp.common.enums.BusinessType;
 import com.klp.common.utils.poi.ExcelUtil;
-import com.klp.common.utils.StringUtils;
 import com.klp.domain.bo.WmsMaterialCoilBo;
 import com.klp.domain.bo.WmsMaterialCoilReportSummaryBo;
 import com.klp.domain.vo.dashboard.CoilTrimStatisticsVo;
@@ -135,25 +132,6 @@ public class WmsMaterialCoilController extends BaseController {
         ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilExportVo.class, response);
     }
 
-    /**
-     * 个性化导出：前端传入要导出的字段名，仅导出选中列
-     * columns 参数为逗号分隔的 Java 字段名，如 "itemTypeDesc,enterCoilNo,netWeight"
-     * 不传 columns 时等同于 /exportAll 导出全部字段
-     */
-    @Log(title = "钢卷物料表", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportCustom")
-    public void exportCustom(WmsMaterialCoilBo bo,
-                             @RequestParam(required = false) String columns,
-                             HttpServletResponse response) {
-        List<WmsMaterialCoilAllExportVo> list = iWmsMaterialCoilService.queryExportListAll(bo);
-        if (StringUtils.isNotBlank(columns)) {
-            Set<String> includeFields = new HashSet<>(Arrays.asList(columns.split(",")));
-            ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilAllExportVo.class, includeFields, response);
-        } else {
-            ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilAllExportVo.class, response);
-        }
-    }
-
     /**
      * 获取可导出的列元数据（供前端列选择器使用）
      * 返回 { "fieldName": "中文列名" } 的映射，基于完整导出字段
@@ -195,9 +173,41 @@ public class WmsMaterialCoilController extends BaseController {
         columns.put("actualThickness", "实测厚度");
         columns.put("transferType", "调拨类型");
         columns.put("team", "班组");
+        columns.put("theoreticalThickness", "理论厚度");
+        columns.put("theoreticalLength", "理论长度");
+        columns.put("chromePlateCoilNo", "镀铬卷号");
         return R.ok(columns);
     }
 
+    /**
+     * 自定义导出（指定列顺序）：前端传入按导出顺序排列的字段名
+     * columnsOrdered 参数为逗号分隔的有序字段名，如 "team,enterCoilNo,netWeight,remark"
+     */
+    @Log(title = "钢卷物料表", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportCustomOrdered")
+    public void exportCustomOrdered(WmsMaterialCoilBo bo,
+                                    @RequestParam String columnsOrdered,
+                                    HttpServletResponse response) {
+        List<WmsMaterialCoilAllExportVo> list = iWmsMaterialCoilService.queryExportListAll(bo);
+        List<String> orderedFields = Arrays.asList(columnsOrdered.split(","));
+        ExcelUtil.exportExcelOrdered(list, "钢卷物料表", orderedFields,
+            getAllExportFieldLabelMap(), response);
+    }
+
+    /**
+     * 从 WmsMaterialCoilAllExportVo 注解中提取字段名->中文列名映射
+     */
+    private Map<String, String> getAllExportFieldLabelMap() {
+        Map<String, String> map = new LinkedHashMap<>();
+        for (java.lang.reflect.Field field : WmsMaterialCoilAllExportVo.class.getDeclaredFields()) {
+            com.alibaba.excel.annotation.ExcelProperty ep = field.getAnnotation(com.alibaba.excel.annotation.ExcelProperty.class);
+            if (ep != null && ep.value().length > 0) {
+                map.put(field.getName(), ep.value()[0]);
+            }
+        }
+        return map;
+    }
+
     /**
      * 导出钢卷物料表列表（完整字段版本）
      * 导出全部字段
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
index 83d166aa3..0f3d8a5ff 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java
@@ -213,5 +213,20 @@ public class WmsMaterialCoil extends BaseEntity {
 
     private Long specId;
     private Long versionId;
+
+    /**
+     * 理论厚度（单位：毫米）
+     */
+    private BigDecimal theoreticalThickness;
+
+    /**
+     * 理论长度（单位：米）
+     */
+    private BigDecimal theoreticalLength;
+
+    /**
+     * 镀铬卷号
+     */
+    private String chromePlateCoilNo;
 }
 
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index 6e0832b1f..2ca363f02 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -381,5 +381,26 @@ public class WmsMaterialCoilBo extends BaseEntity {
 
     private Long specId;
     private Long versionId;
+
+    /**
+     * 理论厚度（单位：毫米）
+     */
+    private BigDecimal theoreticalThickness;
+
+    /**
+     * 理论长度（单位：米）
+     */
+    private BigDecimal theoreticalLength;
+
+    /**
+     * 镀铬卷号
+     */
+    private String chromePlateCoilNo;
+
+    /**
+     * 是否按计划创建时间倒序排序（已绑定钢卷列表无planId时，按计划新旧排列）
+     */
+    @TableField(exist = false)
+    private Boolean orderByPlanDesc;
 }
 
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
index 2cb7d63b3..b931f4dec 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
@@ -208,4 +208,22 @@ public class WmsMaterialCoilExportVo {
      */
     @ExcelProperty(value = "调拨类型")
     private String transferType;
+
+    /**
+     * 理论厚度（单位：毫米）
+     */
+    @ExcelProperty(value = "理论厚度")
+    private BigDecimal theoreticalThickness;
+
+    /**
+     * 理论长度（单位：米）
+     */
+    @ExcelProperty(value = "理论长度")
+    private BigDecimal theoreticalLength;
+
+    /**
+     * 镀铬卷号
+     */
+    @ExcelProperty(value = "镀铬卷号")
+    private String chromePlateCoilNo;
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index bd8810f6c..bfb3c0a0e 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -339,5 +339,20 @@ public class WmsMaterialCoilVo extends BaseEntity {
     private Long versionId;
     private String specCode;
     private String versionCode;
+
+    /**
+     * 理论厚度（单位：毫米）
+     */
+    private BigDecimal theoreticalThickness;
+
+    /**
+     * 理论长度（单位：米）
+     */
+    private BigDecimal theoreticalLength;
+
+    /**
+     * 镀铬卷号
+     */
+    private String chromePlateCoilNo;
 }
 
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java
index f893c0cfc..ddb0f0dee 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java
@@ -45,6 +45,11 @@ public interface WmsMaterialCoilMapper extends BaseMapperPlus<WmsMaterialCoilMap
      */
     Page<WmsMaterialCoilVo> selectVoPagePlusOrderBy(Page<Object> build, @Param("ew") QueryWrapper<WmsMaterialCoil> lqw);
 
+    /**
+     * orderByPlanDesc=true 时使用：包含发货计划 join，支持按计划创建时间排序
+     */
+    Page<WmsMaterialCoilVo> selectVoPagePlusPlanOrder(Page<Object> build, @Param("ew") QueryWrapper<WmsMaterialCoil> lqw);
+
     List<WmsMaterialCoilVo> selectVoListWithDynamicJoin(@Param("ew")QueryWrapper<WmsMaterialCoil> lqw);
 
     Map<String, Object> selectCountForSpecSync(@Param("ew") QueryWrapper<WmsMaterialCoil> qw);
@@ -91,7 +96,7 @@ public interface WmsMaterialCoilMapper extends BaseMapperPlus<WmsMaterialCoilMap
      * @param coilIds 钢卷ID集合
      * @return 发货报表导出数据
      */
-List<WmsMaterialCoilDeliveryExportVo> selectDeliveryExportListByCoilIds(@Param("coilIds") java.util.Collection<Long> coilIds);
+    List<WmsMaterialCoilDeliveryExportVo> selectDeliveryExportListByCoilIds(@Param("coilIds") java.util.Collection<Long> coilIds);
 
     /**
      * 退火报表导出：按钢卷ID列表联查（钢卷 + 退火计划 + 退火计划钢卷关系）
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
index d1c51848a..8f1dfa0dc 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java
@@ -49,7 +49,9 @@ import java.util.stream.Collectors;
 public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService {
 
     private static final List<String> STATUS_SEVERITY = java.util.Arrays.asList("normal", "late_warn", "early_warn",
-        "late_one", "early_one", "late_two", "early_two", "absent_half");
+        "late_one", "early_one", "late_two", "early_two", "absent_half", "missed_start", "missed_end", "missed");
+
+    private static final long LATE_EARLY_MAX_SECONDS = 120 * 60L;
 
     private static final int BATCH_SIZE = 500;
 
@@ -386,18 +388,91 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
         if (hasPeriod2) {
             LocalTime p1End = toLocalTime(schedule.getShiftEndTime());
             LocalTime p2Start = toLocalTime(schedule.getShiftStartTime2());
-            LocalTime split = LocalTime.of(
-                (p1End.getHour() + p2Start.getHour()) / 2,
-                (p1End.getMinute() + p2Start.getMinute()) / 2);
+
+            // 按理论时间范围分割：p1End之前、中间区间、p2Start之后
+            List<AttendanceRecords> beforeGap = new ArrayList<>();
+            List<AttendanceRecords> inGap = new ArrayList<>();
+            List<AttendanceRecords> afterGap = new ArrayList<>();
+            for (AttendanceRecords r : records) {
+                LocalTime t = toLocalDateTime(r.getChecktime()).toLocalTime();
+                if (!t.isAfter(p1End)) {
+                    beforeGap.add(r);
+                } else if (!t.isBefore(p2Start)) {
+                    afterGap.add(r);
+                } else {
+                    inGap.add(r);
+                }
+            }
 
             List<AttendanceRecords> p1Records = new ArrayList<>();
             List<AttendanceRecords> p2Records = new ArrayList<>();
-            for (AttendanceRecords r : records) {
-                LocalTime t = toLocalDateTime(r.getChecktime()).toLocalTime();
-                if (t.isBefore(split)) {
-                    p1Records.add(r);
-                } else {
-                    p2Records.add(r);
+            boolean lunchPatternFound = false;
+
+            // 检测[p1End, p2Start]区间内是否有午休打卡（取最远两条判断>10分钟，按最大连续间隔切开）
+            if (inGap.size() >= 2) {
+                LocalDateTime firstInGap = toLocalDateTime(inGap.get(0).getChecktime());
+                LocalDateTime lastInGap = toLocalDateTime(inGap.get(inGap.size() - 1).getChecktime());
+                if (Duration.between(firstInGap, lastInGap).getSeconds() > 600) {
+                    int splitIdx = 0;
+                    long maxGap = 0;
+                    for (int i = 0; i < inGap.size() - 1; i++) {
+                        LocalDateTime t1 = toLocalDateTime(inGap.get(i).getChecktime());
+                        LocalDateTime t2 = toLocalDateTime(inGap.get(i + 1).getChecktime());
+                        long gap = Duration.between(t1, t2).getSeconds();
+                        if (gap > maxGap) {
+                            maxGap = gap;
+                            splitIdx = i;
+                        }
+                        if (gap > 600) {
+                            break;
+                        }
+                    }
+                    p1Records = new ArrayList<>(beforeGap);
+                    p1Records.addAll(inGap.subList(0, splitIdx + 1));
+                    p2Records = new ArrayList<>(inGap.subList(splitIdx + 1, inGap.size()));
+                    p2Records.addAll(afterGap);
+                    lunchPatternFound = true;
+                }
+            }
+
+            // 检测边界：beforeGap最后一条 与 inGap第一条 间隔>10分钟（提前下班+午饭回来）
+            if (!lunchPatternFound && !beforeGap.isEmpty() && !inGap.isEmpty()) {
+                LocalDateTime lastBefore = toLocalDateTime(beforeGap.get(beforeGap.size() - 1).getChecktime());
+                LocalDateTime firstIn = toLocalDateTime(inGap.get(0).getChecktime());
+                if (Duration.between(lastBefore, firstIn).getSeconds() > 600) {
+                    p1Records = new ArrayList<>(beforeGap);
+                    p2Records = new ArrayList<>(inGap);
+                    p2Records.addAll(afterGap);
+                    lunchPatternFound = true;
+                }
+            }
+
+            // 检测边界：inGap最后一条 与 afterGap第一条 间隔>10分钟（午休晚归）
+            if (!lunchPatternFound && !inGap.isEmpty() && !afterGap.isEmpty()) {
+                LocalDateTime lastIn = toLocalDateTime(inGap.get(inGap.size() - 1).getChecktime());
+                LocalDateTime firstAfter = toLocalDateTime(afterGap.get(0).getChecktime());
+                if (Duration.between(lastIn, firstAfter).getSeconds() > 600) {
+                    p1Records = new ArrayList<>(beforeGap);
+                    p1Records.addAll(inGap);
+                    p2Records = new ArrayList<>(afterGap);
+                    lunchPatternFound = true;
+                }
+            }
+
+            if (!lunchPatternFound) {
+                // 没有午休打卡模式，回退原中值法
+                LocalTime split = LocalTime.of(
+                    (p1End.getHour() + p2Start.getHour()) / 2,
+                    (p1End.getMinute() + p2Start.getMinute()) / 2);
+                p1Records = new ArrayList<>();
+                p2Records = new ArrayList<>();
+                for (AttendanceRecords r : records) {
+                    LocalTime t = toLocalDateTime(r.getChecktime()).toLocalTime();
+                    if (t.isBefore(split)) {
+                        p1Records.add(r);
+                    } else {
+                        p2Records.add(r);
+                    }
                 }
             }
 
@@ -457,6 +532,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
 
     private void checkPeriod(WmsAttendanceCheck check, WmsAttendanceRule rule, int period,
                              List<AttendanceRecords> periodRecords, Date expectedStart, Date expectedEnd) {
+        // 旷工：0条打卡记录
         if (periodRecords.isEmpty()) {
             if (period == 1) {
                 check.setP1Status("missed");
@@ -477,53 +553,72 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
         int earlyMinutes = 0;
         BigDecimal deduct = BigDecimal.ZERO;
         String status = "normal";
+        boolean startMissed = false;
+        boolean endMissed = false;
 
-        if (expStart != null && firstCheck.isAfter(expStart)) {
-            lateMinutes = (int) Duration.between(expStart, firstCheck).toMinutes();
-            if (lateMinutes > rule.getAbsentHalfDay()) {
-                status = "absent_half";
-            } else if (lateMinutes > rule.getLateOne()) {
-                status = "late_two";
-                deduct = deduct.add(rule.getDeductTwo());
-            } else if (lateMinutes > rule.getLateWarn()) {
-                status = "late_one";
-                deduct = deduct.add(rule.getDeductOne());
-            } else {
-                status = "late_warn";
+        // 上班检测：晚于理论上班时间俩小时以上 → 漏打卡
+        if (expStart != null) {
+            long lateSecs = Duration.between(expStart, firstCheck).getSeconds();
+            if (lateSecs > LATE_EARLY_MAX_SECONDS) {
+                startMissed = true;
+            } else if (lateSecs > 0) {
+                lateMinutes = (int) (lateSecs / 60);
+                if (lateMinutes > rule.getAbsentHalfDay()) {
+                    status = "absent_half";
+                } else if (lateMinutes > rule.getLateOne()) {
+                    status = "late_two";
+                    deduct = deduct.add(rule.getDeductTwo());
+                } else if (lateMinutes > rule.getLateWarn()) {
+                    status = "late_one";
+                    deduct = deduct.add(rule.getDeductOne());
+                } else {
+                    status = "late_warn";
+                }
             }
         }
 
+        // 下班检测：早于理论下班时间俩小时以上 → 漏打卡
         if (expEnd != null && lastCheck.isBefore(expEnd)) {
-            int min = (int) Duration.between(lastCheck, expEnd).toMinutes();
-            if (min > rule.getAbsentHalfDay()) {
-                status = maxSeverity(status, "absent_half");
-                earlyMinutes = min;
-            } else if (min > rule.getLateOne()) {
-                status = maxSeverity(status, "early_two");
-                deduct = deduct.add(rule.getDeductTwo());
-                earlyMinutes = min;
-            } else if (min > rule.getLateWarn()) {
-                status = maxSeverity(status, "early_one");
-                deduct = deduct.add(rule.getDeductOne());
-                earlyMinutes = min;
-            } else {
-                if ("normal".equals(status)) {
-                    status = "early_warn";
+            long earlySecs = Duration.between(lastCheck, expEnd).getSeconds();
+            if (earlySecs > LATE_EARLY_MAX_SECONDS) {
+                endMissed = true;
+            } else if (earlySecs > 0) {
+                earlyMinutes = (int) (earlySecs / 60);
+                if (earlyMinutes > rule.getAbsentHalfDay()) {
+                    status = maxSeverity(status, "absent_half");
+                } else if (earlyMinutes > rule.getLateOne()) {
+                    status = maxSeverity(status, "early_two");
+                    deduct = deduct.add(rule.getDeductTwo());
+                } else if (earlyMinutes > rule.getLateWarn()) {
+                    status = maxSeverity(status, "early_one");
+                    deduct = deduct.add(rule.getDeductOne());
+                } else {
+                    if ("normal".equals(status)) {
+                        status = "early_warn";
+                    }
                 }
-                earlyMinutes = min;
             }
         }
 
+        // 上班漏打卡或下班漏打卡会覆盖原有状态
+        if (startMissed && endMissed) {
+            status = "missed";
+        } else if (startMissed) {
+            status = maxSeverity(status, "missed_start");
+        } else if (endMissed) {
+            status = maxSeverity(status, "missed_end");
+        }
+
         if (period == 1) {
-            check.setP1FirstCheck(firstRec.getChecktime());
-            check.setP1LastCheck(lastRec.getChecktime());
+            check.setP1FirstCheck(startMissed ? null : firstRec.getChecktime());
+            check.setP1LastCheck(endMissed ? null : lastRec.getChecktime());
             check.setP1LateMinutes(lateMinutes);
             check.setP1EarlyMinutes(earlyMinutes);
             check.setP1Status(status);
             check.setP1Deduct(deduct);
         } else {
-            check.setP2FirstCheck(firstRec.getChecktime());
-            check.setP2LastCheck(lastRec.getChecktime());
+            check.setP2FirstCheck(startMissed ? null : firstRec.getChecktime());
+            check.setP2LastCheck(endMissed ? null : lastRec.getChecktime());
             check.setP2LateMinutes(lateMinutes);
             check.setP2EarlyMinutes(earlyMinutes);
             check.setP2Status(status);
@@ -549,19 +644,27 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService
         if ("absent_half".equals(check.getP1Status()) || "absent_half".equals(check.getP2Status())) {
             hasAbsentHalf = true;
         }
-        if ("missed".equals(check.getP1Status())) {
-            if (check.getP2StartTime() != null) {
-                if ("missed".equals(check.getP2Status())) {
-                    check.setAbsentType("full_day");
-                    check.setOverallStatus("absent_full");
-                    return;
-                }
+
+        boolean p1Missed = "missed".equals(check.getP1Status());
+        boolean p2Missed = check.getP2Status() != null && "missed".equals(check.getP2Status());
+        boolean hasP2 = check.getP2StartTime() != null;
+
+        if (p1Missed) {
+            if (hasP2 && !p2Missed) {
+                check.setAbsentType("half_day");
+                check.setOverallStatus("absent_half");
+                return;
             } else {
                 check.setAbsentType("full_day");
                 check.setOverallStatus("absent_full");
                 return;
             }
         }
+        if (p2Missed) {
+            check.setAbsentType("half_day");
+            check.setOverallStatus("absent_half");
+            return;
+        }
         if (check.getP1StartTime() == null && check.getP2StartTime() == null) {
             check.setAbsentType("full_day");
             check.setOverallStatus("absent_full");
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index d3d8f5c8c..012aeefe1 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Arrays;
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -486,7 +487,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
     private Page<WmsMaterialCoilVo> queryMaterialCoilPage(WmsMaterialCoilBo bo, PageQuery pageQuery) {
         QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
         Page<WmsMaterialCoilVo> result;
-        if (Boolean.TRUE.equals(bo.getOrderBy())) {
+        if (Boolean.TRUE.equals(bo.getOrderByPlanDesc())) {
+            result = baseMapper.selectVoPagePlusPlanOrder(pageQuery.build(), qw);
+        } else if (Boolean.TRUE.equals(bo.getOrderBy())) {
             result = baseMapper.selectVoPagePlusOrderBy(pageQuery.build(), qw);
         } else {
             result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
@@ -697,6 +700,12 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getActualWidth() != null, "mc.actual_width", bo.getActualWidth());
         // 实测厚度
         qw.eq(StringUtils.isNotBlank(bo.getActualThickness()), "mc.actual_thickness", bo.getActualThickness());
+        // 理论厚度
+        qw.eq(bo.getTheoreticalThickness() != null, "mc.theoretical_thickness", bo.getTheoreticalThickness());
+        // 理论长度
+        qw.eq(bo.getTheoreticalLength() != null, "mc.theoretical_length", bo.getTheoreticalLength());
+        // 镀铬卷号
+        qw.like(StringUtils.isNotBlank(bo.getChromePlateCoilNo()), "mc.chrome_plate_coil_no", bo.getChromePlateCoilNo());
         // 生产开始时间
         qw.eq(bo.getProductionStartTime() != null, "mc.production_start_time", bo.getProductionStartTime());
         // 生产结束时间
@@ -926,6 +935,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             qw.apply("COALESCE(ca.abnormal_count, 0) >= {0}", bo.getMinAbnormalCount());
         }
         // 排序：
+        // 按计划创建时间倒序（已绑定钢卷列表无planId时优先按计划排序）
+        if (Boolean.TRUE.equals(bo.getOrderByPlanDesc())) {
+            qw.orderByDesc("pl.create_time");
+        }
         // 已绑定钢卷列表中，未发货(status=0)的排在前面
         if (Boolean.TRUE.equals(bo.getStatusFirst())) {
             qw.orderByAsc("mc.status = 1");
@@ -1028,6 +1041,134 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         return '(' + String.join(" OR ", parts) + ')';
     }
 
+    /**
+     * 根据净重(吨)、规格厚度和宽度自动计算理论厚度(mm)和理论长度(m)
+     * 理论厚度 = 净重(吨) × 1000 / 7.85 / 实测长度(mm) / 宽度(mm) * 1000
+     * 理论长度 = 净重(吨) × 1000 / 7.85 / 厚度(mm) / 宽度(mm) * 1000
+     */
+    private void calculateTheoretical(WmsMaterialCoilBo bo) {
+        if (bo.getNetWeight() == null) {
+            return;
+        }
+        if (StringUtils.isBlank(bo.getItemType()) || bo.getItemId() == null) {
+            return;
+        }
+        String specThickness = null;
+        String specWidth = null;
+        try {
+            String specification = null;
+            if ("raw_material".equals(bo.getItemType())) {
+                WmsRawMaterial rm = rawMaterialMapper.selectById(bo.getItemId());
+                if (rm != null) {
+                    specification = rm.getSpecification();
+                }
+            } else if ("product".equals(bo.getItemType())) {
+                WmsProduct p = productMapper.selectById(bo.getItemId());
+                if (p != null) {
+                    specification = p.getSpecification();
+                }
+            }
+            if (StringUtils.isNotBlank(specification)) {
+                String[] parts = specification.split("\\*");
+                if (parts.length >= 2) {
+                    specThickness = parts[0].trim();
+                    specWidth = parts[parts.length - 1].trim();
+                }
+            }
+        } catch (Exception e) {
+            log.warn("查询物品规格失败, itemType: {}, itemId: {}", bo.getItemType(), bo.getItemId(), e);
+            return;
+        }
+        if (StringUtils.isBlank(specThickness) || StringUtils.isBlank(specWidth)) {
+            return;
+        }
+        try {
+            BigDecimal weight = bo.getNetWeight();
+            BigDecimal thickness = new BigDecimal(specThickness);
+            BigDecimal width = new BigDecimal(specWidth);
+            BigDecimal volume = weight.multiply(new BigDecimal("1000")).divide(new BigDecimal("7.85"), 10, RoundingMode.HALF_UP);
+
+            // 计算理论厚度（需要实测长度）
+            if (bo.getTheoreticalThickness() == null && bo.getActualLength() != null && bo.getActualWidth().compareTo(BigDecimal.ZERO) > 0) {
+                BigDecimal length = new BigDecimal(bo.getActualLength());
+                BigDecimal theoreticalThickness = volume.divide(length, 10, RoundingMode.HALF_UP).divide(width, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("1000"));
+                bo.setTheoreticalThickness(theoreticalThickness);
+            }
+
+            // 计算理论长度
+            if (bo.getTheoreticalLength() == null) {
+                BigDecimal theoreticalLength = volume.divide(thickness, 10, RoundingMode.HALF_UP).divide(width, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("1000"));
+                bo.setTheoreticalLength(theoreticalLength);
+            }
+        } catch (Exception e) {
+            log.warn("计算理论厚度/长度失败", e);
+        }
+    }
+
+    /**
+     * 根据物品类型和ID获取规格中的宽度（规格格式：厚度*宽度，取 * 后面部分）
+     */
+    private BigDecimal getSpecWidth(String itemType, Long itemId) {
+        if (StringUtils.isBlank(itemType) || itemId == null) {
+            return null;
+        }
+        try {
+            String specification = null;
+            if ("raw_material".equals(itemType)) {
+                WmsRawMaterial rm = rawMaterialMapper.selectById(itemId);
+                if (rm != null) {
+                    specification = rm.getSpecification();
+                }
+            } else if ("product".equals(itemType)) {
+                WmsProduct p = productMapper.selectById(itemId);
+                if (p != null) {
+                    specification = p.getSpecification();
+                }
+            }
+            if (StringUtils.isNotBlank(specification)) {
+                String[] parts = specification.split("\\*");
+                if (parts.length >= 2) {
+                    return new BigDecimal(parts[parts.length - 1].trim());
+                }
+            }
+        } catch (Exception e) {
+            log.warn("获取规格宽度失败, itemType: {}, itemId: {}", itemType, itemId, e);
+        }
+        return null;
+    }
+
+    /**
+     * 根据物品类型和ID获取规格中的厚度（规格格式：厚度*宽度，取 * 前面部分）
+     */
+    private BigDecimal getSpecThickness(String itemType, Long itemId) {
+        if (StringUtils.isBlank(itemType) || itemId == null) {
+            return null;
+        }
+        try {
+            String specification = null;
+            if ("raw_material".equals(itemType)) {
+                WmsRawMaterial rm = rawMaterialMapper.selectById(itemId);
+                if (rm != null) {
+                    specification = rm.getSpecification();
+                }
+            } else if ("product".equals(itemType)) {
+                WmsProduct p = productMapper.selectById(itemId);
+                if (p != null) {
+                    specification = p.getSpecification();
+                }
+            }
+            if (StringUtils.isNotBlank(specification)) {
+                String[] parts = specification.split("\\*");
+                if (parts.length >= 2) {
+                    return new BigDecimal(parts[0].trim());
+                }
+            }
+        } catch (Exception e) {
+            log.warn("获取规格厚度失败, itemType: {}, itemId: {}", itemType, itemId, e);
+        }
+        return null;
+    }
+
     /**
      * 获取库位及其所有子库位的ID列表
      * 逻辑参考 WmsActualWarehouseServiceImpl.queryList 中的拆分处理逻辑：
@@ -1333,6 +1474,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             bo.setActualWarehouseId(null);
         }
         // 3. 插入钢卷数据
+        calculateTheoretical(bo);
         WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class);
         if(bo.getDataType() != null && bo.getDataType() == 10){
             add.setDataType(10);
@@ -1548,6 +1690,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             }
         }
         validateCoilWeight(bo.getGrossWeight(), bo.getNetWeight());
+        calculateTheoretical(bo);
         // 直接更新钢卷属性
         WmsMaterialCoil updateCoil = BeanUtil.toBean(bo, WmsMaterialCoil.class);
         validEntityBeforeSave(updateCoil);
@@ -1641,6 +1784,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         baseMapper.update(null, updateWrapper);
 
         // 2. 创建新记录
+        calculateTheoretical(bo);
         WmsMaterialCoil newCoil = BeanUtil.toBean(bo, WmsMaterialCoil.class);
         newCoil.setCoilId(null); // 清空ID，让数据库自动生成新ID
         newCoil.setDataType(1); // 设置为当前数据
@@ -1888,6 +2032,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                         ? newCoilBo.getActualWarehouseId() : null;
                     validateActualWarehouseForAssign(newCoilBo.getActualWarehouseId(), ignoreOccupiedId);
                 }
+                calculateTheoretical(newCoilBo);
                 WmsMaterialCoil newCoil = BeanUtil.toBean(newCoilBo, WmsMaterialCoil.class);
                 newCoil.setCoilId(null);
                 newCoil.setDataType(1);
@@ -2016,6 +2161,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             if (bo.getActualWarehouseId() != null) {
                 validateActualWarehouseForAssign(bo.getActualWarehouseId(), null);
             }
+            calculateTheoretical(bo);
             WmsMaterialCoil newCoil = BeanUtil.toBean(bo, WmsMaterialCoil.class);
             newCoil.setCoilId(null);
             newCoil.setDataType(1);
@@ -4854,8 +5000,27 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (childCoilBo.getActualWarehouseId() != null) {
             validateActualWarehouseForAssign(childCoilBo.getActualWarehouseId(), null);
         }
+        if (pendingAction.getActionType() != 501 && childCoilBo.getActionType() != null) {
+            // 校验子卷净重不超过母卷
+            if (childCoilBo.getNetWeight() != null && parentCoil.getNetWeight() != null) {
+                if (childCoilBo.getNetWeight().compareTo(parentCoil.getNetWeight()) > 0) {
+                    throw new RuntimeException("子卷净重[" + childCoilBo.getNetWeight() + "]不能超过母卷净重[" + parentCoil.getNetWeight() + "]");
+                }
+            }
+            // 校验子卷规格厚度不超过母卷
+            String childItemType = StringUtils.isNotBlank(childCoilBo.getItemType()) ? childCoilBo.getItemType() : parentCoil.getItemType();
+            Long childItemId = childCoilBo.getItemId() != null ? childCoilBo.getItemId() : parentCoil.getItemId();
+            BigDecimal parentSpecThickness = getSpecThickness(parentCoil.getItemType(), parentCoil.getItemId());
+            BigDecimal childSpecThickness = getSpecThickness(childItemType, childItemId);
+            if (parentSpecThickness != null && childSpecThickness != null) {
+                if (childSpecThickness.compareTo(parentSpecThickness) > 0) {
+                    throw new RuntimeException("子卷规格厚度[" + childSpecThickness + "]不能超过母卷规格厚度[" + parentSpecThickness + "]");
+                }
+            }
+        }
 
         // 5. 创建子钢卷（参考普通分卷逻辑，但不设置母卷为历史数据）
+        calculateTheoretical(childCoilBo);
         WmsMaterialCoil childCoil = BeanUtil.toBean(childCoilBo, WmsMaterialCoil.class);
         childCoil.setCoilId(null);
         childCoil.setDataType(1); // 当前数据
@@ -4971,6 +5136,19 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 .map(WmsMaterialCoil::getCurrentCoilNo)
                 .collect(Collectors.toList());
 
+            if (pendingAction.getActionType() != 501) {
+                // 校验所有子卷总重不超过母卷净重
+                if (parentCoil.getNetWeight() != null) {
+                    BigDecimal totalChildWeight = childCoils.stream()
+                        .map(WmsMaterialCoil::getNetWeight)
+                        .filter(Objects::nonNull)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    if (totalChildWeight.compareTo(parentCoil.getNetWeight()) > 0) {
+                        throw new RuntimeException("所有子卷总重[" + totalChildWeight + "]不能超过母卷净重[" + parentCoil.getNetWeight() + "]");
+                    }
+                }
+            }
+
             // 如果母卷即将成为历史卷 证明已经加工完成则释放库位
             if (parentCoil.getActualWarehouseId() != null){
                 updateActualWarehouseEnableStatus(parentCoil.getActualWarehouseId(), null);
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index 865b54e33..3c19110bb 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -42,6 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="transferType" column="transfer_type"/>
         <result property="specId" column="spec_id"/>
         <result property="versionId" column="version_id"/>
+        <result property="theoreticalThickness" column="theoretical_thickness"/>
+        <result property="theoreticalLength" column="theoretical_length"/>
+        <result property="chromePlateCoilNo" column="chrome_plate_coil_no"/>
 
     </resultMap>
 
@@ -79,87 +82,91 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY w.warehouse_id, w.warehouse_name
         ORDER BY w.warehouse_id
     </select>
-    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsMaterialCoilVo">
-        SELECT
-            mc.coil_id,
-            mc.parent_coil_id,
-            mc.export_time,
-            mc.export_by,
-            mc.enter_coil_no,
-            mc.current_coil_no,
-            mc.supplier_coil_no,
-            mc.data_type,
-            mc.material_type,
-            mc.next_warehouse_id,
-            mc.qrcode_record_id,
-            mc.team,
-            mc.has_merge_split,
-            mc.parent_coil_nos,
-            mc.item_type,
-            mc.item_id,
-            mc.gross_weight,
-            mc.net_weight,
-            mc.status,
-            mc.remark,
-            mc.warehouse_id,
-            mc.actual_warehouse_id,
-            mc.del_flag,
-            mc.create_time,
-            mc.update_time,
-            mc.create_by,
-            mc.update_by,
-            mc.quality_status,
-            mc.trimming_requirement,
-            mc.packaging_requirement,
-            mc.packing_status,
-            mc.sale_id AS saleId,
-            mc.length,
-            mc.actual_length,
-            mc.actual_width,
-            mc.actual_thickness,
-            mc.production_start_time,
-            mc.production_end_time,
-            mc.production_duration,
-            mc.coil_surface_treatment,
-            mc.reserved_width,
-            mc.coating_type,
-            mc.temper_grade,
-            mc.business_purpose,
-            mc.is_related_to_order,
-            mc.exclusive_status,
-            mc.transfer_type,
-            mc.sale_name AS saleName,
-            w.warehouse_name AS warehouseName,
-            nw.warehouse_name AS nextWarehouseName,
-            aw.actual_warehouse_name AS actualWarehouseName,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
-                 WHEN mc.item_type = 'product' THEN p.specification
-                 ELSE NULL END AS specification,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.material
-                 WHEN mc.item_type = 'product' THEN p.material
-                 ELSE NULL END AS material,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.manufacturer
-                 WHEN mc.item_type = 'product' THEN p.manufacturer
-                 ELSE NULL END AS manufacturer,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.surface_treatment_desc
-                 WHEN mc.item_type = 'product' THEN p.surface_treatment_desc
-                 ELSE NULL END AS surfaceTreatmentDesc,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.zinc_layer
-                 WHEN mc.item_type = 'product' THEN p.zinc_layer
-                 ELSE NULL END AS zincLayer,
-            -- 物品名称和编号（用于兼容）
-            CASE
-                WHEN mc.item_type = 'raw_material' THEN rm.raw_material_name
-                WHEN mc.item_type = 'product' THEN p.product_name
-                ELSE NULL
-            END as itemName,
-            CASE
-                WHEN mc.item_type = 'raw_material' THEN rm.raw_material_code
-                WHEN mc.item_type = 'product' THEN p.product_code
-                ELSE NULL
-            END as itemCode,
-            -- 异常数量统计
-            COALESCE(ca.abnormal_count, 0) AS abnormalCount
+    <!-- ==================== 公共 SQL 片段 ==================== -->
+    <sql id="baseColumns">
+        mc.coil_id,
+        mc.parent_coil_id,
+        mc.export_time,
+        mc.export_by,
+        mc.enter_coil_no,
+        mc.current_coil_no,
+        mc.supplier_coil_no,
+        mc.data_type,
+        mc.material_type,
+        mc.next_warehouse_id,
+        mc.qrcode_record_id,
+        mc.team,
+        mc.has_merge_split,
+        mc.parent_coil_nos,
+        mc.item_type,
+        mc.item_id,
+        mc.gross_weight,
+        mc.net_weight,
+        mc.status,
+        mc.remark,
+        mc.warehouse_id,
+        mc.actual_warehouse_id,
+        mc.del_flag,
+        mc.create_time,
+        mc.update_time,
+        mc.create_by,
+        mc.update_by,
+        mc.quality_status,
+        mc.trimming_requirement,
+        mc.packaging_requirement,
+        mc.packing_status,
+        mc.sale_id AS saleId,
+        mc.length,
+        mc.actual_length,
+        mc.actual_width,
+        mc.actual_thickness,
+        mc.production_start_time,
+        mc.production_end_time,
+        mc.production_duration,
+        mc.coil_surface_treatment,
+        mc.reserved_width,
+        mc.coating_type,
+        mc.temper_grade,
+        mc.business_purpose,
+        mc.is_related_to_order,
+        mc.exclusive_status,
+        mc.transfer_type,
+        mc.theoretical_thickness,
+        mc.theoretical_length,
+        mc.chrome_plate_coil_no,
+        mc.sale_name AS saleName,
+        w.warehouse_name AS warehouseName,
+        nw.warehouse_name AS nextWarehouseName,
+        aw.actual_warehouse_name AS actualWarehouseName,
+        CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
+             WHEN mc.item_type = 'product' THEN p.specification
+             ELSE NULL END AS specification,
+        CASE WHEN mc.item_type = 'raw_material' THEN rm.material
+             WHEN mc.item_type = 'product' THEN p.material
+             ELSE NULL END AS material,
+        CASE WHEN mc.item_type = 'raw_material' THEN rm.manufacturer
+             WHEN mc.item_type = 'product' THEN p.manufacturer
+             ELSE NULL END AS manufacturer,
+        CASE WHEN mc.item_type = 'raw_material' THEN rm.surface_treatment_desc
+             WHEN mc.item_type = 'product' THEN p.surface_treatment_desc
+             ELSE NULL END AS surfaceTreatmentDesc,
+        CASE WHEN mc.item_type = 'raw_material' THEN rm.zinc_layer
+             WHEN mc.item_type = 'product' THEN p.zinc_layer
+             ELSE NULL END AS zincLayer,
+        CASE
+            WHEN mc.item_type = 'raw_material' THEN rm.raw_material_name
+            WHEN mc.item_type = 'product' THEN p.product_name
+            ELSE NULL
+        END as itemName,
+        CASE
+            WHEN mc.item_type = 'raw_material' THEN rm.raw_material_code
+            WHEN mc.item_type = 'product' THEN p.product_code
+            ELSE NULL
+        END as itemCode,
+        COALESCE(ca.abnormal_count, 0) AS abnormalCount
+    </sql>
+
+    <sql id="baseFrom">
         FROM wms_material_coil mc
         LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
         LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
@@ -172,111 +179,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE del_flag = 0
             GROUP BY coil_id
         ) ca ON mc.coil_id = ca.coil_id
+    </sql>
+
+    <!-- ==================== 各场景查询 ==================== -->
+
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsMaterialCoilVo">
+        SELECT <include refid="baseColumns"/>
+        <include refid="baseFrom"/>
         ${ew.customSqlSegment}
     </select>
 
-
     <!-- orderBy=true 专用：包含库位排序辅助字段（aw_sort_key/aw_layer_key/aw_id_key）以及父库位 join -->
     <select id="selectVoPagePlusOrderBy" resultType="com.klp.domain.vo.WmsMaterialCoilVo">
         SELECT
-            mc.coil_id,
-            mc.parent_coil_id,
-            mc.export_time,
-            mc.export_by,
-            mc.enter_coil_no,
-            mc.current_coil_no,
-            mc.supplier_coil_no,
-            mc.data_type,
-            mc.material_type,
-            mc.next_warehouse_id,
-            mc.qrcode_record_id,
-            mc.team,
-            mc.has_merge_split,
-            mc.parent_coil_nos,
-            mc.item_type,
-            mc.item_id,
-            mc.gross_weight,
-            mc.net_weight,
-            mc.status,
-            mc.remark,
-            mc.warehouse_id,
-            mc.actual_warehouse_id,
-            mc.del_flag,
-            mc.create_time,
-            mc.update_time,
-            mc.create_by,
-            mc.update_by,
-            mc.quality_status,
-            mc.trimming_requirement,
-            mc.packaging_requirement,
-            mc.packing_status,
-            mc.sale_id AS saleId,
-            mc.length,
-            mc.actual_length,
-            mc.actual_width,
-            mc.actual_thickness,
-            mc.production_start_time,
-            mc.production_end_time,
-            mc.production_duration,
-            mc.reserved_width,
-            mc.coating_type,
-            mc.temper_grade,
-            mc.business_purpose,
-            mc.is_related_to_order,
-            mc.exclusive_status,
-            mc.transfer_type,
-            mc.sale_name AS saleName,
-            su.nick_name AS saleNickName,
-            w.warehouse_name AS warehouseName,
-            nw.warehouse_name AS nextWarehouseName,
-            aw.actual_warehouse_name AS actualWarehouseName,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
-                 WHEN mc.item_type = 'product' THEN p.specification
-                 ELSE NULL END AS specification,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.material
-                 WHEN mc.item_type = 'product' THEN p.material
-                 ELSE NULL END AS material,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.manufacturer
-                 WHEN mc.item_type = 'product' THEN p.manufacturer
-                 ELSE NULL END AS manufacturer,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.surface_treatment_desc
-                 WHEN mc.item_type = 'product' THEN p.surface_treatment_desc
-                 ELSE NULL END AS surfaceTreatmentDesc,
-            CASE WHEN mc.item_type = 'raw_material' THEN rm.zinc_layer
-                 WHEN mc.item_type = 'product' THEN p.zinc_layer
-                 ELSE NULL END AS zincLayer,
-            -- 物品名称和编号（用于兼容）
-            CASE
-                WHEN mc.item_type = 'raw_material' THEN rm.raw_material_name
-                WHEN mc.item_type = 'product' THEN p.product_name
-                ELSE NULL
-                END as itemName,
-            CASE
-                WHEN mc.item_type = 'raw_material' THEN rm.raw_material_code
-                WHEN mc.item_type = 'product' THEN p.product_code
-                ELSE NULL
-                END as itemCode,
-            -- 库位排序辅助字段（用于全局交错排序，避免在 ORDER BY 中写复杂表达式触发 MP 注入拦截）
+            <include refid="baseColumns"/>,
             COALESCE(CASE WHEN aw.actual_warehouse_type = 4 THEN awp.sort_no ELSE aw.sort_no END, 0) AS aw_sort_key,
             CASE WHEN aw.actual_warehouse_type = 4 THEN CAST(SUBSTRING_INDEX(aw.actual_warehouse_code, '-', -1) AS UNSIGNED) ELSE 0 END AS aw_layer_key,
-            COALESCE(aw.actual_warehouse_id, 0) AS aw_id_key,
-            -- 异常数量统计
-            COALESCE(ca.abnormal_count, 0) AS abnormalCount
-        FROM wms_material_coil mc
-                 LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
-                 LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
-                 LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
-                 LEFT JOIN wms_actual_warehouse awp ON aw.parent_id = awp.actual_warehouse_id
-                 LEFT JOIN sys_user su ON mc.sale_id = su.user_id
-                 LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
-                 LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
-                 LEFT JOIN (
-            SELECT coil_id, COUNT(*) AS abnormal_count
-            FROM wms_coil_abnormal
-            WHERE del_flag = 0
-            GROUP BY coil_id
-        ) ca ON mc.coil_id = ca.coil_id
-            ${ew.customSqlSegment}
+            COALESCE(aw.actual_warehouse_id, 0) AS aw_id_key
+        <include refid="baseFrom"/>
+        LEFT JOIN wms_actual_warehouse awp ON aw.parent_id = awp.actual_warehouse_id
+        ${ew.customSqlSegment}
+    </select>
+
+    <!-- orderByPlanDesc=true 专用：包含发货计划 join，支持按计划创建时间倒序排序 -->
+    <select id="selectVoPagePlusPlanOrder" resultType="com.klp.domain.vo.WmsMaterialCoilVo">
+        SELECT <include refid="baseColumns"/>
+        <include refid="baseFrom"/>
+        LEFT JOIN wms_delivery_waybill_detail d ON d.coil_id = mc.coil_id AND d.del_flag = 0
+        LEFT JOIN wms_delivery_waybill wb ON wb.waybill_id = d.waybill_id AND wb.del_flag = 0
+        LEFT JOIN wms_delivery_plan pl ON pl.plan_id = wb.plan_id AND pl.del_flag = 0
+        ${ew.customSqlSegment}
     </select>
 
 
@@ -554,6 +486,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.sale_name AS saleName,
             -- 调拨类型
             mc.transfer_type AS transferType,
+            -- 理论厚度
+            mc.theoretical_thickness AS theoreticalThickness,
+            -- 理论长度
+            mc.theoretical_length AS theoreticalLength,
+            -- 镀铬卷号
+            mc.chrome_plate_coil_no AS chromePlateCoilNo,
             -- 库存状态（中文显示）
             CASE
                 WHEN mc.status = 0 THEN '在库'
@@ -641,6 +579,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mc.packing_status AS packingStatus,
         mc.sale_name AS saleName,
         mc.transfer_type AS transferType,
+        mc.theoretical_thickness AS theoreticalThickness,
+        mc.theoretical_length AS theoreticalLength,
+        mc.chrome_plate_coil_no AS chromePlateCoilNo,
         CASE
         WHEN mc.status = 0 THEN '在库'
         WHEN mc.status = 1 THEN '已发货'
@@ -759,6 +700,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mc.packing_status AS packingStatus,
         mc.sale_name AS saleName,
         mc.transfer_type AS transferType,
+        mc.theoretical_thickness AS theoreticalThickness,
+        mc.theoretical_length AS theoreticalLength,
+        mc.chrome_plate_coil_no AS chromePlateCoilNo,
         CASE
         WHEN mc.status = 0 THEN '在库'
         WHEN mc.status = 1 THEN '已发货'