Merge remote-tracking branch 'origin/test' into test

qms-server/src/main/resources/application-local.yml

@@ -65,7 +65,7 @@ rocketmq:
 xxl:
   job:
     admin:
-      addresses: http://172.16.46.63:30082/xxl-job-admin # 调度中心部署跟地址
+      addresses: http://192.168.26.116:888/xxl-job-admin # 调度中心部署跟地址
 
 # Lock4j 配置项
 lock4j:

qms-server/src/main/resources/application.yml

@@ -97,7 +97,8 @@ easy-trans:
 xxl:
   job:
     executor:
-      appname: ${spring.application.name} # 执行器 AppName
+#      appname: ${spring.application.name} # 执行器 AppName
+      appname: xxl-job-executor-sample # 执行器 AppName
       logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
     accessToken: default_token # 执行器通讯TOKEN
 

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

@@ -96,6 +96,10 @@ 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_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, "委检登记分析部门样品明细不存在");
+	
 
 	ErrorCode BUSINESS_BASE_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "主样业务不存在");
 	ErrorCode BUSINESS_SUB_PARENT_SAMPLE_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样业务不存在");
@@ -138,6 +142,12 @@ 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 REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
@@ -173,10 +183,10 @@ 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, "物料大类列表中存在分类数据");
@@ -194,8 +204,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, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
@@ -240,4 +249,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

@@ -206,6 +206,14 @@ public interface QmsCommonConstant {
     /** 数据回报状态 未回报 **/
     String UNRETURNED = "unreturned";
     
+    /** 委检登记附件类型：委检登记上传 **/
+    String ENTRUST_ATTACHMENT_CATEGORY_REGISTRATION = "entrust_registration_upload";
+
+    /** 委检登记附件类型：原始记录 **/
+    String ENTRUST_ATTACHMENT_CATEGORY_ASSAY_TASK = "entrust_assay_task_upload";
+    
+    /** 委检登记附件类型：商检部门分析报告 **/
+    String ENTRUST_ATTACHMENT_CATEGORY_DEPT_DOC = "entrust_dept_doc_upload";
     
     /** 自动 **/
     String AUTOMATIC = "automatic";

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/controller/admin/SampleDeptEntrustDocAuditController.java

@@ -0,0 +1,45 @@
+package com.zt.plat.module.qms.business.bus.controller.admin;
+
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
+import com.zt.plat.module.qms.business.bus.controller.vo.DeptEntrustDocAuditParam;
+import com.zt.plat.module.qms.business.bus.service.SampleDeptEntrustDocAuditService;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+
+
+@Tag(name = "管理后台 - 样品班组委托报告审核")
+@RestController
+@RequestMapping("/qms/bus/sample/dept-entrust-doc-audit")
+@Validated
+@DeptDataPermissionIgnore(enable = "true")
+public class SampleDeptEntrustDocAuditController {
+	
+	@Resource
+	private SampleDeptEntrustDocAuditService sampleDeptEntrustDocAuditService;
+	
+	
+	@GetMapping("/getDeptEntrustDocAuditByBusSampleEntrustDeptId")
+	public CommonResult<?> getDeptEntrustDocAuditByBusSampleEntrustDeptId(Long businessSampleEntrustDepartmentId) {
+		JSONObject json = sampleDeptEntrustDocAuditService.getDeptEntrustDocAuditByBusSampleEntrustDeptId(businessSampleEntrustDepartmentId);
+		return success(json);
+	}
+	
+	@PostMapping("/auditDeptEntrustDocAudit")
+	public CommonResult<?> auditDeptEntrustDocAudit(@RequestBody DeptEntrustDocAuditParam param) {
+		sampleDeptEntrustDocAuditService.auditDeptEntrustDocAudit(param);
+		return success("成功");
+	}
+
+}

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

@@ -0,0 +1,19 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessAssayReportDataExtendRespVO extends BusinessAssayReportDataRespVO {
+
+
+    @Schema(description = "样品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("样品名称")
+    private String sampleName;
+
+    @Schema(description = "样品大类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("样品大类名称")
+    private String baseSampleName;
+}