追加 槽液任务字段。

develop-QA
Tom Li 5 months ago
parent 8dc2687dbd
commit 361327219c
  1. 3
      blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskGenerateProcessor.java
  2. 3
      blade-ops/blade-job/src/main/java/org/springblade/job/processor/quality/LquidTankTaskTimeoutProcessor.java
  3. 5
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/feign/ILquidTankTaskClient.java
  4. 418
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java
  5. 302
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/LiquidTankTaskExcel.java
  6. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java
  7. 23
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml
  8. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java
  9. 16
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java
  10. 755
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java
  11. 6
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java
  12. 37
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java

@ -3,7 +3,6 @@ package org.springblade.job.processor.quality;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.desk.quality.feign.ILquidTankTaskClient; import org.springblade.desk.quality.feign.ILquidTankTaskClient;
import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.ProcessResult;
import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.TaskContext;
@ -22,7 +21,7 @@ public class LquidTankTaskGenerateProcessor implements BasicProcessor {
@Override @Override
public ProcessResult process(TaskContext context) throws Exception { public ProcessResult process(TaskContext context) throws Exception {
OmsLogger log = context.getOmsLogger(); OmsLogger log = context.getOmsLogger();
List<LiquidTankTask> list = lquidTankTaskClient.generate(); // List<LiquidTankTask> list = lquidTankTaskClient.generate();
return new ProcessResult(true); return new ProcessResult(true);
} }
} }

@ -4,7 +4,6 @@ import jakarta.annotation.Resource;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.desk.quality.feign.ILquidTankTaskClient; import org.springblade.desk.quality.feign.ILquidTankTaskClient;
import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import tech.powerjob.worker.core.processor.ProcessResult; import tech.powerjob.worker.core.processor.ProcessResult;
import tech.powerjob.worker.core.processor.TaskContext; import tech.powerjob.worker.core.processor.TaskContext;
@ -24,7 +23,7 @@ public class LquidTankTaskTimeoutProcessor implements BasicProcessor {
@Override @Override
public ProcessResult process(TaskContext context) throws Exception { public ProcessResult process(TaskContext context) throws Exception {
OmsLogger log = context.getOmsLogger(); OmsLogger log = context.getOmsLogger();
List<LiquidTankTask> list = lquidTankTaskClient.timeout(); // List<LiquidTankTask> list = lquidTankTaskClient.timeout();
return new ProcessResult(true); return new ProcessResult(true);
} }
} }

@ -1,7 +1,6 @@
package org.springblade.desk.quality.feign; package org.springblade.desk.quality.feign;
import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.launch.constant.AppConstant;
import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -19,8 +18,8 @@ public interface ILquidTankTaskClient {
String TIMEOUT = API_PREFIX + "/timeout"; String TIMEOUT = API_PREFIX + "/timeout";
@GetMapping(GENERATE) @GetMapping(GENERATE)
public List<LiquidTankTask> generate(); public List generate();
@GetMapping(TIMEOUT) @GetMapping(TIMEOUT)
public List<LiquidTankTask> timeout(); public List timeout();
} }

@ -1,418 +0,0 @@
/**
* Author: Tom Shuo
*/
package org.springblade.desk.quality.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.io.Serial;
import java.time.LocalDateTime;
/**
* 实体类
*
* @author Tom Shuo
* @since 2025-12-17
*/
@Data
@TableName("QA_LIQUID_TANK_TASK")
@Schema(description = "LiquidTankTask Entity对象")
@EqualsAndHashCode(callSuper = true)
public class LiquidTankTask extends BaseEntity {
@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
*/
public static final String COL_WORK_CENTER_ID = "WORK_CENTER_ID";
/**
* [作业槽]id
*/
public static final String COL_WORK_TANK_ID = "WORK_TANK_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
*/
public static final String COL_TEST_USER_ID = "TEST_USER_ID";
/**
* 复检化验人[用户]id
*/
public static final String COL_REPEAT_TEST_USER_ID = "REPEAT_TEST_USER_ID";
/**
* 工艺主管[用户]id
*/
public static final String COL_PROCESS_USER_ID = "PROCESS_USER_ID";
/**
* [班组]id
*/
public static final String COL_TEAM_ID = "TEAM_ID";
/**
* 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
*/
public static final String COL_FROM_TYPE = "FROM_TYPE";
/**
* 名称
*/
public static final String COL_NAME = "NAME";
/**
* 药品[物料]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]:不合格;
*/
public static final String COL_QUALIFIED = "QUALIFIED";
/**
* 实测温度
*/
public static final String COL_TEMPERATURE_ACTUAL = "TEMPERATURE_ACTUAL";
/**
* 实测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_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]:不通过;
*/
public static final String COL_REVIEW_PASS = "REVIEW_PASS";
/**
* 备注
*/
public static final String COL_REMARK = "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 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 String 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 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 Short reviewPass;
/**
* 备注
*/
@Schema(description = "备注")
private String remark;
}

@ -20,7 +20,7 @@ import java.time.LocalDateTime;
* [槽液检测任务] Excel实体类 * [槽液检测任务] Excel实体类
* *
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-16 * @since 2025-12-17
*/ */
@Data @Data
@ColumnWidth(25) @ColumnWidth(25)
@ -43,18 +43,6 @@ public class LiquidTankTaskExcel implements Serializable {
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("类型") @ExcelProperty("类型")
private Long liquidTankTaskType; private Long liquidTankTaskType;
/**
* 名称
*/
@ColumnWidth(20)
@ExcelProperty("名称")
private String name;
/**
* [槽液]id
*/
@ColumnWidth(20)
@ExcelProperty("[槽液]id")
private BigDecimal liquidTankId;
/** /**
* [作业中心]id * [作业中心]id
*/ */
@ -62,291 +50,285 @@ public class LiquidTankTaskExcel implements Serializable {
@ExcelProperty("[作业中心]id") @ExcelProperty("[作业中心]id")
private BigDecimal workCenterId; private BigDecimal workCenterId;
/** /**
* 药品[物料]id * [作业槽]id
*/
@ColumnWidth(20)
@ExcelProperty("药品[物料]id")
private BigDecimal drugMaterialId;
/**
* [槽液]编号
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("[槽液]编号") @ExcelProperty("[作业槽]id")
private String liquidTankCode; private BigDecimal workTankId;
/** /**
* 待测成分/分析项目 * [槽液]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("待测成分/分析项目") @ExcelProperty("[槽液]id")
private String testElement; private BigDecimal liquidTankId;
/** /**
* 药品名称 * [槽液]编号
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("药品名称") @ExcelProperty("[槽液]编号")
private String drugName; private String liquidTankCode;
/** /**
* 药品[物料]编码 * 化验人[用户]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("药品[物料]编码") @ExcelProperty("化验人[用户]id")
private String drugMaterialCode; private BigDecimal testUserId;
/** /**
* 药品物料名称 * 复检化验人[用户]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("药品物料名称") @ExcelProperty("复检化验人[用户]id")
private String drugMaterialName; private BigDecimal repeatTestUserId;
/** /**
* 工艺含量 * 工艺主管[用户]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("工艺含量") @ExcelProperty("工艺主管[用户]id")
private String processContent; private BigDecimal processUserId;
/** /**
* 目标值 * 审核[用户]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("目标值") @ExcelProperty("审核[用户]id")
private BigDecimal targetValue; private BigDecimal reviewUserId;
/** /**
* 目标上下限 * 发药[用户]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("目标上下限") @ExcelProperty("发药[用户]id")
private String bound; private BigDecimal sendDrugUserId;
/** /**
* 排序 * 领药[用户]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("排序") @ExcelProperty("领药[用户]id")
private Long sort; private BigDecimal receiveDrugUserId;
/** /**
* 备注 * [班组]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("备注") @ExcelProperty("[班组]id")
private String remark; private BigDecimal teamId;
/** /**
* 添加点 * 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("添加点") @ExcelProperty("来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;")
private BigDecimal fillingLocation; private Long fromType;
/** /**
* 电导率测量值 * 名称
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("电导率测量值") @ExcelProperty("名称")
private BigDecimal conductivityTestValue; private String name;
/** /**
* 体积 * 药品[物料]id
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("体积") @ExcelProperty("药品[物料]id")
private BigDecimal volume; private BigDecimal drugMaterialId;
/** /**
* 单位 * 药品[物料]编码
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("单位") @ExcelProperty("药品[物料]编码")
private BigDecimal unit; private String drugMaterialCode;
/** /**
* [计量单位]id * 药品物料名称
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("[计量单位]id") @ExcelProperty("药品物料名称")
private BigDecimal unitId; private String drugMaterialName;
/** /**
* 加药量单位 * 药品名称
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("加药量单位") @ExcelProperty("药品名称")
private String addUnit; private String drugName;
/** /**
* 加药量[计量单位]id * 药品批次
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("加药量[计量单位]id") @ExcelProperty("药品批次")
private BigDecimal addUnitId; private String drugBatCode;
/** /**
* 分析周期 * 添加点
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("分析周期") @ExcelProperty("添加点")
private Integer analysisCycle; private BigDecimal fillingLocation;
/** /**
* 有效期 * 目标值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("有效期") @ExcelProperty("目标值")
private LocalDateTime validDate; private BigDecimal targetValue;
/** /**
* 上次化验日期 * 目标上限
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("上次化验日期") @ExcelProperty("目标上限")
private LocalDateTime lastTest; private BigDecimal targetValueMax;
/** /**
* 槽液到期日期 * 目标下限
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("槽液到期日期") @ExcelProperty("目标下限")
private LocalDateTime expiryDate; private BigDecimal targetValueMin;
/** /**
* 化验人[用户]id * 规范上限
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("化验人[用户]id") @ExcelProperty("规范上限")
private BigDecimal testUserId; private BigDecimal normValueMax;
/** /**
* 工艺主管[用户]id * 规范下限
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("工艺主管[用户]id") @ExcelProperty("规范下限")
private BigDecimal processUserId; private BigDecimal normValueMin;
/** /**
* 测量值(单位) * 体积
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("测量值(单位)") @ExcelProperty("体积")
private BigDecimal testValue; private BigDecimal volume;
/** /**
* 需添加量(单位) * 分析周期
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("需添加量(单位)") @ExcelProperty("分析周期")
private BigDecimal needAddValue; private Integer analysisCycle;
/** /**
* 实际添加量(单位) * 工艺含量
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("实际添加量(单位)") @ExcelProperty("工艺含量")
private BigDecimal actualAddValue; private BigDecimal processContent;
/** /**
* 加药后理论值 * 待测成分/分析项目
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("加药后理论值") @ExcelProperty("待测成分/分析项目")
private BigDecimal afterAddValue; private String testElement;
/** /**
* [班组]id * 是否合格-[1]:合格;[2]:不合格;
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("[班组]id") @ExcelProperty("是否合格-[1]:合格;[2]:不合格;")
private BigDecimal teamId; private Short qualified;
/** /**
* 参数录入时间 * 实测温度
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("参数录入时间") @ExcelProperty("实测温度")
private LocalDateTime entryDate; private BigDecimal temperatureActual;
/** /**
* 确认时间 * 实测PH值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("确认时间") @ExcelProperty("实测PH值")
private LocalDateTime confirmDate; private BigDecimal phActual;
/** /**
* 送出[用户]id * 复测电导率测量值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("送出[用户]id") @ExcelProperty("复测电导率测量值")
private BigDecimal sendUserId; private BigDecimal conductivityRepeatTestValue;
/** /**
* 送出时间 * 首次电导率测量值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("送出时间") @ExcelProperty("首次电导率测量值")
private LocalDateTime sendDate; private BigDecimal conductivityFirstTestValue;
/** /**
* 接收[用户]id * 首次测量值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("接收[用户]id") @ExcelProperty("首次测量值")
private BigDecimal receiveUserId; private BigDecimal firstTestValue;
/** /**
* 接收时间 * 复检测量值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("接收时间") @ExcelProperty("复检测量值")
private LocalDateTime receiveDate; private BigDecimal repeatTestValue;
/** /**
* 处理[用户]id * 首次化验时间
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("处理[用户]id") @ExcelProperty("首次化验时间")
private BigDecimal handleUserId; private LocalDateTime firstTestDate;
/** /**
* 处理时间 * 复检化验时间
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("处理时间") @ExcelProperty("复检化验时间")
private LocalDateTime handleDate; private LocalDateTime repeatTestDate;
/** /**
* 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成; * 审核时间
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;") @ExcelProperty("审核时间")
private Long fromType; private LocalDateTime reviewDate;
/** /**
* 结束原因 * 发药时间
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("结束原因") @ExcelProperty("发药时间")
private String finishReason; private LocalDateTime sendDrugDate;
/** /**
* 规范上限 * 领药时间
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("规范上限") @ExcelProperty("领药时间")
private BigDecimal normValueMax; private LocalDateTime receiveDrugDate;
/** /**
* 规范下限 * 结束时间
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("规范下限") @ExcelProperty("结束时间")
private BigDecimal normValueMin; private LocalDateTime finishDate;
/** /**
* 实测温度 * 需加药量
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("实测温度") @ExcelProperty("需加药量")
private BigDecimal temperatureActual; private BigDecimal needAddValue;
/** /**
* 测ph值 * 际加药量
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("实测ph值") @ExcelProperty("实际加药量")
private BigDecimal phActual; private BigDecimal actualAddValue;
/** /**
* 复测测量值(单位) * 加药后理论值
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("复测测量值(单位)") @ExcelProperty("加药后理论值")
private BigDecimal test2ndValue; private BigDecimal afterAddTheoryValue;
/** /**
* 复测电导率测量值 * 结束原因
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("复测电导率测量值") @ExcelProperty("结束原因")
private BigDecimal conductivityTest2ndValue; private String finishReason;
/** /**
* [作业槽]id * 审核意见
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("[作业槽]id") @ExcelProperty("审核意见")
private BigDecimal workTankId; private String reviewOpinion;
/** /**
* 目标上限 * 审核状态-[1]:通过;[2]:不通过;
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("目标上限") @ExcelProperty("审核状态-[1]:通过;[2]:不通过;")
private BigDecimal targetValueMax; private Short reviewPass;
/** /**
* 目标下限 * 备注
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("目标下限") @ExcelProperty("备注")
private BigDecimal targetValueMin; private String remark;
} }

@ -14,7 +14,7 @@ import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
import java.util.List; import java.util.List;
/** /**
* Mapper 接口 * [槽液检测任务] Mapper 接口
* *
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-17 * @since 2025-12-17

@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.desk.quality.mapper.LiquidTankTaskMapper"> <mapper namespace="org.springblade.desk.quality.mapper.LiquidTankTaskMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="liquidTankTaskResultMap" <resultMap id="liquidTankTaskResultMap" type="org.springblade.desk.quality.pojo.entity.LiquidTankTask">
type="org.springblade.desk.quality.pojo.entity.LiquidTankTask">
<result column="CODE" property="code"/> <result column="CODE" property="code"/>
<result column="LIQUID_TANK_TASK_TYPE" property="liquidTankTaskType"/> <result column="LIQUID_TANK_TASK_TYPE" property="liquidTankTaskType"/>
<result column="WORK_CENTER_ID" property="workCenterId"/> <result column="WORK_CENTER_ID" property="workCenterId"/>
@ -15,6 +13,9 @@
<result column="TEST_USER_ID" property="testUserId"/> <result column="TEST_USER_ID" property="testUserId"/>
<result column="REPEAT_TEST_USER_ID" property="repeatTestUserId"/> <result column="REPEAT_TEST_USER_ID" property="repeatTestUserId"/>
<result column="PROCESS_USER_ID" property="processUserId"/> <result column="PROCESS_USER_ID" property="processUserId"/>
<result column="REVIEW_USER_ID" property="reviewUserId"/>
<result column="SEND_DRUG_USER_ID" property="sendDrugUserId"/>
<result column="RECEIVE_DRUG_USER_ID" property="receiveDrugUserId"/>
<result column="TEAM_ID" property="teamId"/> <result column="TEAM_ID" property="teamId"/>
<result column="FROM_TYPE" property="fromType"/> <result column="FROM_TYPE" property="fromType"/>
<result column="NAME" property="name"/> <result column="NAME" property="name"/>
@ -42,6 +43,10 @@
<result column="REPEAT_TEST_VALUE" property="repeatTestValue"/> <result column="REPEAT_TEST_VALUE" property="repeatTestValue"/>
<result column="FIRST_TEST_DATE" property="firstTestDate"/> <result column="FIRST_TEST_DATE" property="firstTestDate"/>
<result column="REPEAT_TEST_DATE" property="repeatTestDate"/> <result column="REPEAT_TEST_DATE" property="repeatTestDate"/>
<result column="REVIEW_DATE" property="reviewDate"/>
<result column="SEND_DRUG_DATE" property="sendDrugDate"/>
<result column="RECEIVE_DRUG_DATE" property="receiveDrugDate"/>
<result column="FINISH_DATE" property="finishDate"/>
<result column="NEED_ADD_VALUE" property="needAddValue"/> <result column="NEED_ADD_VALUE" property="needAddValue"/>
<result column="ACTUAL_ADD_VALUE" property="actualAddValue"/> <result column="ACTUAL_ADD_VALUE" property="actualAddValue"/>
<result column="AFTER_ADD_THEORY_VALUE" property="afterAddTheoryValue"/> <result column="AFTER_ADD_THEORY_VALUE" property="afterAddTheoryValue"/>
@ -52,14 +57,10 @@
</resultMap> </resultMap>
<select id="selectLiquidTankTaskPage" resultMap="liquidTankTaskResultMap"> <select id="selectLiquidTankTaskPage" resultMap="liquidTankTaskResultMap">
SELECT * SELECT * FROM QA_LIQUID_TANK_TASK WHERE is_deleted = 0
FROM QA_LIQUID_TANK_TASK
WHERE is_deleted = 0
</select> </select>
<select id="exportLiquidTankTask" <select id="exportLiquidTankTask" resultType="org.springblade.desk.quality.excel.LiquidTankTaskExcel">
resultType="org.springblade.desk.quality.excel.LiquidTankTaskExcel"> SELECT * FROM QA_LIQUID_TANK_TASK ${ew.customSqlSegment}
SELECT *
FROM QA_LIQUID_TANK_TASK ${ew.customSqlSegment}
</select> </select>
</mapper> </mapper>

@ -10,7 +10,7 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask;
import java.io.Serial; import java.io.Serial;
/** /**
* 数据传输对象实体类 * [槽液检测任务] 数据传输对象实体类
* *
* @author Tom Shuo * @author Tom Shuo
* @since 2025-12-17 * @since 2025-12-17

@ -307,7 +307,7 @@ public class LiquidTank extends BaseEntity {
* 工艺含量 * 工艺含量
*/ */
@Schema(description = "工艺含量") @Schema(description = "工艺含量")
private Long processContent; private Double processContent;
/** /**
* 待测成分 * 待测成分
*/ */
@ -322,7 +322,7 @@ public class LiquidTank extends BaseEntity {
* 体积 * 体积
*/ */
@Schema(description = "体积") @Schema(description = "体积")
private Long volume; private Double volume;
/** /**
* 分析周期 * 分析周期
*/ */
@ -337,32 +337,32 @@ public class LiquidTank extends BaseEntity {
* 添加点 * 添加点
*/ */
@Schema(description = "添加点") @Schema(description = "添加点")
private Long fillingLocation; private Double fillingLocation;
/** /**
* 目标值 * 目标值
*/ */
@Schema(description = "目标值") @Schema(description = "目标值")
private Long targetValue; private Double targetValue;
/** /**
* 目标上限 * 目标上限
*/ */
@Schema(description = "目标上限") @Schema(description = "目标上限")
private Long targetValueMax; private Double targetValueMax;
/** /**
* 目标下限 * 目标下限
*/ */
@Schema(description = "目标下限") @Schema(description = "目标下限")
private Long targetValueMin; private Double targetValueMin;
/** /**
* 规范上限 * 规范上限
*/ */
@Schema(description = "规范上限") @Schema(description = "规范上限")
private Long normValueMax; private Double normValueMax;
/** /**
* 规范下限 * 规范下限
*/ */
@Schema(description = "规范下限") @Schema(description = "规范下限")
private Long normValueMin; private Double normValueMin;
/** /**
* 有效期 * 有效期
*/ */

@ -24,395 +24,458 @@ import java.time.LocalDateTime;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class LiquidTankTask extends BaseEntity { public class LiquidTankTask extends BaseEntity {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* [槽液检测任务]编码 * [槽液检测任务]编码
*/ */
public static final String COL_CODE = "CODE"; public static final String COL_CODE = "CODE";
/** /**
* 类型 * 类型
*/ */
public static final String COL_LIQUID_TANK_TASK_TYPE = "LIQUID_TANK_TASK_TYPE"; 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"; public static final String COL_WORK_CENTER_ID = "WORK_CENTER_ID";
/** /**
* [作业槽]id * [作业槽]id
*/ */
public static final String COL_WORK_TANK_ID = "WORK_TANK_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_ID = "LIQUID_TANK_ID";
/** /**
* [槽液]编号 * [槽液]编号
*/ */
public static final String COL_LIQUID_TANK_CODE = "LIQUID_TANK_CODE"; public static final String COL_LIQUID_TANK_CODE = "LIQUID_TANK_CODE";
/** /**
* 化验人[用户]id * 化验人[用户]id
*/ */
public static final String COL_TEST_USER_ID = "TEST_USER_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"; 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"; 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
*/
public static final String COL_SEND_DRUG_USER_ID = "SEND_DRUG_USER_ID";
/**
* 领药[用户]id
*/
public static final String COL_RECEIVE_DRUG_USER_ID = "RECEIVE_DRUG_USER_ID";
/**
* [班组]id
*/
public static final String COL_TEAM_ID = "TEAM_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_FROM_TYPE = "FROM_TYPE";
/** /**
* 名称 * 名称
*/ */
public static final String COL_NAME = "NAME"; 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_ID = "DRUG_MATERIAL_ID";
/** /**
* 药品[物料]编码 * 药品[物料]编码
*/ */
public static final String COL_DRUG_MATERIAL_CODE = "DRUG_MATERIAL_CODE"; 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_MATERIAL_NAME = "DRUG_MATERIAL_NAME";
/** /**
* 药品名称 * 药品名称
*/ */
public static final String COL_DRUG_NAME = "DRUG_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_DRUG_BAT_CODE = "DRUG_BAT_CODE";
/** /**
* 添加点 * 添加点
*/ */
public static final String COL_FILLING_LOCATION = "FILLING_LOCATION"; 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 = "TARGET_VALUE";
/** /**
* 目标上限 * 目标上限
*/ */
public static final String COL_TARGET_VALUE_MAX = "TARGET_VALUE_MAX"; 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_TARGET_VALUE_MIN = "TARGET_VALUE_MIN";
/** /**
* 规范上限 * 规范上限
*/ */
public static final String COL_NORM_VALUE_MAX = "NORM_VALUE_MAX"; 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_NORM_VALUE_MIN = "NORM_VALUE_MIN";
/** /**
* 体积 * 体积
*/ */
public static final String COL_VOLUME = "VOLUME"; public static final String COL_VOLUME = "VOLUME";
/** /**
* 分析周期 * 分析周期
*/ */
public static final String COL_ANALYSIS_CYCLE = "ANALYSIS_CYCLE"; public static final String COL_ANALYSIS_CYCLE = "ANALYSIS_CYCLE";
/** /**
* 工艺含量 * 工艺含量
*/ */
public static final String COL_PROCESS_CONTENT = "PROCESS_CONTENT"; public static final String COL_PROCESS_CONTENT = "PROCESS_CONTENT";
/** /**
* 待测成分/分析项目 * 待测成分/分析项目
*/ */
public static final String COL_TEST_ELEMENT = "TEST_ELEMENT"; 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_QUALIFIED = "QUALIFIED";
/** /**
* 实测温度 * 实测温度
*/ */
public static final String COL_TEMPERATURE_ACTUAL = "TEMPERATURE_ACTUAL"; 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_PH_ACTUAL = "PH_ACTUAL";
/** /**
* 复测电导率测量值 * 复测电导率测量值
*/ */
public static final String COL_CONDUCTIVITY_REPEAT_TEST_VALUE = "CONDUCTIVITY_REPEAT_TEST_VALUE"; 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_CONDUCTIVITY_FIRST_TEST_VALUE = "CONDUCTIVITY_FIRST_TEST_VALUE";
/** /**
* 首次测量值 * 首次测量值
*/ */
public static final String COL_FIRST_TEST_VALUE = "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_REPEAT_TEST_VALUE = "REPEAT_TEST_VALUE";
/** /**
* 首次化验时间 * 首次化验时间
*/ */
public static final String COL_FIRST_TEST_DATE = "FIRST_TEST_DATE"; 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_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_NEED_ADD_VALUE = "NEED_ADD_VALUE";
/** /**
* 实际加药量 * 实际加药量
*/ */
public static final String COL_ACTUAL_ADD_VALUE = "ACTUAL_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_AFTER_ADD_THEORY_VALUE = "AFTER_ADD_THEORY_VALUE";
/** /**
* 结束原因 * 结束原因
*/ */
public static final String COL_FINISH_REASON = "FINISH_REASON"; public static final String COL_FINISH_REASON = "FINISH_REASON";
/** /**
* 审核意见 * 审核意见
*/ */
public static final String COL_REVIEW_OPINION = "REVIEW_OPINION"; 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_REVIEW_PASS = "REVIEW_PASS";
/** /**
* 备注 * 备注
*/ */
public static final String COL_REMARK = "REMARK"; public static final String COL_REMARK = "REMARK";
/** /**
* [槽液检测任务]编码 * [槽液检测任务]编码
*/ */
@Schema(description = "[槽液检测任务]编码") @Schema(description = "[槽液检测任务]编码")
private String code; private String code;
/** /**
* 类型 * 类型
*/ */
@Schema(description = "类型") @Schema(description = "类型")
private Long liquidTankTaskType; private Long liquidTankTaskType;
/** /**
* [作业中心]id * [作业中心]id
*/ */
@Schema(description = "[作业中心]id") @Schema(description = "[作业中心]id")
private Long workCenterId; private Long workCenterId;
/** /**
* [作业槽]id * [作业槽]id
*/ */
@Schema(description = "[作业槽]id") @Schema(description = "[作业槽]id")
private Long workTankId; private Long workTankId;
/** /**
* [槽液]id * [槽液]id
*/ */
@Schema(description = "[槽液]id") @Schema(description = "[槽液]id")
private Long liquidTankId; private Long liquidTankId;
/** /**
* [槽液]编号 * [槽液]编号
*/ */
@Schema(description = "[槽液]编号") @Schema(description = "[槽液]编号")
private String liquidTankCode; private String liquidTankCode;
/** /**
* 化验人[用户]id * 化验人[用户]id
*/ */
@Schema(description = "化验人[用户]id") @Schema(description = "化验人[用户]id")
private Long testUserId; private Long testUserId;
/** /**
* 复检化验人[用户]id * 复检化验人[用户]id
*/ */
@Schema(description = "复检化验人[用户]id") @Schema(description = "复检化验人[用户]id")
private Long repeatTestUserId; private Long repeatTestUserId;
/** /**
* 工艺主管[用户]id * 工艺主管[用户]id
*/ */
@Schema(description = "工艺主管[用户]id") @Schema(description = "工艺主管[用户]id")
private Long processUserId; private Long processUserId;
/** /**
* [班组]id * 审核[用户]id
*/ */
@Schema(description = "[班组]id") @Schema(description = "审核[用户]id")
private Long teamId; private Long reviewUserId;
/** /**
* 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成; * 发药[用户]id
*/ */
@Schema(description = "来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;") @Schema(description = "发药[用户]id")
private Integer fromType; private Long sendDrugUserId;
/** /**
* 名称 * 领药[用户]id
*/ */
@Schema(description = "名称") @Schema(description = "领药[用户]id")
private String name; private Long receiveDrugUserId;
/** /**
* 药品[物料]id * [班组]id
*/ */
@Schema(description = "药品[物料]id") @Schema(description = "[班组]id")
private Long drugMaterialId; private Long teamId;
/** /**
* 药品[物料]编码 * 来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;
*/ */
@Schema(description = "药品[物料]编码") @Schema(description = "来源类型-[1]:手动;[2]:周期自动生成;[3]:计算自动生成;")
private String drugMaterialCode; private Integer fromType;
/** /**
* 药品物料名称 * 名称
*/ */
@Schema(description = "药品物料名称") @Schema(description = "名称")
private String drugMaterialName; private String name;
/** /**
* 药品名称 * 药品[物料]id
*/ */
@Schema(description = "药品名称") @Schema(description = "药品[物料]id")
private String drugName; private Long drugMaterialId;
/** /**
* 药品批次 * 药品[物料]编码
*/ */
@Schema(description = "药品批次") @Schema(description = "药品[物料]编码")
private String drugBatCode; private String drugMaterialCode;
/** /**
* 添加点 * 药品物料名称
*/ */
@Schema(description = "添加点") @Schema(description = "药品物料名称")
private Double fillingLocation; private String drugMaterialName;
/** /**
* 目标值 * 药品名称
*/ */
@Schema(description = "目标值") @Schema(description = "药品名称")
private Double targetValue; private String drugName;
/** /**
* 目标上限 * 药品批次
*/ */
@Schema(description = "目标上限") @Schema(description = "药品批次")
private Double targetValueMax; private String drugBatCode;
/** /**
* 目标下限 * 添加点
*/ */
@Schema(description = "目标下限") @Schema(description = "添加点")
private Double targetValueMin; private Double fillingLocation;
/** /**
* 规范上限 * 目标值
*/ */
@Schema(description = "规范上限") @Schema(description = "目标值")
private Double normValueMax; private Double targetValue;
/** /**
* 规范下限 * 目标上限
*/ */
@Schema(description = "规范下限") @Schema(description = "目标上限")
private Double normValueMin; private Double targetValueMax;
/** /**
* 体积 * 目标下限
*/ */
@Schema(description = "体积") @Schema(description = "目标下限")
private Double volume; private Double targetValueMin;
/** /**
* 分析周期 * 规范上限
*/ */
@Schema(description = "分析周期") @Schema(description = "规范上限")
private Integer analysisCycle; private Double normValueMax;
/** /**
* 工艺含量 * 规范下限
*/ */
@Schema(description = "工艺含量") @Schema(description = "规范下限")
private Double processContent; private Double normValueMin;
/** /**
* 待测成分/分析项目 * 体积
*/ */
@Schema(description = "待测成分/分析项目") @Schema(description = "体积")
private String testElement; private Double volume;
/** /**
* 是否合格-[1]:合格;[2]:不合格; * 分析周期
*/ */
@Schema(description = "是否合格-[1]:合格;[2]:不合格;") @Schema(description = "分析周期")
private Integer qualified; private Integer analysisCycle;
/** /**
* 实测温度 * 工艺含量
*/ */
@Schema(description = "实测温度") @Schema(description = "工艺含量")
private Double temperatureActual; private Double processContent;
/** /**
* 实测PH值 * 待测成分/分析项目
*/ */
@Schema(description = "实测PH值") @Schema(description = "待测成分/分析项目")
private Double phActual; private String testElement;
/** /**
* 复测电导率测量值 * 是否合格-[1]:合格;[2]:不合格;
*/ */
@Schema(description = "复测电导率测量值") @Schema(description = "是否合格-[1]:合格;[2]:不合格;")
private Double conductivityRepeatTestValue; private Short qualified;
/** /**
* 首次电导率测量值 * 实测温度
*/ */
@Schema(description = "首次电导率测量值") @Schema(description = "实测温度")
private Double conductivityFirstTestValue; private Double temperatureActual;
/** /**
* 首次测量值 * 实测PH值
*/ */
@Schema(description = "首次测量值") @Schema(description = "实测PH值")
private Double firstTestValue; private Double phActual;
/** /**
* 复检测量值 * 复测电导率测量值
*/ */
@Schema(description = "复检测量值") @Schema(description = "复测电导率测量值")
private Double repeatTestValue; private Double conductivityRepeatTestValue;
/** /**
* 首次化验时间 * 首次电导率测量值
*/ */
@Schema(description = "首次化验时间") @Schema(description = "首次电导率测量值")
private LocalDateTime firstTestDate; private Double conductivityFirstTestValue;
/** /**
* 复检化验时间 * 首次测量值
*/ */
@Schema(description = "复检化验时间") @Schema(description = "首次测量值")
private LocalDateTime repeatTestDate; private Double firstTestValue;
/** /**
* 需加药量 * 复检测量值
*/ */
@Schema(description = "需加药量") @Schema(description = "复检测量值")
private Double needAddValue; private Double repeatTestValue;
/** /**
* 实际加药量 * 首次化验时间
*/ */
@Schema(description = "实际加药量") @Schema(description = "首次化验时间")
private Double actualAddValue; private LocalDateTime firstTestDate;
/** /**
* 加药后理论值 * 复检化验时间
*/ */
@Schema(description = "加药后理论值") @Schema(description = "复检化验时间")
private Double afterAddTheoryValue; private LocalDateTime repeatTestDate;
/** /**
* 结束原因 * 审核时间
*/ */
@Schema(description = "结束原因") @Schema(description = "审核时间")
private String finishReason; private LocalDateTime reviewDate;
/** /**
* 审核意见 * 发药时间
*/ */
@Schema(description = "审核意见") @Schema(description = "发药时间")
private String reviewOpinion; private LocalDateTime sendDrugDate;
/** /**
* 审核状态-[1]:通过;[2]:不通过; * 领药时间
*/ */
@Schema(description = "审核状态-[1]:通过;[2]:不通过;") @Schema(description = "领药时间")
private Integer reviewPass; private LocalDateTime receiveDrugDate;
/** /**
* 备注 * 结束时间
*/ */
@Schema(description = "备注") @Schema(description = "结束时间")
private String remark; 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;
} }

@ -42,6 +42,12 @@ public class LiquidTankTaskVO extends LiquidTankTask {
*/ */
@Schema(description = "工艺主管[用户]名称") @Schema(description = "工艺主管[用户]名称")
private String processUserRealName; private String processUserRealName;
@Schema(description = "审核[用户]名称")
private String reviewUserRealName;
@Schema(description = "发药[用户]名称")
private String sendDurgUserRealName;
@Schema(description = "收药[用户]名称")
private String receiveDurgUserRealName;
/** /**
* *
*/ */

@ -319,14 +319,29 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
private LiquidTankTask buildLiquidTankTask(LiquidTank lt, Integer fromType, Long testUserId) { private LiquidTankTask buildLiquidTankTask(LiquidTank lt, Integer fromType, Long testUserId) {
LiquidTankTask task = new LiquidTankTask(); LiquidTankTask task = new LiquidTankTask();
// copy字段 // copy字段
BeanUtils.copyProperties(lt, task); {
// id null 新增 // id null 新增
task.setId(null); task.setId(null);
task.setLiquidTankId(lt.getId()); task.setWorkCenterId(lt.getWorkCenterId());
task.setLiquidTankId(lt.getId());
task.setTestElement(lt.getTestElement());
task.setProcessContent(lt.getProcessContent());
task.setTargetValue(lt.getTargetValue());
task.setTargetValueMax(lt.getTargetValueMax());
task.setTargetValueMin(lt.getTargetValueMin());
task.setNormValueMax(lt.getNormValueMax());
task.setNormValueMin(lt.getNormValueMin());
task.setVolume(lt.getVolume());
task.setDrugName(lt.getDrugName());
task.setDrugMaterialCode(lt.getDrugMaterialCode());
task.setDrugMaterialName(lt.getDrugMaterialName());
task.setFillingLocation(lt.getFillingLocation());
task.setAnalysisCycle(lt.getAnalysisCycle());
task.setTestElement(lt.getTestElement());
}
task.setName(""); task.setName("");
task.setCode("" + System.currentTimeMillis()); task.setCode("" + System.currentTimeMillis());
task.setRemark(""); task.setRemark("");
task.setTeamId(lt.getTeamId());
// 设置人员相关 // 设置人员相关
// 设置检测员 // 设置检测员
// 复检默认是同一个检测员。 // 复检默认是同一个检测员。
@ -339,6 +354,7 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
} }
// 设置工艺主管 // 设置工艺主管
task.setProcessUserId(lt.getProcessUserId()); task.setProcessUserId(lt.getProcessUserId());
task.setTeamId(lt.getTeamId());
// //
// from type // from type
task.setFromType(fromType); task.setFromType(fromType);
@ -350,20 +366,21 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
} else { } else {
task.setStatus(LiquidTankTaskConst.S_NOT_READY); task.setStatus(LiquidTankTaskConst.S_NOT_READY);
} }
// 通用字段
task.setCreateUser(AuthUtil.getUserId());
task.setCreateTime(new Date());
task.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
return task; return task;
} }
public Boolean basicAddOne(LiquidTankTask task) {
return save(task);
}
/** /**
* 变更状态,并保存LiquidTankTaskHi记录. * 变更状态,并保存LiquidTankTaskHi记录.
* *
* @param id * @param id
* @param newStatus * @param newStatus
*/ */
private void changeStatus(Long id, Integer newStatus) { public void changeStatus(Long id, Integer newStatus) {
LiquidTankTaskHi add = new LiquidTankTaskHi(); LiquidTankTaskHi add = new LiquidTankTaskHi();
LiquidTankTask task = getById(id); LiquidTankTask task = getById(id);
if (!Objects.isNull(task)) { if (!Objects.isNull(task)) {

Loading…
Cancel
Save