处理样品数量及检测项目

.gitattributes

@@ -0,0 +1,22 @@
+# 图片
+*.jpg binary
+*.jpeg binary
+*.png binary
+*.gif binary
+*.bmp binary
+*.webp binary
+
+# 文档/压缩包
+*.pdf binary
+*.doc binary
+*.docx binary
+*.zip binary
+*.rar binary
+*.7z binary
+
+# 其他二进制格式
+*.exe binary
+*.dll binary
+*.so binary
+*.jar binary
+*.class binary

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

@@ -96,6 +96,7 @@ public interface ErrorCodeConstants {
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_REGISTRATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记样品明细不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检样品检测项目业务不存在");
+	ErrorCode BUSINESS_SAMPLE_ENTRUST_UN_STANDARD_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记样品检测项目表(无标准)不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_DEPARTMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记分析部门业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_FILE_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记附件业务不存在");
 	ErrorCode BUSINESS_SAMPLE_ENTRUST_DEPARTMENT_DETAIL_NOT_EXISTS = new ErrorCode(1_032_100_000, "委检登记分析部门样品明细不存在");
@@ -147,6 +148,7 @@ public interface ErrorCodeConstants {
 	ErrorCode OTHER_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统样品大类对应不存在");
 	ErrorCode OTHER_DICTIONARY_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统检测项目字典对应不存在");
 	ErrorCode OTHER_SYSTEM_USER_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统用户信息对应不存在");
+	ErrorCode OTHER_DICTIONARY_BUSINESS_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统与业务字典对应不存在");
 	
 
 	//检测报告
@@ -192,6 +194,7 @@ public interface ErrorCodeConstants {
 	ErrorCode MATERIAL_PRODUCTS_EXISTS_CATEGORY = new ErrorCode(1_032_160_000, "物料大类列表中存在分类数据");
 	ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程明细不存在");
 	ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料通用流程不存在");
+	ErrorCode MATERIAL_CORRELATION_ASSAY_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料检化验关联信息不存在");
 
 	ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次不存在");
 	ErrorCode MATERIAL_BATCH_GONG_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次工段不存在");

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

@@ -215,12 +215,48 @@ public interface QmsCommonConstant {
     /** 委检登记附件类型：商检部门分析报告 **/
     String ENTRUST_ATTACHMENT_CATEGORY_DEPT_DOC = "entrust_dept_doc_upload";
     
+    /** 委托来源 检验委托 **/
+    String  ENTRUST_SOURCE_JYWT = "jywt";
+    
+    /** 委托来源西南铜 原料 **/
+    String ENTRUST_SOURCE_XNT_RAW_MATERIAL = "xntyl";
+    
+    /** 委托来源西南铜 供方 **/
+    String ENTRUST_SOURCE_XNT_SUPPLIER = "";
+    
+    /** 委托来源西南铜 产品 **/
+    String ENTRUST_SOURCE_XNT_PRODUCT = "xntwt";
+    
+    /** 委托来源西南铜 中控 **/
+    String ENTRUST_SOURCE_XNT_IN_PROCESS_CONTROL = "xntzjwl";
+    
+    /** 委托来源西南铜 原料复测 **/
+    String ENTRUST_SOURCE_XNT_RETEST = "";
+    
+    /** 委托来源西南铜 产品复测 **/
+    String ENTRUST_SOURCE_XNT_PRODUCT_RETEST = "";
+    
+    /** 委托来源西南铜 中心留样复测 **/
+    String ENTRUST_SOURCE_XNT_CENTRAL_RETENTIN_RETEST = "";
+    
+    /** 委托来源西南铜 临时样 **/
+    String ENTRUST_SOURCE_XNT_TEMPORARY = "xntlsy";
+    
+    /** 第三方系统 西南铜实验室 **/
+    String OTHER_SYSTEM_XNT_LIMS = "XNT-LIMS";
+    
     /** 自动 **/
     String AUTOMATIC = "automatic";
     
     /** 手动 **/
     String MANUAL = "manual";
     
+    /** 接口 **/
+    String INTERFACE = "interface";
+    
+    /** 内部接口 **/
+    String INTERFACE_INTERNAL = "interface_internal";
+
 
     /** 样品库操作类型： 归库、调拨、下架 **/
     String SAMPLE_STORAGE_OPERATION_TYPE_STORAGE = "storage";

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

@@ -24,4 +24,6 @@ public interface QmsPermissionConstant {
     String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin";                   //样品库管理员
 
     String DEVICE_MANAGER = "qms_device_manager";                               //设备管理员
+
+    String ADMIN_ROLE = "ytjyAdmin"; // 超级管理员 标识
 }

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

@@ -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());
 		}

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

@@ -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;
 

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

@@ -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;
 

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

@@ -40,14 +40,30 @@ public class BusinessSampleEntrustDetailRespVO {
     @ExcelProperty("样品编号")
     private String sampleCode;
 
-    @Schema(description = "委托样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @Schema(description = "批次编号,西南铜的产品批号")
-    @ExcelProperty("委托样品名称")
+    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)
+    @Schema(description = "委托样品编号")
-    @ExcelProperty("委托样品编号")
     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;

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

@@ -34,14 +34,30 @@ public class BusinessSampleEntrustDetailSaveReqVO {
     @Schema(description = "样品编号")
     private String sampleCode;
 
-    @Schema(description = "委托样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
+    @Schema(description = "批次编号,西南铜的产品批号")
-    @NotEmpty(message = "委托样品名称不能为空")
+    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)
+    @Schema(description = "委托样品编号")
-    @NotEmpty(message = "委托样品编号不能为空")
     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;