添加委托来源与类型关系表

zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java

@@ -54,6 +54,7 @@ public interface ErrorCodeConstants {
 	ErrorCode CONFIG_REPORT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表类型配置不存在");
 	ErrorCode CONFIG_PROJECT_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测项目配置不存在");
 	ErrorCode CONFIG_ENTRUST_SOURCE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源配置不存在");
+	ErrorCode CONFIG_ENTRUST_SOURCE_SAMPLE_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "检验委托来源与样品类型配置不存在");
 
 	ErrorCode CONFIG_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_050_000, "主样配置不存在");
 	ErrorCode CONFIG_ASSAY_METHOD_PROJECT_PARAMETER_NOT_EXISTS = new ErrorCode(1_032_050_000, "检测方法分析项目参数配置不存在");

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

@@ -107,6 +107,15 @@ public interface QmsCommonConstant {
     /** 检验委托 **/
     String ENTRUST_INSPECTION = "entrust_inspection";
     
+    /** 委托样品类型： 委检样 **/
+    String ENTRUST_COMMISSION_INSPECTION_SAMPLE = "commissionInspectionSample";
+
+    /** 委托样品类型： 商检分析样 **/
+    String ENTRUST_INSPECTION_ANALYSIS_SAMPLE = "inspectionAnalysisSample";
+
+    /** 委托样品类型： 商检综合 **/
+    String ENTRUST_COMPREHENSIVE_INSPECTION_SAMPLE = "comprehensiveInspectionSample";
+    
     /** 中心收样 **/
     String FLOW_NODE_CENTER_RECEIVE = "flw_center_receive";
     
@@ -179,6 +188,10 @@ public interface QmsCommonConstant {
     /** 检验完成状态-未完成 **/
     String UNCHECKED = "unchecked";
     
+    /** 数据回报状态 未回报 **/
+    String UNRETURNED = "unreturned";
+    
+    
     /** 自动 **/
     String AUTOMATIC = "automatic";
     
@@ -194,4 +207,7 @@ public interface QmsCommonConstant {
 
     /** 允许提交 **/
     String ALLOW_SUBMIT = "allow_submit";
+    
+    
+    
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/BaseSampleController.java

@@ -100,6 +100,13 @@ public class BaseSampleController implements BusinessControllerMarker {
         return success(BeanUtils.toBean(pageResult, BaseSampleRespVO.class));
     }
     
+    @GetMapping("/list")
+    @Operation(summary = "获得样品大类管理列表")
+    public CommonResult<?> getBaseSampleList(BaseSamplePageReqVO reqVO) {
+    	List<BaseSampleRespVO> list = baseSampleService.getBaseSampleList(reqVO);
+    	return success(list);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出样品大类管理 Excel")
     //@PreAuthorize("@ss.hasPermission('qms:base-sample:export')")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/BaseSamplePageReqVO.java

@@ -42,4 +42,9 @@ public class BaseSamplePageReqVO extends PageParam {
     @Schema(description = "检测标准数量")
     private String assayStandardCount;
 
+    @Schema(description = "检验委托来源配置ID", example = "321")
+    private Long configEntrustSourceId;
+
+    @Schema(description = "委托类型,委托登记-entrust_registration、检验委托-entrust_inspection", example = "1")
+    private String entrustType;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigEntrustSourceSampleTypePageReqVO.java

@@ -0,0 +1,35 @@
+package com.zt.plat.module.qms.business.config.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 ConfigEntrustSourceSampleTypePageReqVO extends PageParam {
+
+    @Schema(description = "检验委托来源配置ID", example = "321")
+    private Long configEntrustSourceId;
+
+    @Schema(description = "样品类型_ID,字典表【T_DIC_BSN】样品类型：委检样、商检分析样、商检综合样、西南铜产品", example = "30057")
+    private Long dictionaryBusinessId;
+
+    @Schema(description = "参数分组_Key,字典表【T_DIC_BSN】样品类型")
+    private String dictionaryBusinessKey;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigEntrustSourceSampleTypeRespVO.java

@@ -0,0 +1,43 @@
+package com.zt.plat.module.qms.business.config.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 ConfigEntrustSourceSampleTypeRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2073")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "检验委托来源配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "321")
+    @ExcelProperty("检验委托来源配置ID")
+    private Long configEntrustSourceId;
+
+    @Schema(description = "样品类型_ID,字典表【T_DIC_BSN】样品类型：委检样、商检分析样、商检综合样、西南铜产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "30057")
+    @ExcelProperty("样品类型_ID,字典表【T_DIC_BSN】样品类型：委检样、商检分析样、商检综合样、西南铜产品")
+    private Long dictionaryBusinessId;
+
+    @Schema(description = "参数分组_Key,字典表【T_DIC_BSN】样品类型")
+    @ExcelProperty("参数分组_Key,字典表【T_DIC_BSN】样品类型")
+    private String dictionaryBusinessKey;
+
+    @Schema(description = "所属部门")
+    @ExcelProperty("所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigEntrustSourceSampleTypeSaveReqVO.java

@@ -0,0 +1,32 @@
+package com.zt.plat.module.qms.business.config.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 ConfigEntrustSourceSampleTypeSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2073")
+    private Long id;
+
+    @Schema(description = "检验委托来源配置ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "321")
+    @NotEmpty(message = "检验委托来源配置ID不能为空")
+    private Long configEntrustSourceId;
+
+    @Schema(description = "样品类型_ID,字典表【T_DIC_BSN】样品类型：委检样、商检分析样、商检综合样、西南铜产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "30057")
+    @NotNull(message = "样品类型_ID,字典表【T_DIC_BSN】样品类型：委检样、商检分析样、商检综合样、西南铜产品不能为空")
+    private Long dictionaryBusinessId;
+
+    @Schema(description = "参数分组_Key,字典表【T_DIC_BSN】样品类型")
+    private String dictionaryBusinessKey;
+
+    @Schema(description = "所属部门")
+    private String systemDepartmentCode;
+
+    @Schema(description = "备注")
+    private String remark;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/BaseSampleDO.java

@@ -52,10 +52,15 @@ public class BaseSampleDO extends BusinessBaseDO {
     @TableField("MTRL_NAME")
     private String materialName;
     /**
-    * 样品类型_ID,字典表【T_DIC_BSN】结算样、委检样、抽查样
+    * 样品类型
     */
     @TableField("DIC_BSN_ID")
     private Long dictionaryBusinessId;
+    /**
+     * 样品类型key
+     */
+    @TableField("DIC_BSN_KY")
+    private String dictionaryBusinessKey;
     /**
     * 所属部门
     */