zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委托单号根据配置来源于字段或生成规则生成

Browse Source
This commit is contained in:
王兴荣
2025-10-30 16:58:22 +08:00
parent 7375539ede
commit b75c389b84
26 changed files with 155 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java
View File

@@ -136,4 +136,13 @@ public interface QmsCommonConstant {
/** 平行 **/
String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel";
/** 配料 **/
String ASSAY_PROJECT_USAGE_INGREDIENT = "ingredient";
/** 报出 **/
String ASSAY_PROJECT_USAGE_REPORT = "report";
/** 配料和报出 **/
String ASSAY_PROJECT_USAGE_INGREDIENT_REPORT = "ingredient_report";
}

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataPageReqVO.java
View File

@@ -22,6 +22,12 @@ public class BusinessAssayProjectDataPageReqVO extends PageParam {
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "19038")
private Long dictionaryProjectId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "值")
private String value;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataReqVO.java
View File

@@ -28,6 +28,12 @@ public class BusinessAssayProjectDataReqVO {
@Schema(description = "检测项目字典ID,字典表【T_DIC_PRJ】", example = "5352")
private Long dictionaryProjectId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "值")
private String value;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayProjectDataRespVO.java
View File

@@ -28,6 +28,12 @@ public class BusinessAssayProjectDataRespVO {
@ExcelProperty("检测项目字典ID,字典表【T_DIC_PRJ】")
private Long dictionaryProjectId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "值")
@ExcelProperty("值")
private String value;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentPageReqVO.java
View File

@@ -25,6 +25,12 @@ public class BusinessSubParentSampleAssessmentPageReqVO extends PageParam {
@Schema(description = "检测方法配置ID", example = "16271")
private Long configAssayMethodId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentRespVO.java
View File

@@ -32,6 +32,12 @@ public class BusinessSubParentSampleAssessmentRespVO {
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubParentSampleAssessmentSaveReqVO.java
View File

@@ -30,6 +30,12 @@ public class BusinessSubParentSampleAssessmentSaveReqVO {
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentPageReqVO.java
View File

@@ -28,6 +28,12 @@ public class BusinessSubSampleAssessmentPageReqVO extends PageParam {
@Schema(description = "检测方法配置ID", example = "8091")
private Long configAssayMethodId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", example = "2")
private String taskType;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentRespVO.java
View File

@@ -35,6 +35,12 @@ public class BusinessSubSampleAssessmentRespVO {
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("任务类型,【字典】【jy_sample_task_type】常规、抽查...")
private String taskType;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSubSampleAssessmentSaveReqVO.java
View File

@@ -33,6 +33,12 @@ public class BusinessSubSampleAssessmentSaveReqVO {
@NotNull(message = "检测方法配置ID不能为空")
private Long configAssayMethodId;
@Schema(description = "用途,ingredient-配料、report-报出、ingredient_report-配料及报出")
private String usage;
@Schema(description = "符号,=、>、<、等")
private String symbol;
@Schema(description = "任务类型,【字典】【jy_sample_task_type】常规、抽查...", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "任务类型,【字典】【jy_sample_task_type】常规、抽查...不能为空")
private String taskType;

Some files were not shown because too many files have changed in this diff Show More