rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
曹鹏飞 2026-05-07 16:00:56 +08:00
parent 4a3bb48b91 867d564319
commit 4969923e95
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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("检测标准内容");

29
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/QmsInspectionItemTemplateDTO.java Normal file
View File

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