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

委托登记修改

Browse Source
This commit is contained in:
王兴荣
2026-03-30 11:11:29 +08:00
parent a1264669a9
commit bff37a43d4
90 changed files with 4510 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustUnStandardProjectController.java Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -47,7 +47,8 @@ public class SampleEntrustController implements BusinessControllerMarker {
public CommonResult<?> create(@Valid @RequestBody SampleEntrustParam sampleEntrustParam) {
LiteflowResponse response = sampleEntrustService.create(sampleEntrustParam);
if (response.isSuccess()) {
return success(response.getContextBean(SampleEntrustContext.class));
SampleEntrustContext sampleEntrustContext = response.getContextBean(SampleEntrustContext.class);
return success(sampleEntrustContext.getSampleEntrustRegistration());
} else {
return error(1_032_100_000, response.getMessage());
}
@@ -65,7 +66,8 @@ public class SampleEntrustController implements BusinessControllerMarker {
public CommonResult<?> update(@Valid @RequestBody SampleEntrustParam sampleEntrustParam) {
LiteflowResponse response = sampleEntrustService.update(sampleEntrustParam);
if (response.isSuccess()) {
return success(response.getContextBean(SampleEntrustContext.class));
SampleEntrustContext sampleEntrustContext = response.getContextBean(SampleEntrustContext.class);
return success(sampleEntrustContext.getSampleEntrustRegistration());
} else {
return error(1_032_100_000, response.getMessage());
}

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

@@ -31,12 +31,30 @@ public class BusinessSampleEntrustDetailPageReqVO extends PageParam {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "委托样品名称", example = "赵六")
@Schema(description = "批次编号,西南铜的产品批号")
private String entrustBatchCode;
@Schema(description = "委托样品组编号")
private String entrustGroupCode;
@Schema(description = "双杯样标识,针对双杯样标记")
private String entrustDualFlag;
@Schema(description = "委托样品名称", example = "李四")
private String entrustSampleName;
@Schema(description = "委托样品编号")
private String entrustSampleCode;
@Schema(description = "委托样品量")
private String entrustSampleQuantity;
@Schema(description = "委托样品量单位")
private String entrustSampleQuantityUnit;
@Schema(description = "分析级别")
private Integer assayLevel;
@Schema(description = "检测项目")
private String assayProject;

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

@@ -29,12 +29,30 @@ public class BusinessSampleEntrustDetailReqVO {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "委托样品名称", example = "赵六")
@Schema(description = "批次编号,西南铜的产品批号")
private String entrustBatchCode;
@Schema(description = "委托样品组编号")
private String entrustGroupCode;
@Schema(description = "双杯样标识,针对双杯样标记")
private String entrustDualFlag;
@Schema(description = "委托样品名称", example = "李四")
private String entrustSampleName;
@Schema(description = "委托样品编号")
private String entrustSampleCode;
@Schema(description = "委托样品量")
private String entrustSampleQuantity;
@Schema(description = "委托样品量单位")
private String entrustSampleQuantityUnit;
@Schema(description = "分析级别")
private Integer assayLevel;
@Schema(description = "检测项目")
private String assayProject;

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

@@ -40,14 +40,30 @@ public class BusinessSampleEntrustDetailRespVO {
@ExcelProperty("样品编号")
private String sampleCode;
@Schema(description = "委托样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@ExcelProperty("委托样品名称")
@Schema(description = "批次编号,西南铜的产品批号")
private String entrustBatchCode;
@Schema(description = "委托样品组编号")
private String entrustGroupCode;
@Schema(description = "双杯样标识,针对双杯样标记")
private String entrustDualFlag;
@Schema(description = "委托样品名称", example = "李四")
private String entrustSampleName;
@Schema(description = "委托样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("委托样品编号")
@Schema(description = "委托样品编号")
private String entrustSampleCode;
@Schema(description = "委托样品量")
private String entrustSampleQuantity;
@Schema(description = "委托样品量单位")
private String entrustSampleQuantityUnit;
@Schema(description = "分析级别")
private Integer assayLevel;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("检测项目")
private String assayProject;

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

@@ -34,14 +34,30 @@ public class BusinessSampleEntrustDetailSaveReqVO {
@Schema(description = "样品编号")
private String sampleCode;
@Schema(description = "委托样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
@NotEmpty(message = "委托样品名称不能为空")
@Schema(description = "批次编号,西南铜的产品批号")
private String entrustBatchCode;
@Schema(description = "委托样品组编号")
private String entrustGroupCode;
@Schema(description = "双杯样标识,针对双杯样标记")
private String entrustDualFlag;
@Schema(description = "委托样品名称", example = "李四")
private String entrustSampleName;
@Schema(description = "委托样品编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "委托样品编号不能为空")
@Schema(description = "委托样品编号")
private String entrustSampleCode;
@Schema(description = "委托样品量")
private String entrustSampleQuantity;
@Schema(description = "委托样品量单位")
private String entrustSampleQuantityUnit;
@Schema(description = "分析级别")
private Integer assayLevel;
@Schema(description = "检测项目", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "检测项目不能为空")
private String assayProject;

56
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustUnStandardProjectPageReqVO.java Normal file
View File

@@ -0,0 +1,56 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.zt.plat.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 委检登记样品检测项目表(无标准)分页 Request VO")
@Data
public class BusinessSampleEntrustUnStandardProjectPageReqVO extends PageParam {
@Schema(description = "委托登记样品明细ID", example = "6940")
private Long businessSampleEntrustDetailId;
@Schema(description = "分析部门ID", example = "18509")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "赵六")
private String assayDepartmentName;
@Schema(description = "检测任务ID", example = "978")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法配置ID", example = "14672")
private Long configAssayMethodId;
@Schema(description = "检测方法分析项目配置ID", example = "7934")
private Long configAssayMethodProjectId;
@Schema(description = "任务数", example = "15264")
private Integer taskCount;
@Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", example = "17192")
private Long dictionaryProjectId;
@Schema(description = "是否启用,1-启用，0-不启用")
private Integer isEnabled;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "乐观锁", example = "14203")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

71
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustUnStandardProjectRespVO.java Normal file
View File

@@ -0,0 +1,71 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 委检登记样品检测项目表(无标准) Response VO")
@Data
@ExcelIgnoreUnannotated
public class BusinessSampleEntrustUnStandardProjectRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18753")
@ExcelProperty("ID")
private Long id;
@Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6940")
@ExcelProperty("委托登记样品明细ID")
private Long businessSampleEntrustDetailId;
@Schema(description = "分析部门ID", example = "18509")
@ExcelProperty("分析部门ID")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "赵六")
@ExcelProperty("分析部门名称")
private String assayDepartmentName;
@Schema(description = "检测任务ID", example = "978")
@ExcelProperty("检测任务ID")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法配置ID", example = "14672")
@ExcelProperty("检测方法配置ID")
private Long configAssayMethodId;
@Schema(description = "检测方法分析项目配置ID", example = "7934")
@ExcelProperty("检测方法分析项目配置ID")
private Long configAssayMethodProjectId;
@Schema(description = "任务数", example = "15264")
@ExcelProperty("任务数")
private Integer taskCount;
@Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17192")
@ExcelProperty("检测项目ID,字典表：【T_DIC_PRJ】")
private Long dictionaryProjectId;
@Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否启用,1-启用，0-不启用")
private Integer isEnabled;
@Schema(description = "所属部门")
@ExcelProperty("所属部门")
private String systemDepartmentCode;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "14203")
@ExcelProperty("乐观锁")
private Integer updateCount;
@Schema(description = "备注")
@ExcelProperty("备注")
private String remark;
}

55
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleEntrustUnStandardProjectSaveReqVO.java Normal file
View File

@@ -0,0 +1,55 @@
package com.zt.plat.module.qms.business.bus.controller.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 委检登记样品检测项目表(无标准)新增/修改 Request VO")
@Data
public class BusinessSampleEntrustUnStandardProjectSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18753")
private Long id;
@Schema(description = "委托登记样品明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "6940")
@NotNull(message = "委托登记样品明细ID不能为空")
private Long businessSampleEntrustDetailId;
@Schema(description = "分析部门ID", example = "18509")
private Long assayDepartmentId;
@Schema(description = "分析部门名称", example = "赵六")
private String assayDepartmentName;
@Schema(description = "检测任务ID", example = "978")
private Long businessAssayTaskDataId;
@Schema(description = "检测方法配置ID", example = "14672")
private Long configAssayMethodId;
@Schema(description = "检测方法分析项目配置ID", example = "7934")
private Long configAssayMethodProjectId;
@Schema(description = "任务数", example = "15264")
private Integer taskCount;
@Schema(description = "检测项目ID,字典表：【T_DIC_PRJ】", requiredMode = Schema.RequiredMode.REQUIRED, example = "17192")
@NotNull(message = "检测项目ID,字典表：【T_DIC_PRJ】不能为空")
private Long dictionaryProjectId;
@Schema(description = "是否启用,1-启用，0-不启用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否启用,1-启用，0-不启用不能为空")
private Integer isEnabled;
@Schema(description = "所属部门")
private String systemDepartmentCode;
@Schema(description = "乐观锁", requiredMode = Schema.RequiredMode.REQUIRED, example = "14203")
@NotNull(message = "乐观锁不能为空")
private Integer updateCount;
@Schema(description = "备注")
private String remark;
}

30
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSampleEntrustDetailDO.java
View File

@@ -62,6 +62,21 @@ public class BusinessSampleEntrustDetailDO extends BusinessBaseDO {
@TableField("SMP_CD")
private String sampleCode;
/**
* 批次编号,西南铜的产品批号
*/
@TableField("ENTT_BAT_CD")
private String entrustBatchCode;
/**
* 委托样品组编号
*/
@TableField("ENTT_GRP_CD")
private String entrustGroupCode;
/**
* 双杯样标识,针对双杯样标记
*/
@TableField("ENTT_DUAL_FLG")
private String entrustDualFlag;
/**
* 委托样品名称
*/
@TableField("ENTT_SMP_NAME")
@@ -72,6 +87,21 @@ public class BusinessSampleEntrustDetailDO extends BusinessBaseDO {
@TableField("ENTT_SMP_CD")
private String entrustSampleCode;
/**
* 委托样品量
*/
@TableField("ENTT_SMP_QTY")
private String entrustSampleQuantity;
/**
* 委托样品量单位
*/
@TableField("ENTT_SMP_QTY_UNT")
private String entrustSampleQuantityUnit;
/**
* 分析级别
*/
@TableField("ASY_LVL")
private Integer assayLevel;
/**
* 检测项目
*/
@TableField("ASY_PRJ")

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