二进制文件禁止对比

.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

@@ -142,6 +142,13 @@ public interface ErrorCodeConstants {
 	
 	ErrorCode BUSINESS_XRF_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "荧光采集记录不存在");
 
+	//第三方对接
+	ErrorCode OTHER_SYSTEM_CONFIG_NOT_EXISTS = new ErrorCode(1_032_100_000, "第三方系统配置不存在");
+	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, "第三方系统与业务字典对应不存在");
+	
 
 	//检测报告
 	ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
@@ -177,15 +184,16 @@ public interface ErrorCodeConstants {
 	ErrorCode DEVICE_CONFIG_FLOW_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备通用流程配置不存在");
 
 //	-------------物料试剂-------------
-	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "试剂耗材不存在");
+	ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料不存在");
 	ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类不存在");
 	ErrorCode MATERIAL_PRODUCT_PARENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料分类/大类的父类不存在");
-	ErrorCode MATERIAL_PRODUCT_CODE_MODELNO_EXISTED = new ErrorCode(1_032_160_000, "物料大类【编码+型号】重复");
+	ErrorCode MATERIAL_PRODUCT_CODE_SPECIFICATION_EXISTED = new ErrorCode(1_032_160_000, "物料大类【编码+规格】重复");
 	ErrorCode MATERIAL_CATEGORY_EXISTS_CHILDREN = new ErrorCode(1_032_160_000, "分类下含有子分类或物料大类，不可删除");
 	ErrorCode MATERIAL_PRODUCT_EXISTS_BATCH = new ErrorCode(1_032_160_000, "物料大类下存在物料批次，不可删除");
 	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, "物料批次工段不存在");
@@ -198,8 +206,7 @@ public interface ErrorCodeConstants {
 
 	ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
 
-	ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点不存在");
-	ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
+	ErrorCode MATERIAL_INVENTORY_CHECK_ITEM_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点项不存在");
 	ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "库存盘点明细不存在");
 	ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库不存在");
 	ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
@@ -244,4 +251,13 @@ public interface ErrorCodeConstants {
 	ErrorCode RECORD_FILE_EXISTS = new ErrorCode(1_032_350_000, "文件记录目录存在文件");
 	ErrorCode RECORD_PERMISSION_NOT_ALLOW = new ErrorCode(1_032_350_401, "当前操作权限不允许");
 	ErrorCode RECORD_CATEGORY_NAME_EXISTS = new ErrorCode(1_032_350_400, "文件记录分类名称不能重复");
+
+
+	/*=================================  部门信息、用户信息 ==================================*/
+	ErrorCode CURRENT_USER_COMPANY_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户公司不存在");
+	ErrorCode CURRENT_USER_DEPT_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
+	ErrorCode CURRENT_USER_NOT_EXISTS = new ErrorCode(1_032_350_000, "当前用户部门不存在");
+
+	// ========== 文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物 TODO 补充编号 ==========
+	ErrorCode RECORD_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_450_000, "文件记录分发号,记录文件分发与线下对应的分发号对应，且标记到目标人物不存在");
 }

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

@@ -215,11 +215,47 @@ 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";
 
 
     /** 样品库操作类型： 归库、调拨、下架 **/

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/BusinessSubSampleController.java

@@ -164,8 +164,8 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @GetMapping("/getBySampleCodeAndFlowKey")
     @Operation(summary = "根据样品编号及样品流程节点key获取样品信息")
     public CommonResult<?> getBySampleCodeAndFlowKey(@Valid BusinessSubSampleReqVO reqVO) {
-    	BusinessSubSampleExtendRespVO result = businessSubSampleService.getBySampleCodeAndFlowKey(reqVO);
-    	return success(result);
+    	List<BusinessSubSampleExtendRespVO> resultList = businessSubSampleService.getBySampleCodeAndFlowKey(reqVO);
+    	return success(resultList);
 	}
 
     @GetMapping("/export-excel")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java

@@ -455,6 +455,17 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 				.eq(BusinessAssayTaskDataDO::getAssayDepartmentId, assayDepartmentId));
 	}
 	
+	/**
+	 * 根据主样查询分析任务
+	 * @param businessBaseSampleIdList 主样id
+	 * @return
+	 */
+	default List<BusinessAssayTaskDataDO> selectByBusinessBaseSampleIds(List<Long> businessBaseSampleIdList) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.in(BusinessAssayTaskDataDO::getBusinessBaseSampleId, businessBaseSampleIdList));
+	}
+
+	
 	/**
 	 * 根据主样及分析部门查询分析任务
 	 * @param businessBaseSampleId 主样id

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustFileMapper.java

@@ -36,6 +36,7 @@ public interface BusinessSampleEntrustFileMapper extends BaseMapperX<BusinessSam
                 .eqIfPresent(BusinessSampleEntrustFileDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessSampleEntrustFileDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessSampleEntrustFileDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessSampleEntrustFileDO::getFileCategory)
                 .orderByDesc(BusinessSampleEntrustFileDO::getId));
     }
 
@@ -55,6 +56,7 @@ public interface BusinessSampleEntrustFileMapper extends BaseMapperX<BusinessSam
                 .eqIfPresent(BusinessSampleEntrustFileDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessSampleEntrustFileDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessSampleEntrustFileDO::getRemark, reqVO.getRemark())
+                .orderByDesc(BusinessSampleEntrustFileDO::getFileCategory)
                 .orderByDesc(BusinessSampleEntrustFileDO::getId));
 	}
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java

@@ -222,8 +222,8 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .orderByDesc(BusinessSubSampleDO::getId));
 	}
 
-	default BusinessSubSampleExtendRespVO getBySampleCode(BusinessSubSampleReqVO reqVO) {
-		return selectJoinOne(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
+	default List<BusinessSubSampleExtendRespVO> getBySampleCode(BusinessSubSampleReqVO reqVO) {
+		return selectJoinList(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
         		.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, BusinessSubSampleDO::getDictionaryBusinessId)
         		.leftJoin(ConfigSubSampleDO.class, ConfigSubSampleDO::getId, BusinessSubSampleDO::getConfigSubSampleId)
         		.selectAll(BusinessSubSampleDO.class)
@@ -236,8 +236,8 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .orderByDesc(BusinessSubSampleDO::getId));
 	}
 
-	default BusinessSubSampleExtendRespVO getBySampleCodeAndFlowKey(BusinessSubSampleReqVO reqVO) {
-		return selectJoinOne(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
+	default List<BusinessSubSampleExtendRespVO> getBySampleCodeAndFlowKey(BusinessSubSampleReqVO reqVO) {
+		return selectJoinList(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
         		.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, BusinessSubSampleDO::getDictionaryBusinessId)
         		.leftJoin(ConfigSubSampleDO.class, ConfigSubSampleDO::getId, BusinessSubSampleDO::getConfigSubSampleId)
         		.selectAll(BusinessSubSampleDO.class)

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java

@@ -213,6 +213,13 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 		LocalDateTime currentDateTime = sampleEntrustContext.getCurrentDateTime();
 		//样品委托登记
 		BusinessSampleEntrustRegistrationDO sampleEntrustRegistration = sampleEntrustContext.getSampleEntrustRegistration();
+		//扩展信息
+		String sampleEntrustRegistrationExtInfo = sampleEntrustRegistration.getExternalInfomation();
+		JSONObject sampleEntrustRegistrationJsonObject = null;
+		if (StringUtils.isNotBlank(sampleEntrustRegistrationExtInfo)) {
+			sampleEntrustRegistrationJsonObject = JSON.parseObject(sampleEntrustRegistrationExtInfo);
+		}
+		
 		//样品委托登记明细
 		List<BusinessSampleEntrustDetailDO> sampleEntrustDetailList = sampleEntrustContext.getSampleEntrustDetailList();
 		//样品检测项目
@@ -427,6 +434,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 			businessSubSampleDO.setSampleFlowNodeKey(sampleFlowNodeSub.getNodeKey());
 			businessSubSampleDO.setSampleFlowNodeTime(currentDateTime);
 			businessSubSampleDO.setNextSampleFlowNode(sampleFlowNodeSub.getNextFlowNodeName());
+			businessSubSampleDO.setRemark(sampleEntrustRegistrationJsonObject.getString("sampleCategory"));//子样备注设置样品类型
 			
 			businessSubSampleDOList.add(businessSubSampleDO);
 			
@@ -492,7 +500,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 						
 						//如果是商检样分析，且为第一个商检分析样，并且包含要检测的项目，
 						if (QmsCommonConstant.ENTRUST_INSPECTION_ANALYSIS_SAMPLE.equals(baseSampleDO.getDictionaryBusinessKey()) && isAssayConditionProjectList && sjfxyOne == 0) {
-							addAssayTask(currentDateTime, configSubSampleMethodList, configAssayMethodProjectList,
+							addAssayTask(currentDateTime, sampleEntrustRegistrationJsonObject, configSubSampleMethodList, configAssayMethodProjectList,
 									configAssayMethodProjectParameterList, dictionaryProjectList,
 									businessSubParentSampleAssessmentDOList, businessSubSampleAnalysisGroupDOList,
 									businessSubSampleAssessmentDOList, businessAssayTaskDataDOList,
@@ -500,7 +508,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 									configSampleFlowSub, sampleFlowNodeSub, businessSubSampleDO, methodId,
 									projectIdList, configAssayMethodParameterList, businessAssayTaskParameterDataDOList);
 						} else if (QmsCommonConstant.ENTRUST_COMPREHENSIVE_INSPECTION_SAMPLE.equals(baseSampleDO.getDictionaryBusinessKey()) && isAssayConditionProjectList) {//如果是商检综合样，并且包含需检查的项目
-							addAssayTask(currentDateTime, configSubSampleMethodList, configAssayMethodProjectList,
+							addAssayTask(currentDateTime, sampleEntrustRegistrationJsonObject, configSubSampleMethodList, configAssayMethodProjectList,
 									configAssayMethodProjectParameterList, dictionaryProjectList,
 									businessSubParentSampleAssessmentDOList, businessSubSampleAnalysisGroupDOList,
 									businessSubSampleAssessmentDOList, businessAssayTaskDataDOList,
@@ -509,7 +517,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 									projectIdList, configAssayMethodParameterList, businessAssayTaskParameterDataDOList);
 							
 						} else if (QmsCommonConstant.ENTRUST_COMMISSION_INSPECTION_SAMPLE.equals(baseSampleDO.getDictionaryBusinessKey()) && isAssayConditionProjectList && !isForecastS ) {//如果是委检样，包含检测项目，未预报S值
-							addAssayTask(currentDateTime, configSubSampleMethodList, configAssayMethodProjectList,
+							addAssayTask(currentDateTime, sampleEntrustRegistrationJsonObject, configSubSampleMethodList, configAssayMethodProjectList,
 									configAssayMethodProjectParameterList, dictionaryProjectList,
 									businessSubParentSampleAssessmentDOList, businessSubSampleAnalysisGroupDOList,
 									businessSubSampleAssessmentDOList, businessAssayTaskDataDOList,
@@ -614,6 +622,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 							if (StringUtils.isNotBlank(configAssayMethodParameterDO.getDefaultValue())) {
 								businessAssayTaskParameterDataDO.setValue(configAssayMethodParameterDO.getDefaultValue());
 							}
+							
+							if (StringUtils.isNotBlank(sampleEntrustRegistrationJsonObject.getString("sampleCategory")) && "remark".equals(configAssayMethodParameterDO.getKey())) {
+								businessAssayTaskParameterDataDO.setValue(sampleEntrustRegistrationJsonObject.getString("sampleCategory"));//任务参数备注赋值样品类型
+							}
 
 							//来样品位赋值
 							if (getParamList != null) {
@@ -688,6 +700,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 									businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue());
 								}
 
+								if (StringUtils.isNotBlank(sampleEntrustRegistrationJsonObject.getString("sampleCategory")) && "remark".equals(configAssayMethodProjectParameterDO.getKey())) {
+									businessAssayParameterDataDO.setValue(sampleEntrustRegistrationJsonObject.getString("sampleCategory"));//任务参数备注赋值样品类型
+								}
+
 								//来样品位赋值
 								if (getParamList != null) {
 									List<String> targetParameterList = getParamList.stream().filter(f -> StringUtils.isNotBlank(f.getTarget().getProject()) && f.getTarget().getProject().contains(configAssayMethodProjectDO.getSimpleName())).map(m -> m.getTarget().getParameter()).collect(Collectors.toList());
@@ -922,7 +938,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 		}
 	}
 
-	private void addAssayTask(LocalDateTime currentDateTime, List<ConfigSubSampleMethodExtendRespVO> configSubSampleMethodList,
+	private void addAssayTask(LocalDateTime currentDateTime, JSONObject sampleEntrustRegistrationJsonObject, List<ConfigSubSampleMethodExtendRespVO> configSubSampleMethodList,
 			List<ConfigAssayMethodProjectExtendRespVO> configAssayMethodProjectList,
 			List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterList,
 			List<DictionaryProjectDO> dictionaryProjectList,
@@ -1042,6 +1058,9 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 					if (StringUtils.isNotBlank(configAssayMethodParameterDO.getDefaultValue())) {
 						businessAssayTaskParameterDataDO.setValue(configAssayMethodParameterDO.getDefaultValue());
 					}
+					if (StringUtils.isNotBlank(sampleEntrustRegistrationJsonObject.getString("sampleCategory")) && "remark".equals(configAssayMethodParameterDO.getKey())) {
+						businessAssayTaskParameterDataDO.setValue(sampleEntrustRegistrationJsonObject.getString("sampleCategory"));//任务参数备注赋值样品类型
+					}
 					
 					businessAssayTaskParameterDataDOList.add(businessAssayTaskParameterDataDO);
 				}
@@ -1099,7 +1118,10 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 						if (StringUtils.isNotBlank(configAssayMethodProjectParameterDO.getDefaultValue())) {
 							businessAssayParameterDataDO.setValue(configAssayMethodProjectParameterDO.getDefaultValue());
 						}
-						
+
+						if (StringUtils.isNotBlank(sampleEntrustRegistrationJsonObject.getString("sampleCategory")) && "remark".equals(configAssayMethodProjectParameterDO.getKey())) {
+							businessAssayParameterDataDO.setValue(sampleEntrustRegistrationJsonObject.getString("sampleCategory"));//任务参数备注赋值样品类型
+						}
 						
 						businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
 					}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSubSampleService.java

@@ -96,7 +96,7 @@ public interface BusinessSubSampleService {
 	 * @param reqVO
 	 * @return
 	 */
-	BusinessSubSampleExtendRespVO getBySampleCodeAndFlowKey(@Valid BusinessSubSampleReqVO reqVO);
+	List<BusinessSubSampleExtendRespVO> getBySampleCodeAndFlowKey(@Valid BusinessSubSampleReqVO reqVO);
 
     //样品归库
     BusinessSubSampleRespVO execReturnToStock(@Valid BusinessSubSampleSaveReqVO reqVo);