refactor(qms): 精简检验标准相关数据结构调整
- 删除 QmsInspectionStandardAddQO 中的图纸URL、包装方式ID和检验周期字段 - 注释掉 QmsInspectionStandardControllerService 中相关字段的赋值操作 - 修改 QmsInspectionStandardEditQO,去除继承关系,重新添加相关字段 - 在 QmsInspectionStandardEditQO 中添加物料ID字段,保证完整的检验标准编辑参数
This commit is contained in:
parent
22f880117d
commit
0e1a3c460d
|
|
@ -259,10 +259,10 @@ public class QmsInspectionStandardControllerService {
|
|||
|
||||
QmsInspectionStandard standard = new QmsInspectionStandard();
|
||||
standard.setMaterialId(qo.getMaterialId());
|
||||
standard.setDrawingUrl(qo.getDrawingUrl());
|
||||
// standard.setDrawingUrl(qo.getDrawingUrl());
|
||||
// standard.setVersion(versionNo);
|
||||
standard.setPackagingMethodId(qo.getPackagingMethodId());
|
||||
standard.setInspectionCycle(qo.getInspectionCycle());
|
||||
// standard.setPackagingMethodId(qo.getPackagingMethodId());
|
||||
// standard.setInspectionCycle(qo.getInspectionCycle());
|
||||
// 默认值
|
||||
standard.setIsEnabled(true);
|
||||
standard.setPublishStatus((short) 0);
|
||||
|
|
|
|||
|
|
@ -14,19 +14,4 @@ public class QmsInspectionStandardAddQO {
|
|||
*/
|
||||
@NotNull(message = "物料ID不能为空")
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 图纸URL
|
||||
*/
|
||||
private String drawingUrl;
|
||||
|
||||
/**
|
||||
* 包装方式ID
|
||||
*/
|
||||
private Long packagingMethodId;
|
||||
|
||||
/**
|
||||
* 检验周期
|
||||
*/
|
||||
private Integer inspectionCycle;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,14 +3,12 @@ package com.nflg.wms.common.pojo.qo;
|
|||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 检验标准编辑参数
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO {
|
||||
public class QmsInspectionStandardEditQO {
|
||||
|
||||
/**
|
||||
* 检验标准ID
|
||||
|
|
@ -18,6 +16,12 @@ public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO {
|
|||
@NotNull(message = "检验标准ID不能为空")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 物料ID
|
||||
*/
|
||||
@NotNull(message = "物料ID不能为空")
|
||||
private Long materialId;
|
||||
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
|
|
@ -29,4 +33,19 @@ public class QmsInspectionStandardEditQO extends QmsInspectionStandardAddQO {
|
|||
*/
|
||||
@NotNull
|
||||
private Boolean isEnabled;
|
||||
|
||||
/**
|
||||
* 图纸URL
|
||||
*/
|
||||
private String drawingUrl;
|
||||
|
||||
/**
|
||||
* 包装方式ID
|
||||
*/
|
||||
private Long packagingMethodId;
|
||||
|
||||
/**
|
||||
* 检验周期
|
||||
*/
|
||||
private Integer inspectionCycle;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue