diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java
index 9e6fb8d7..30672b24 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java
@@ -26,270 +26,274 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
public class CycleTestTask extends BaseEntity {
- @Serial
- private static final long serialVersionUID = 1L;
+ @Serial
+ private static final long serialVersionUID = 1L;
- /**
- * [周期试验任务]编码
- */
+ /**
+ * [周期试验任务]编码
+ */
public static final String COL_CODE = "CODE";
- /**
- * [周期试验任务]类型-[1]:周期性;[2]一次性;
- */
+ /**
+ * [周期试验任务]类型-[1]:周期性;[2]一次性;
+ */
public static final String COL_CYCLE_TEST_TASK_TYPE = "CYCLE_TEST_TASK_TYPE";
- /**
- * 名称
- */
+ /**
+ * 名称
+ */
public static final String COL_NAME = "NAME";
- /**
- * 配置[班组]id
- */
+ /**
+ * 配置[班组]id
+ */
public static final String COL_CONFIG_TEAM_ID = "CONFIG_TEAM_ID";
- /**
- * 配置[外协商]id
- */
+ /**
+ * 配置[外协商]id
+ */
public static final String COL_CONFIG_OEM_ID = "CONFIG_OEM_ID";
- /**
- * [周期性试验项目]id
- */
+ /**
+ * [周期性试验项目]id
+ */
public static final String COL_CYCLE_TEST_ITEM_ID = "CYCLE_TEST_ITEM_ID";
- /**
- * 试验件类型-[1]:零件;[2]:试片;
- */
+ /**
+ * 试验件类型-[1]:零件;[2]:试片;
+ */
public static final String COL_TEST_TYPE = "TEST_TYPE";
- /**
- * 工艺员[用户]id
- */
+ /**
+ * 工艺员[用户]id
+ */
public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID";
- /**
- * 试验技术员[用户]id
- */
+ /**
+ * 试验技术员[用户]id
+ */
public static final String COL_TEST_USER_ID = "TEST_USER_ID";
- /**
- * 下发[班组]id
- */
+ /**
+ * 下发[班组]id
+ */
public static final String COL_SEND_TEAM_ID = "SEND_TEAM_ID";
- /**
- * 下发[外协商]id
- */
+ /**
+ * 下发[外协商]id
+ */
public static final String COL_SEND_OEM_ID = "SEND_OEM_ID";
- /**
- * 下发人员[用户]id
- */
+ /**
+ * 下发人员[用户]id
+ */
public static final String COL_SEND_USER_ID = "SEND_USER_ID";
- /**
- * 数量
- */
+ /**
+ * 数量
+ */
public static final String COL_QUANTITY = "QUANTITY";
- /**
- * [镀种]id
- */
+ /**
+ * [镀种]id
+ */
public static final String COL_PLATE_ID = "PLATE_ID";
- /**
- * 批次号
- */
+ /**
+ * 批次号
+ */
public static final String COL_BATCH_CODE = "BATCH_CODE";
- /**
- * 专家描述
- */
+ /**
+ * 专家描述
+ */
public static final String COL_EXPERT_DESC = "EXPERT_DESC";
- /**
- * 评审描述
- */
+ /**
+ * 评审描述
+ */
public static final String COL_REVIEW_DESC = "REVIEW_DESC";
- /**
- * 排序
- */
+ /**
+ * 排序
+ */
public static final String COL_SORT = "SORT";
- /**
- * 备注
- */
+ /**
+ * 备注
+ */
public static final String COL_REMARK = "REMARK";
- /**
- * 填报附件
- */
+ /**
+ * 填报附件
+ */
public static final String COL_TEST_ATTACH_ID = "TEST_ATTACH_ID";
- /**
- * 是否进行试验-[1]:试验;[2]:不试验;
- */
+ /**
+ * 是否进行试验-[1]:试验;[2]:不试验;
+ */
public static final String COL_IS_DONE = "IS_DONE";
- /**
- * 试验时间
- */
+ /**
+ * 试验时间
+ */
public static final String COL_TEST_DATE = "TEST_DATE";
- /**
- * 一次性任务生成日期
- */
+ /**
+ * 一次性任务生成日期
+ */
public static final String COL_ONE_TIME_GEN_DATE = "ONE_TIME_GEN_DATE";
- /**
- * 下发时间
- */
+ /**
+ * 下发时间
+ */
public static final String COL_ISSUE_DATE = "ISSUE_DATE";
- /**
- * 接收时间
- */
+ /**
+ * 接收时间
+ */
public static final String COL_ACCEPT_DATE = "ACCEPT_DATE";
- /**
- * 完成时间
- */
+ /**
+ * 完成时间
+ */
public static final String COL_FINISH_DATE = "FINISH_DATE";
- /**
- * 不试验原因
- */
+ /**
+ * 不试验原因
+ */
public static final String COL_REASON_FOR_NO = "REASON_FOR_NO";
- /**
- * [周期试验]id
- */
+ /**
+ * [周期试验]id
+ */
public static final String COL_CYCLE_TEST_ID = "CYCLE_TEST_ID";
- public static final String COL_FLAG_APPROACH = "FLAG_APPROACH";
+ public static final String COL_FLAG_APPROACH = "FLAG_APPROACH";
- public static final String COL_FLAG_OUT = "FLAG_OUT";
+ public static final String COL_FLAG_OUT = "FLAG_OUT";
- /**
- * [周期试验任务]编码
- */
- @Schema(description = "[周期试验任务]编码")
- private String code;
- /**
- * [周期试验任务]类型-[1]:周期性;[2]一次性;
- */
- @Schema(description = "[周期试验任务]类型-[1]:周期性;[2]一次性;")
- private Integer cycleTestTaskType;
- /**
- * 名称
- */
- @Schema(description = "名称")
- private String name;
- /**
- * 配置[班组]id
- */
- @Schema(description = "配置[班组]id")
- private Long configTeamId;
- /**
- * 配置[外协商]id
- */
- @Schema(description = "配置[外协商]id")
- private Long configOemId;
- /**
- * [周期性试验项目]id
- */
- @Schema(description = "[周期性试验项目]id")
- private Long cycleTestItemId;
- /**
- * 试验件类型-[1]:零件;[2]:试片;
- */
- @Schema(description = "试验件类型-[1]:零件;[2]:试片;")
- private Integer testType;
- /**
- * 工艺员[用户]id
- */
- @Schema(description = "工艺员[用户]id")
- private Long processUserId;
- /**
- * 试验技术员[用户]id
- */
- @Schema(description = "试验技术员[用户]id")
- private Long testUserId;
- /**
- * 下发[班组]id
- */
- @Schema(description = "下发[班组]id")
- private Long sendTeamId;
- /**
- * 下发[外协商]id
- */
- @Schema(description = "下发[外协商]id")
- private Long sendOemId;
- /**
- * 下发人员[用户]id
- */
- @Schema(description = "下发人员[用户]id")
- private Long sendUserId;
- /**
- * 数量
- */
- @Schema(description = "数量")
- private Long quantity;
- /**
- * [镀种]id
- */
- @Schema(description = "[镀种]id")
- private Long plateId;
- /**
- * 批次号
- */
- @Schema(description = "批次号")
- private String batchCode;
- /**
- * 专家描述
- */
- @Schema(description = "专家描述")
- private String expertDesc;
- /**
- * 评审描述
- */
- @Schema(description = "评审描述")
- private String reviewDesc;
- /**
- * 排序
- */
- @Schema(description = "排序")
- private Long sort;
- /**
- * 备注
- */
- @Schema(description = "备注")
- private String remark;
- /**
- * 填报附件
- */
- @Schema(description = "填报附件")
- private Long testAttachId;
- /**
- * 是否进行试验-[1]:试验;[2]:不试验;
- */
- @Schema(description = "是否进行试验-[1]:试验;[2]:不试验;")
- private Integer isDone;
- /**
- * 试验时间
- */
- @Schema(description = "试验时间")
- private LocalDate testDate;
- /**
- * 一次性任务生成日期
- */
- @Schema(description = "一次性任务生成日期")
- private LocalDate oneTimeGenDate;
- /**
- * 下发时间
- */
- @Schema(description = "下发时间")
- private LocalDateTime issueDate;
- /**
- * 接收时间
- */
- @Schema(description = "接收时间")
- private LocalDateTime acceptDate;
- /**
- * 完成时间
- */
- @Schema(description = "完成时间")
- private LocalDateTime finishDate;
- /**
- * 不试验原因
- */
- @Schema(description = "不试验原因")
- private String reasonForNo;
- /**
- * [周期试验]id
- */
- @Schema(description = "[周期试验]id")
- private Long cycleTestId;
- @Schema(description = "临期标记")
- @TableField("FLAG_APPROACH")
- private Integer flagApproach;
- @Schema(description = "超期标记")
- @TableField("FLAG_OUT")
- private Integer flagOut;
+ /**
+ * [周期试验任务]编码
+ */
+ @Schema(description = "[周期试验任务]编码")
+ private String code;
+ /**
+ * [周期试验任务]类型-[1]:周期性;[2]一次性;
+ */
+ @Schema(description = "[周期试验任务]类型-[1]:周期性;[2]一次性;")
+ private Integer cycleTestTaskType;
+ /**
+ * 名称
+ */
+ @Schema(description = "名称")
+ private String name;
+ /**
+ * 配置[班组]id
+ */
+ @Schema(description = "配置[班组]id")
+ private Long configTeamId;
+ /**
+ * 配置[外协商]id
+ */
+ @Schema(description = "配置[外协商]id")
+ private Long configOemId;
+ /**
+ * [周期性试验项目]id
+ */
+ @Schema(description = "[周期性试验项目]id")
+ private Long cycleTestItemId;
+ /**
+ * 试验件类型-[1]:零件;[2]:试片;
+ */
+ @Schema(description = "试验件类型-[1]:零件;[2]:试片;")
+ private Integer testType;
+ /**
+ * 工艺员[用户]id
+ */
+ @Schema(description = "工艺员[用户]id")
+ private Long processUserId;
+ /**
+ * 试验技术员[用户]id
+ */
+ @Schema(description = "试验技术员[用户]id")
+ private Long testUserId;
+ /**
+ * 下发[班组]id
+ */
+ @Schema(description = "下发[班组]id")
+ private Long sendTeamId;
+ /**
+ * 下发[外协商]id
+ */
+ @Schema(description = "下发[外协商]id")
+ private Long sendOemId;
+ /**
+ * 下发人员[用户]id
+ */
+ @Schema(description = "下发人员[用户]id")
+ private Long sendUserId;
+ /**
+ * 数量
+ */
+ @Schema(description = "数量")
+ private Long quantity;
+ /**
+ * [镀种]id
+ */
+ @Schema(description = "[镀种]id")
+ private Long plateId;
+ /**
+ * 批次号
+ */
+ @Schema(description = "批次号")
+ private String batchCode;
+ /**
+ * 专家描述
+ */
+ @Schema(description = "专家描述")
+ private String expertDesc;
+ /**
+ * 评审描述
+ */
+ @Schema(description = "评审描述")
+ private String reviewDesc;
+ /**
+ * 排序
+ */
+ @Schema(description = "排序")
+ private Long sort;
+ /**
+ * 备注
+ */
+ @Schema(description = "备注")
+ private String remark;
+ /**
+ * 填报附件
+ */
+ @Schema(description = "填报附件")
+ private Long testAttachId;
+ /**
+ * 是否进行试验-[1]:试验;[2]:不试验;
+ */
+ @Schema(description = "是否进行试验-[1]:试验;[2]:不试验;")
+ private Integer isDone;
+ /**
+ * 试验时间
+ */
+ @Schema(description = "试验时间")
+ private LocalDate testDate;
+ /**
+ * 一次性任务生成日期
+ */
+ @Schema(description = "一次性任务生成日期")
+ private LocalDate oneTimeGenDate;
+ /**
+ * 下发时间
+ */
+ @Schema(description = "下发时间")
+ private LocalDateTime issueDate;
+ /**
+ * 接收时间
+ */
+ @Schema(description = "接收时间")
+ private LocalDateTime acceptDate;
+ /**
+ * 完成时间
+ */
+ @Schema(description = "完成时间")
+ private LocalDateTime finishDate;
+ /**
+ * 不试验原因
+ */
+ @Schema(description = "不试验原因")
+ private String reasonForNo;
+ /**
+ * [周期试验]id
+ */
+ @Schema(description = "[周期试验]id")
+ private Long cycleTestId;
+ /**
+ * 临期标记
+ */
+ @Schema(description = "临期标记")
+ private Integer flagApproach;
+ /**
+ * 超期标记
+ */
+ @Schema(description = "超期标记")
+ private Integer flagOut;
}
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java
index d557b09e..2335fbd5 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java
@@ -24,208 +24,208 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true)
public class LiquidTankTask extends BaseEntity {
- @Serial
- private static final long serialVersionUID = 1L;
+ @Serial
+ private static final long serialVersionUID = 1L;
- /**
- * [槽液检测任务]编码
- */
+ /**
+ * [槽液检测任务]编码
+ */
public static final String COL_CODE = "CODE";
- /**
- * 类型
- */
+ /**
+ * 类型
+ */
public static final String COL_LIQUID_TANK_TASK_TYPE = "LIQUID_TANK_TASK_TYPE";
- /**
- * [作业中心]id
- */
+ /**
+ * [作业中心]id
+ */
public static final String COL_WORK_CENTER_ID = "WORK_CENTER_ID";
- /**
- * [作业槽]id
- */
+ /**
+ * [作业槽]id
+ */
public static final String COL_WORK_TANK_ID = "WORK_TANK_ID";
- /**
- * [槽液]id
- */
+ /**
+ * [槽液]id
+ */
public static final String COL_LIQUID_TANK_ID = "LIQUID_TANK_ID";
- /**
- * [槽液]编号
- */
+ /**
+ * [槽液]编号
+ */
public static final String COL_LIQUID_TANK_CODE = "LIQUID_TANK_CODE";
- /**
- * 化验人[用户]id
- */
+ /**
+ * 化验人[用户]id
+ */
public static final String COL_TEST_USER_ID = "TEST_USER_ID";
- /**
- * 复检化验人[用户]id
- */
+ /**
+ * 复检化验人[用户]id
+ */
public static final String COL_REPEAT_TEST_USER_ID = "REPEAT_TEST_USER_ID";
- /**
- * 工艺主管[用户]id
- */
+ /**
+ * 工艺主管[用户]id
+ */
public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID";
- /**
- * 审核[用户]id
- */
+ /**
+ * 审核[用户]id
+ */
public static final String COL_REVIEW_USER_ID = "REVIEW_USER_ID";
- /**
- * 发药[用户]id
- */
+ /**
+ * 发药[用户]id
+ */
public static final String COL_SEND_DRUG_USER_ID = "SEND_DRUG_USER_ID";
- /**
- * 领药[用户]id
- */
+ /**
+ * 领药[用户]id
+ */
public static final String COL_RECEIVE_DRUG_USER_ID = "RECEIVE_DRUG_USER_ID";
- /**
- * [班组]id
- */
+ /**
+ * [班组]id
+ */
public static final String COL_TEAM_ID = "TEAM_ID";
- /**
- * 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
- */
+ /**
+ * 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
+ */
public static final String COL_FROM_TYPE = "FROM_TYPE";
- /**
- * 名称
- */
+ /**
+ * 名称
+ */
public static final String COL_NAME = "NAME";
- /**
- * 药品[物料]id
- */
+ /**
+ * 药品[物料]id
+ */
public static final String COL_DRUG_MATERIAL_ID = "DRUG_MATERIAL_ID";
- /**
- * 药品[物料]编码
- */
+ /**
+ * 药品[物料]编码
+ */
public static final String COL_DRUG_MATERIAL_CODE = "DRUG_MATERIAL_CODE";
- /**
- * 药品物料名称
- */
+ /**
+ * 药品物料名称
+ */
public static final String COL_DRUG_MATERIAL_NAME = "DRUG_MATERIAL_NAME";
- /**
- * 药品名称
- */
+ /**
+ * 药品名称
+ */
public static final String COL_DRUG_NAME = "DRUG_NAME";
- /**
- * 药品批次
- */
+ /**
+ * 药品批次
+ */
public static final String COL_DRUG_BAT_CODE = "DRUG_BAT_CODE";
- /**
- * 添加点
- */
+ /**
+ * 添加点
+ */
public static final String COL_FILLING_LOCATION = "FILLING_LOCATION";
- /**
- * 目标值
- */
+ /**
+ * 目标值
+ */
public static final String COL_TARGET_VALUE = "TARGET_VALUE";
- /**
- * 目标上限
- */
+ /**
+ * 目标上限
+ */
public static final String COL_TARGET_VALUE_MAX = "TARGET_VALUE_MAX";
- /**
- * 目标下限
- */
+ /**
+ * 目标下限
+ */
public static final String COL_TARGET_VALUE_MIN = "TARGET_VALUE_MIN";
- /**
- * 规范上限
- */
+ /**
+ * 规范上限
+ */
public static final String COL_NORM_VALUE_MAX = "NORM_VALUE_MAX";
- /**
- * 规范下限
- */
+ /**
+ * 规范下限
+ */
public static final String COL_NORM_VALUE_MIN = "NORM_VALUE_MIN";
- /**
- * 体积
- */
+ /**
+ * 体积
+ */
public static final String COL_VOLUME = "VOLUME";
- /**
- * 分析周期
- */
+ /**
+ * 分析周期
+ */
public static final String COL_ANALYSIS_CYCLE = "ANALYSIS_CYCLE";
- /**
- * 工艺含量
- */
+ /**
+ * 工艺含量
+ */
public static final String COL_PROCESS_CONTENT = "PROCESS_CONTENT";
- /**
- * 待测成分/分析项目
- */
+ /**
+ * 待测成分/分析项目
+ */
public static final String COL_TEST_ELEMENT = "TEST_ELEMENT";
- /**
- * 是否合格-[1]:合格;[2]:不合格;
- */
+ /**
+ * 是否合格-[1]:合格;[2]:不合格;
+ */
public static final String COL_QUALIFIED = "QUALIFIED";
- /**
- * 实测温度
- */
+ /**
+ * 实测温度
+ */
public static final String COL_TEMPERATURE_ACTUAL = "TEMPERATURE_ACTUAL";
- /**
- * 实测PH值
- */
+ /**
+ * 实测PH值
+ */
public static final String COL_PH_ACTUAL = "PH_ACTUAL";
- /**
- * 复测电导率测量值
- */
+ /**
+ * 复测电导率测量值
+ */
public static final String COL_CONDUCTIVITY_REPEAT_TEST_VALUE = "CONDUCTIVITY_REPEAT_TEST_VALUE";
- /**
- * 首次电导率测量值
- */
+ /**
+ * 首次电导率测量值
+ */
public static final String COL_CONDUCTIVITY_FIRST_TEST_VALUE = "CONDUCTIVITY_FIRST_TEST_VALUE";
- /**
- * 首次测量值
- */
+ /**
+ * 首次测量值
+ */
public static final String COL_FIRST_TEST_VALUE = "FIRST_TEST_VALUE";
- /**
- * 复检测量值
- */
+ /**
+ * 复检测量值
+ */
public static final String COL_REPEAT_TEST_VALUE = "REPEAT_TEST_VALUE";
- /**
- * 首次化验时间
- */
+ /**
+ * 首次化验时间
+ */
public static final String COL_FIRST_TEST_DATE = "FIRST_TEST_DATE";
- /**
- * 复检化验时间
- */
+ /**
+ * 复检化验时间
+ */
public static final String COL_REPEAT_TEST_DATE = "REPEAT_TEST_DATE";
- /**
- * 审核时间
- */
+ /**
+ * 审核时间
+ */
public static final String COL_REVIEW_DATE = "REVIEW_DATE";
- /**
- * 发药时间
- */
+ /**
+ * 发药时间
+ */
public static final String COL_SEND_DRUG_DATE = "SEND_DRUG_DATE";
- /**
- * 领药时间
- */
+ /**
+ * 领药时间
+ */
public static final String COL_RECEIVE_DRUG_DATE = "RECEIVE_DRUG_DATE";
- /**
- * 结束时间
- */
+ /**
+ * 结束时间
+ */
public static final String COL_FINISH_DATE = "FINISH_DATE";
- /**
- * 需加药量
- */
+ /**
+ * 需加药量
+ */
public static final String COL_NEED_ADD_VALUE = "NEED_ADD_VALUE";
- /**
- * 实际加药量
- */
+ /**
+ * 实际加药量
+ */
public static final String COL_ACTUAL_ADD_VALUE = "ACTUAL_ADD_VALUE";
- /**
- * 加药后理论值
- */
+ /**
+ * 加药后理论值
+ */
public static final String COL_AFTER_ADD_THEORY_VALUE = "AFTER_ADD_THEORY_VALUE";
- /**
- * 结束原因
- */
+ /**
+ * 结束原因
+ */
public static final String COL_FINISH_REASON = "FINISH_REASON";
- /**
- * 审核意见
- */
+ /**
+ * 审核意见
+ */
public static final String COL_REVIEW_OPINION = "REVIEW_OPINION";
- /**
- * 审核状态-[1]:通过;[2]:不通过;
- */
+ /**
+ * 审核状态-[1]:通过;[2]:不通过;
+ */
public static final String COL_REVIEW_PASS = "REVIEW_PASS";
- /**
- * 备注
- */
+ /**
+ * 备注
+ */
public static final String COL_REMARK = "REMARK";
/**
* 撤回原因
@@ -239,257 +239,265 @@ public class LiquidTankTask extends BaseEntity {
* 复检填报时间
*/
public static final String COL_REPEAT_FILL_DATE = "REPEAT_FILL_DATE";
+ /**
+ * 临期标记
+ */
+ public static final String COL_FLAG_APPROACH = "FLAG_APPROACH";
+ /**
+ * 超期标记
+ */
+ public static final String COL_FLAG_OUT = "FLAG_OUT";
- /**
- * [槽液检测任务]编码
- */
- @Schema(description = "[槽液检测任务]编码")
- private String code;
- /**
- * 类型
- */
- @Schema(description = "类型")
- private Long liquidTankTaskType;
- /**
- * [作业中心]id
- */
- @Schema(description = "[作业中心]id")
- private Long workCenterId;
- /**
- * [作业槽]id
- */
- @Schema(description = "[作业槽]id")
- private Long workTankId;
- /**
- * [槽液]id
- */
- @Schema(description = "[槽液]id")
- private Long liquidTankId;
- /**
- * [槽液]编号
- */
- @Schema(description = "[槽液]编号")
- private String liquidTankCode;
- /**
- * 化验人[用户]id
- */
- @Schema(description = "化验人[用户]id")
- private Long testUserId;
- /**
- * 复检化验人[用户]id
- */
- @Schema(description = "复检化验人[用户]id")
- private Long repeatTestUserId;
- /**
- * 工艺主管[用户]id
- */
- @Schema(description = "工艺主管[用户]id")
- private Long processUserId;
- /**
- * 审核[用户]id
- */
- @Schema(description = "审核[用户]id")
- private Long reviewUserId;
- /**
- * 发药[用户]id
- */
- @Schema(description = "发药[用户]id")
- private Long sendDrugUserId;
- /**
- * 领药[用户]id
- */
- @Schema(description = "领药[用户]id")
- private Long receiveDrugUserId;
- /**
- * [班组]id
- */
- @Schema(description = "[班组]id")
- private Long teamId;
- /**
- * 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
- */
- @Schema(description = "来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;")
- private Integer fromType;
- /**
- * 名称
- */
- @Schema(description = "名称")
- private String name;
- /**
- * 药品[物料]id
- */
- @Schema(description = "药品[物料]id")
- private Long drugMaterialId;
- /**
- * 药品[物料]编码
- */
- @Schema(description = "药品[物料]编码")
- private String drugMaterialCode;
- /**
- * 药品物料名称
- */
- @Schema(description = "药品物料名称")
- private String drugMaterialName;
- /**
- * 药品名称
- */
- @Schema(description = "药品名称")
- private String drugName;
- /**
- * 药品批次
- */
- @Schema(description = "药品批次")
- private String drugBatCode;
- /**
- * 添加点
- */
- @Schema(description = "添加点")
- private Double fillingLocation;
- /**
- * 目标值
- */
- @Schema(description = "目标值")
- private Double targetValue;
- /**
- * 目标上限
- */
- @Schema(description = "目标上限")
- private Double targetValueMax;
- /**
- * 目标下限
- */
- @Schema(description = "目标下限")
- private Double targetValueMin;
- /**
- * 规范上限
- */
- @Schema(description = "规范上限")
- private Double normValueMax;
- /**
- * 规范下限
- */
- @Schema(description = "规范下限")
- private Double normValueMin;
- /**
- * 体积
- */
- @Schema(description = "体积")
- private Double volume;
- /**
- * 分析周期
- */
- @Schema(description = "分析周期")
- private Integer analysisCycle;
- /**
- * 工艺含量
- */
- @Schema(description = "工艺含量")
- private Double processContent;
- /**
- * 待测成分/分析项目
- */
- @Schema(description = "待测成分/分析项目")
- private String testElement;
- /**
- * 是否合格-[1]:合格;[2]:不合格;
- */
- @Schema(description = "是否合格-[1]:合格;[2]:不合格;")
- private Short qualified;
- /**
- * 实测温度
- */
- @Schema(description = "实测温度")
- private Double temperatureActual;
- /**
- * 实测PH值
- */
- @Schema(description = "实测PH值")
- private Double phActual;
- /**
- * 复测电导率测量值
- */
- @Schema(description = "复测电导率测量值")
- private Double conductivityRepeatTestValue;
- /**
- * 首次电导率测量值
- */
- @Schema(description = "首次电导率测量值")
- private Double conductivityFirstTestValue;
- /**
- * 首次测量值
- */
- @Schema(description = "首次测量值")
- private Double firstTestValue;
- /**
- * 复检测量值
- */
- @Schema(description = "复检测量值")
- private Double repeatTestValue;
- /**
- * 首次化验时间
- */
- @Schema(description = "首次化验时间")
- private LocalDateTime firstTestDate;
- /**
- * 复检化验时间
- */
- @Schema(description = "复检化验时间")
- private LocalDateTime repeatTestDate;
- /**
- * 审核时间
- */
- @Schema(description = "审核时间")
- private LocalDateTime reviewDate;
- /**
- * 发药时间
- */
- @Schema(description = "发药时间")
- private LocalDateTime sendDrugDate;
- /**
- * 领药时间
- */
- @Schema(description = "领药时间")
- private LocalDateTime receiveDrugDate;
- /**
- * 结束时间
- */
- @Schema(description = "结束时间")
- private LocalDateTime finishDate;
- /**
- * 需加药量
- */
- @Schema(description = "需加药量")
- private Double needAddValue;
- /**
- * 实际加药量
- */
- @Schema(description = "实际加药量")
- private Double actualAddValue;
- /**
- * 加药后理论值
- */
- @Schema(description = "加药后理论值")
- private Double afterAddTheoryValue;
- /**
- * 结束原因
- */
- @Schema(description = "结束原因")
- private String finishReason;
- /**
- * 审核意见
- */
- @Schema(description = "审核意见")
- private String reviewOpinion;
- /**
- * 审核状态-[1]:通过;[2]:不通过;
- */
- @Schema(description = "审核状态-[1]:通过;[2]:不通过;")
- private Integer reviewPass;
- /**
- * 备注
- */
- @Schema(description = "备注")
- private String remark;
+ /**
+ * [槽液检测任务]编码
+ */
+ @Schema(description = "[槽液检测任务]编码")
+ private String code;
+ /**
+ * 类型
+ */
+ @Schema(description = "类型")
+ private Long liquidTankTaskType;
+ /**
+ * [作业中心]id
+ */
+ @Schema(description = "[作业中心]id")
+ private Long workCenterId;
+ /**
+ * [作业槽]id
+ */
+ @Schema(description = "[作业槽]id")
+ private Long workTankId;
+ /**
+ * [槽液]id
+ */
+ @Schema(description = "[槽液]id")
+ private Long liquidTankId;
+ /**
+ * [槽液]编号
+ */
+ @Schema(description = "[槽液]编号")
+ private String liquidTankCode;
+ /**
+ * 化验人[用户]id
+ */
+ @Schema(description = "化验人[用户]id")
+ private Long testUserId;
+ /**
+ * 复检化验人[用户]id
+ */
+ @Schema(description = "复检化验人[用户]id")
+ private Long repeatTestUserId;
+ /**
+ * 工艺主管[用户]id
+ */
+ @Schema(description = "工艺主管[用户]id")
+ private Long processUserId;
+ /**
+ * 审核[用户]id
+ */
+ @Schema(description = "审核[用户]id")
+ private Long reviewUserId;
+ /**
+ * 发药[用户]id
+ */
+ @Schema(description = "发药[用户]id")
+ private Long sendDrugUserId;
+ /**
+ * 领药[用户]id
+ */
+ @Schema(description = "领药[用户]id")
+ private Long receiveDrugUserId;
+ /**
+ * [班组]id
+ */
+ @Schema(description = "[班组]id")
+ private Long teamId;
+ /**
+ * 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
+ */
+ @Schema(description = "来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;")
+ private Integer fromType;
+ /**
+ * 名称
+ */
+ @Schema(description = "名称")
+ private String name;
+ /**
+ * 药品[物料]id
+ */
+ @Schema(description = "药品[物料]id")
+ private Long drugMaterialId;
+ /**
+ * 药品[物料]编码
+ */
+ @Schema(description = "药品[物料]编码")
+ private String drugMaterialCode;
+ /**
+ * 药品物料名称
+ */
+ @Schema(description = "药品物料名称")
+ private String drugMaterialName;
+ /**
+ * 药品名称
+ */
+ @Schema(description = "药品名称")
+ private String drugName;
+ /**
+ * 药品批次
+ */
+ @Schema(description = "药品批次")
+ private String drugBatCode;
+ /**
+ * 添加点
+ */
+ @Schema(description = "添加点")
+ private Double fillingLocation;
+ /**
+ * 目标值
+ */
+ @Schema(description = "目标值")
+ private Double targetValue;
+ /**
+ * 目标上限
+ */
+ @Schema(description = "目标上限")
+ private Double targetValueMax;
+ /**
+ * 目标下限
+ */
+ @Schema(description = "目标下限")
+ private Double targetValueMin;
+ /**
+ * 规范上限
+ */
+ @Schema(description = "规范上限")
+ private Double normValueMax;
+ /**
+ * 规范下限
+ */
+ @Schema(description = "规范下限")
+ private Double normValueMin;
+ /**
+ * 体积
+ */
+ @Schema(description = "体积")
+ private Double volume;
+ /**
+ * 分析周期
+ */
+ @Schema(description = "分析周期")
+ private Integer analysisCycle;
+ /**
+ * 工艺含量
+ */
+ @Schema(description = "工艺含量")
+ private Double processContent;
+ /**
+ * 待测成分/分析项目
+ */
+ @Schema(description = "待测成分/分析项目")
+ private String testElement;
+ /**
+ * 是否合格-[1]:合格;[2]:不合格;
+ */
+ @Schema(description = "是否合格-[1]:合格;[2]:不合格;")
+ private Short qualified;
+ /**
+ * 实测温度
+ */
+ @Schema(description = "实测温度")
+ private Double temperatureActual;
+ /**
+ * 实测PH值
+ */
+ @Schema(description = "实测PH值")
+ private Double phActual;
+ /**
+ * 复测电导率测量值
+ */
+ @Schema(description = "复测电导率测量值")
+ private Double conductivityRepeatTestValue;
+ /**
+ * 首次电导率测量值
+ */
+ @Schema(description = "首次电导率测量值")
+ private Double conductivityFirstTestValue;
+ /**
+ * 首次测量值
+ */
+ @Schema(description = "首次测量值")
+ private Double firstTestValue;
+ /**
+ * 复检测量值
+ */
+ @Schema(description = "复检测量值")
+ private Double repeatTestValue;
+ /**
+ * 首次化验时间
+ */
+ @Schema(description = "首次化验时间")
+ private LocalDateTime firstTestDate;
+ /**
+ * 复检化验时间
+ */
+ @Schema(description = "复检化验时间")
+ private LocalDateTime repeatTestDate;
+ /**
+ * 审核时间
+ */
+ @Schema(description = "审核时间")
+ private LocalDateTime reviewDate;
+ /**
+ * 发药时间
+ */
+ @Schema(description = "发药时间")
+ private LocalDateTime sendDrugDate;
+ /**
+ * 领药时间
+ */
+ @Schema(description = "领药时间")
+ private LocalDateTime receiveDrugDate;
+ /**
+ * 结束时间
+ */
+ @Schema(description = "结束时间")
+ private LocalDateTime finishDate;
+ /**
+ * 需加药量
+ */
+ @Schema(description = "需加药量")
+ private Double needAddValue;
+ /**
+ * 实际加药量
+ */
+ @Schema(description = "实际加药量")
+ private Double actualAddValue;
+ /**
+ * 加药后理论值
+ */
+ @Schema(description = "加药后理论值")
+ private Double afterAddTheoryValue;
+ /**
+ * 结束原因
+ */
+ @Schema(description = "结束原因")
+ private String finishReason;
+ /**
+ * 审核意见
+ */
+ @Schema(description = "审核意见")
+ private String reviewOpinion;
+ /**
+ * 审核状态-[1]:通过;[2]:不通过;
+ */
+ @Schema(description = "审核状态-[1]:通过;[2]:不通过;")
+ private Integer reviewPass;
+ /**
+ * 备注
+ */
+ @Schema(description = "备注")
+ private String remark;
/**
* 撤回原因
*/
@@ -505,4 +513,14 @@ public class LiquidTankTask extends BaseEntity {
*/
@Schema(description = "复检填报时间")
private LocalDateTime repeatFillDate;
+ /**
+ * 临期标记
+ */
+ @Schema(description = "临期标记")
+ private Integer flagApproach;
+ /**
+ * 超期标记
+ */
+ @Schema(description = "超期标记")
+ private Integer flagOut;
}
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java
index 92433739..dd8d2fce 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java
@@ -228,6 +228,26 @@ public class LiquidTankTaskCopy extends BaseEntity {
* 备注
*/
public static final String COL_REMARK = "REMARK";
+ /**
+ * 撤回原因
+ */
+ public static final String COL_REVOKE_REASON = "REVOKE_REASON";
+ /**
+ * 首次填报时间
+ */
+ public static final String COL_FIRST_FILL_DATE = "FIRST_FILL_DATE";
+ /**
+ * 复检填报时间
+ */
+ public static final String COL_REPEAT_FILL_DATE = "REPEAT_FILL_DATE";
+ /**
+ * 临期标记
+ */
+ public static final String COL_FLAG_APPROACH = "FLAG_APPROACH";
+ /**
+ * 超期标记
+ */
+ public static final String COL_FLAG_OUT = "FLAG_OUT";
/**
* [槽液检测任务]编码
@@ -479,4 +499,29 @@ public class LiquidTankTaskCopy extends BaseEntity {
*/
@Schema(description = "备注")
private String remark;
+ /**
+ * 撤回原因
+ */
+ @Schema(description = "撤回原因")
+ private String revokeReason;
+ /**
+ * 首次填报时间
+ */
+ @Schema(description = "首次填报时间")
+ private LocalDateTime firstFillDate;
+ /**
+ * 复检填报时间
+ */
+ @Schema(description = "复检填报时间")
+ private LocalDateTime repeatFillDate;
+ /**
+ * 临期标记
+ */
+ @Schema(description = "临期标记")
+ private Integer flagApproach;
+ /**
+ * 超期标记
+ */
+ @Schema(description = "超期标记")
+ private Integer flagOut;
}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml
index 32f8973a..1ba23b79 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml
@@ -34,6 +34,8 @@
+
+