Merge remote-tracking branch '惠信/qms/develop' into qms/develop

nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsInspectionItemController.java

@@ -9,6 +9,7 @@ import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.dto.QmsInspectionItemExportDTO;
 import com.nflg.wms.common.pojo.dto.QmsInspectionItemImportDTO;
+import com.nflg.wms.common.pojo.dto.QmsInspectionItemTemplateDTO;
 import com.nflg.wms.common.pojo.qo.QmsInspectionItemAddQO;
 import com.nflg.wms.common.pojo.qo.QmsInspectionItemSearchQO;
 import com.nflg.wms.common.pojo.qo.QmsInspectionItemUpdateQO;
@@ -139,7 +140,7 @@ public class QmsInspectionItemController extends BaseController {
     @GetMapping("template")
     public void template(HttpServletResponse response) throws IOException {
         // 构造一行示例数据
-        QmsInspectionItemImportDTO example = new QmsInspectionItemImportDTO();
+        QmsInspectionItemTemplateDTO example = new QmsInspectionItemTemplateDTO();
         example.setCategoryCode("物料类别编号");
         example.setSerialNo("数字1、2、3、4");
         example.setTestStandard("检测标准内容");

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

@@ -0,0 +1,29 @@
+package com.nflg.wms.common.pojo.dto;
+
+import lombok.Data;
+import org.ttzero.excel.annotation.ExcelColumn;
+
+/**
+ * 检测项导入模板 DTO（不含错误信息列）
+ */
+@Data
+public class QmsInspectionItemTemplateDTO {
+
+    @ExcelColumn("物料类别编号*")
+    private String categoryCode;
+
+    @ExcelColumn("检测项序号*")
+    private String serialNo;
+
+    @ExcelColumn("检测标准*")
+    private String testStandard;
+
+    @ExcelColumn("图例")
+    private String legend;
+
+    @ExcelColumn("检测类型(0定向/1定量)*")
+    private String detectionType;
+
+    @ExcelColumn("判定类型(0目视/1量具)*")
+    private String determinationType;
+}