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

# Conflicts:
#	pom.xml
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/datapermission/QMSMultiDataPermissionHandler.java
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/mybatis/QMSDataPermissionConfig.java

pom.xml

@@ -17,7 +17,10 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.45</revision>
+        <revision>3.0.47-SNAPSHOT</revision>
+        <!-- qms服务相关 -->
+        <zzjc.tio.version>3.9.1.v20251204-RELEASE</zzjc.tio.version>
+        <liteflow.version>2.15.3</liteflow.version>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -41,6 +44,40 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            
+            <!-- liteflow -->
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-spring-boot-starter</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-javax-pro</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-groovy</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-qlexpress</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-graaljs</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            
+            <!-- tio -->
+            <dependency>
+                <groupId>tech.zzjc.tio</groupId>
+                <artifactId>zzjc-tio-spring-boot-starter</artifactId>
+                <version>${zzjc.tio.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -143,7 +180,7 @@
         <repository>
             <id>ZT</id>
             <name>中铜 ZStack 私服</name>
-            <url>http://172.16.46.63:30708/repository/test/</url>
+            <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
             <releases>
                 <updatePolicy>always</updatePolicy>
                 <checksumPolicy>warn</checksumPolicy>
@@ -161,11 +198,11 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
         </repository>
-<!--    <snapshotRepository>-->
-<!--        <id>ZT</id>-->
-<!--        <name>中铜 ZStack 私服</name>-->
-<!--        <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
-<!--    </snapshotRepository>-->
+        <snapshotRepository>
+            <id>ZT-snap</id>
+            <name>中铜 ZStack 私服</name>
+            <url>http://172.16.46.63:30708/repository/test-snap/</url>
+        </snapshotRepository>
     </distributionManagement>
 
     <profiles>

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

@@ -24,7 +24,7 @@ spring:
 
   config:
     import:
-      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
+#      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
 
   # Servlet 配置
@@ -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/AdjustType.java

@@ -0,0 +1,12 @@
+package com.zt.plat.module.qms.enums;
+
+public enum AdjustType {
+    /**
+     * 加
+     */
+    add,
+    /**
+     * 减
+     */
+    subtract,
+}

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

@@ -0,0 +1,12 @@
+package com.zt.plat.module.qms.enums;
+
+public enum LockType {
+    /**
+     * 锁定
+     */
+    lock,
+    /**
+     * 解锁
+     */
+    unlock,
+}

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

@@ -11,12 +11,14 @@ public class QmsBpmConstant {
      * 流程回调时使用的ActivityId Key
      * */
     public static final String BPM_CALLBACK_ACTIVITY_ID = "bpmCallbackActivityId";
+    public static final String BPM_CALLBACK_ACTIVITY_NAME = "bpmCallbackActivityName";
     public static final String BPM_FIELD_EXTENSIONS = "bpmFieldExtensions";
     public static final String BPM_FIRST_ACTIVITY_FLAG = "firstActivityFlag";
     public static final String BPM_LAST_ACTIVITY_FLAG = "lastActivityFlag";
     public static final String BPM_REJECT_TO_FIRST_FLAG = "rejectToFirstActivity";
     public static final String BPM_CUR_ACTIVITY_INS_ID = "currentActivityInsId";        //当前活动实例id
-    public static final String BPM_PROCESS_INS_ID = "processInstanceId";        //当前活动实例id
+
+    public static final String BPM_PROCESS_INS_ID = "processInstanceId";        //流程实例ID
 
     //驳回标记前缀
     public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_";

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

@@ -76,7 +76,10 @@ public interface QmsCommonConstant {
     
     /** 已驳回 **/
     String REJECTED = "rejected";
-    
+
+    /** 已拒绝 **/
+    String REFUSED = "refused";
+
     /** 作废 **/
     String VOID = "void";
     
@@ -155,6 +158,9 @@ public interface QmsCommonConstant {
     /** 平行 **/
     String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel";
     
+    /** 双杯平行 **/
+    String ASSAY_TYPE_DOUBLE_PARALLEL = "double_parallel";
+    
     /** 配料 **/
     String ASSAY_PROJECT_USAGE_INGREDIENT = "ingredient";
     
@@ -181,6 +187,15 @@ public interface QmsCommonConstant {
     
     /** 结果判定-已上报 */
     String ASMT_REPORTED = "reported";
+    
+    /** 超差判断类型：内控 **/
+    String ASMT_TYPE_INTERNAL_CONTROL = "internalControl";
+
+    /** 超差判断类型：重复性 **/
+    String ASMT_TYPE_REPETITIVENESS = "repetitiveness";
+
+    /** 超差判断类型：再现性 **/
+    String ASMT_TYPE_REPRODUCIBILITY = "reproducibility";
 
     /** 检验完成状态-完成 **/
     String CHECKED = "checked";
@@ -191,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";
@@ -207,7 +230,9 @@ public interface QmsCommonConstant {
 
     /** 允许提交 **/
     String ALLOW_SUBMIT = "allow_submit";
+
+    /** 临时数据标识 **/
+    String TEMP_DATA_CODE = "-1";
     
-    
-    
+
 }

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

@@ -16,9 +16,12 @@ public interface QmsPermissionConstant {
     //目标权限类型-自定义
     String TARGET_TYPE_CUSTOM = "custom";
 
+    String DEPT_DATA_AND_SUB = "ytjyDeptAndSub";                       //部门
+
     //======================各业务模块权限常量=============================
 
     String REPORT_DOCUMENT_TYPE_START = "report_document_type_start";                   //报告发起权限
     String SAMPLE_WAREHOUSE_ADMIN = "sample_warehouse_admin";                   //样品库管理员
 
+    String DEVICE_MANAGER = "qms_device_manager";                               //设备管理员
 }