pqc导入导出模板修改

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/impl/QmsPqcInspectionRuleControllerServiceImpl.java

@@ -1098,27 +1098,27 @@ public class QmsPqcInspectionRuleControllerServiceImpl implements QmsPqcInspecti
     }
 
     /**
-     * 解析检测方法文本 → Integer
+     * 解析判定类型文本 → Integer
-     * 目视→0, 量具→1
+     * 外观定型→0, 数值定量→1
      */
     private Integer parseInspectionMethodsText(String text) {
         if (StrUtil.isBlank(text)) return null;
         switch (text.trim()) {
-            case "目视": return 0;
+            case "外观定型": return 0;
-            case "量具": return 1;
+            case "数值定量": return 1;
             default:
                 try { return Integer.parseInt(text.trim()); } catch (NumberFormatException e) {
-                    throw new NflgException(STATE.BusinessError, "检测方法\"" + text + "\"无法识别，请输入：目视/量具");
+                    throw new NflgException(STATE.BusinessError, "判定类型\"" + text + "\"无法识别，请输入：外观定型/数值定量");
                 }
         }
     }
 
     /**
-     * Integer → 检测方法文本
+     * Integer → 判定类型文本
      */
     private String inspectionMethodsToText(Integer methods) {
         if (methods == null) return "";
-        switch (methods) { case 0: return "目视"; case 1: return "量具"; default: return String.valueOf(methods); }
+        switch (methods) { case 0: return "外观定型"; case 1: return "数值定量"; default: return String.valueOf(methods); }
     }
 
     /**
@@ -1228,7 +1228,7 @@ public class QmsPqcInspectionRuleControllerServiceImpl implements QmsPqcInspecti
                 .setInspectionPointName("示例检查点名称")
                 .setInspectionContent("示例检查项内容")
                 .setInspectionTypeText("工序检查")
-                .setInspectionMethodsText("目视")
+                .setInspectionMethodsText("外观定型")
                 .setInspectionLevelText("1")
                 .setInspectionImage("123456")
                 .setSort(1);

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PqcInspectionRuleExportDTO.java

@@ -19,11 +19,6 @@ public class PqcInspectionRuleExportDTO {
     @ExcelColumn("机型编号")
     private String modelNo;
 
-    /**
-     * 质检员ID
-     */
-    @ExcelColumn("质检员ID")
-
     /**
      * 步装名称
      */
@@ -55,9 +50,9 @@ public class PqcInspectionRuleExportDTO {
     private String inspectionTypeText;
 
     /**
-     * 检测方法（目视/量具）
+     * 判定类型（外观定型/数值定量）
      */
-    @ExcelColumn("检测方法")
+    @ExcelColumn("判定类型")
     private String inspectionMethodsText;
 
     /**

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PqcInspectionRuleImportDTO.java

@@ -6,7 +6,7 @@ import org.ttzero.excel.annotation.ExcelColumn;
 
 /**
  * PQC检测规则 导入DTO
- * Excel模板列：机型编号*, 步装名称*, 检查点编号*, 检查点名称, 检查项内容*, 检查项类别*, 检测方法*, 等级*, 实例图, 排序
+ * Excel模板列：机型编号*, 步装名称*, 检查点编号*, 检查点名称, 检查项内容*, 检查项类别*, 判定类型*, 等级*, 实例图, 排序
  */
 @Data
 @Accessors(chain = true)
@@ -18,11 +18,6 @@ public class PqcInspectionRuleImportDTO {
     @ExcelColumn("机型编号*")
     private String modelNo;
 
-    /**
-     * 质检员ID
-     */
-    @ExcelColumn("质检员ID")
-
     /**
      * 步装名称（必填）
      */
@@ -54,9 +49,9 @@ public class PqcInspectionRuleImportDTO {
     private String inspectionTypeText;
 
     /**
-     * 检测方法（必填）：目视/量具
+     * 判定类型（必填）：外观定型/数值定量
      */
-    @ExcelColumn("检测方法*")
+    @ExcelColumn("判定类型*")
     private String inspectionMethodsText;
 
     /**

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PqcInspectionRuleImportTemplateDTO.java

@@ -14,8 +14,6 @@ public class PqcInspectionRuleImportTemplateDTO {
     @ExcelColumn("机型编号*")
     private String modelNo;
 
-    @ExcelColumn("质检员ID")
-
     @ExcelColumn("步装名称*")
     private String stepName;
 
@@ -31,7 +29,7 @@ public class PqcInspectionRuleImportTemplateDTO {
     @ExcelColumn("检查项类别*")
     private String inspectionTypeText;
 
-    @ExcelColumn("检测方法*")
+    @ExcelColumn("判定类型*")
     private String inspectionMethodsText;
 
     @ExcelColumn("等级*")

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsPqcInspectionPointItems.java

@@ -52,7 +52,7 @@ public class QmsPqcInspectionPointItems implements Serializable {
     private Integer inspectionType;
 
     /**
-     * 判定类型：0=目视，1=量具
+     * 判定类型：0=外观定型，1=数值定量
      */
     private Integer inspectionMethods;