zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zgty:2b8f9da407809fe6bedd85c2465e38426838c948
Branches Tags
zgty:test zgty:lims_dev
..
compare: zgty:test
Branches Tags
zgty:test zgty:lims_dev

117 Commits
2b8f9da407 ... test

Author SHA1 Message Date
shusir
0b2d10e662 fix:物料入库、物料库存相关接口 2026-02-06 18:02:00 +08:00
wxr
a7e82da877 来源品位赋值 2026-02-06 16:58:45 +08:00
wxr
6c90826af3 匹配修改 2026-02-06 15:56:31 +08:00
wxr
600540862a 配料取数及设置修改 2026-02-06 15:04:52 +08:00
shusir
c6f4034685 fix:物料新增入库 2026-02-05 18:02:28 +08:00
wxr
e29c43032c 样品委托提交时参数中配置了默认值，业务参数添加默认值 2026-02-05 17:24:39 +08:00
wxr
83fe91812d 任务分配报错bug修复 2026-02-05 17:18:10 +08:00
shusir
50cfdea28d Merge remote-tracking branch 'origin/test' into test 2026-02-05 08:32:13 +08:00
wxr
7d8a5c1e88 荧光线、分析时间等修改 2026-02-04 19:31:41 +08:00
FCL
9014e8bcc8 Merge remote-tracking branch 'origin/test' into test 2026-02-04 18:21:51 +08:00
FCL
fa43a6579a 报告增加属性 2026-02-04 18:07:42 +08:00
shusir
d5b40bfba0 feat:准备物料入库接口 2026-02-04 18:03:51 +08:00
wxr
33b5ec7be5 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-02-04 16:18:01 +08:00
wxr
5a82d9abd8 任务分配及分析任务提交时配料值赋值 2026-02-04 16:17:51 +08:00
shusir
a96fa0ed9b fix:物料验收流程 2026-02-03 18:02:09 +08:00
shusir
8121c7a97f fix:调整物料验收接口 2026-02-02 18:09:24 +08:00
wxr
a8330ade63 方法变更修改 2026-02-02 17:54:20 +08:00
wxr
e9259122b7 人工配料bug修复 2026-01-31 14:51:58 +08:00
wxr
fbd13f50d4 任务单添加配料方式 2026-01-31 13:43:58 +08:00
shusir
58ab9961c4 feat:物料验收流程接口 2026-01-30 17:16:02 +08:00
wxr
3302a2ee7c 补正系数修改 2026-01-30 16:58:32 +08:00
FCL
1bbfa9a950 Merge remote-tracking branch 'origin/test' into test 2026-01-30 14:57:29 +08:00
shusir
57bf9b0cd5 Merge remote-tracking branch 'origin/test' into test 2026-01-30 14:17:21 +08:00
shusir
5bf435b08e fix:完善批次接口，准备物料验收入库模块及验收新建接口。 2026-01-30 14:16:54 +08:00
FCL
3bf8ee09b7 Merge remote-tracking branch 'origin/test' into test 2026-01-30 14:09:44 +08:00
FCL
4444d9e3c0 fix:报告编制细节修复 2026-01-30 14:09:32 +08:00
wxr
9348c33f1b 补正系数、人工还是自动配料 2026-01-30 09:31:58 +08:00
wxr
969fb2edf7 公式计算bug修复 2026-01-29 19:05:28 +08:00
wxr
e6d08d975f Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-29 19:05:01 +08:00
wxr
3cd25f68ef 复检时分析的任务节点修改 2026-01-29 19:01:42 +08:00
shusir
5a03ed1cab fix:新增物料批次提交，物料大类删除校验。 2026-01-29 17:56:30 +08:00
shusir
1c5588a05a fix:调整物料批次接口 2026-01-29 15:39:16 +08:00
FCL
2111c8b3ad feat:设备管理流程类功能开发 2026-01-29 15:25:45 +08:00
shusir
675e1fe850 fix:接口完善，新增库存管理的物料分页列表 2026-01-28 18:01:06 +08:00
FCL
c7d4399e53 feat:设备流程接口 2026-01-28 17:43:19 +08:00
FCL
2fae2ccac2 fix:供应商接口去除权限注解 2026-01-28 16:27:40 +08:00
shusir
533b96fb6a fix:接口完善 2026-01-28 09:00:33 +08:00
shusir
525d588c20 fix:调整物料分类/大类创建接口，新家删除和详情接口 2026-01-27 12:00:20 +08:00
wxr
be2f28cef5 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-27 11:18:20 +08:00
wxr
ce9aff5583 中铜国贸商检委托也提前生成样品编号，与来样编号一致 2026-01-27 11:18:11 +08:00
FCL
71206f43a3 fix:代码调试 2026-01-27 11:15:23 +08:00
shusir
0d164c660e fix:新增物料批次接口及批次拆分及接口。 2026-01-26 18:05:23 +08:00
wxr
2336c370fa 检验委托的一般委托和仲裁委托修改 2026-01-26 17:54:27 +08:00
wxr
a578426458 样品收样不再判断样品在那个分析室 2026-01-26 14:02:35 +08:00
wxr
892596fc2e Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-26 13:37:07 +08:00
wxr
50a868e0a0 班组送样等bug修复 2026-01-26 13:36:56 +08:00
shusir
99b6521c19 Merge remote-tracking branch 'origin/test' into test 2026-01-26 09:03:02 +08:00
shusir
215ec8b5aa feat:新增物料分类，物料大类的新建与树列表及分页列表。 2026-01-26 08:59:16 +08:00
wxr
b408d1e726 修改pom文件，liteflow版本管理前移，防止被父liteflow版本覆盖 2026-01-24 11:15:19 +08:00
wxr
23babc6795 交叉审核报错等修改 2026-01-24 09:45:45 +08:00
FCL
6d7caf5738 Merge remote-tracking branch 'origin/test' into test 2026-01-20 17:54:54 +08:00
FCL
3cb93ce84c fix:设备接口调整 2026-01-20 17:54:50 +08:00
houjunxiang
ac44920fa7 feat：报告签名时间格式化调整 2026-01-19 16:53:49 +08:00
FCL
53d40a4b27 Merge branch 'refs/heads/zt-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
 2026-01-19 10:59:08 +08:00
ranke
7d8b8c55f1 修改私服地址 2026-01-15 10:03:48 +08:00
ranke
b529df9860 修改版本号,新增快照发布设置 2026-01-15 09:18:02 +08:00
FCL
34277c921a feat:qms阶段性提交 2026-01-13 11:21:28 +08:00
FCL
0b936b7b8f feat:数据权限修改。增加qms数据权限注解 2026-01-13 09:12:50 +08:00
wxr
e20827cd0e 还原QMSMultiDataPermissionHandler 2026-01-12 16:55:02 +08:00
wxr
e64c3a8791 分析回退、结果判定自动报出、结果报出复检修改 2026-01-12 16:50:31 +08:00
FCL
ae34b13023 fix:自动火试金地址更换 2026-01-12 15:34:02 +08:00
FCL
9e67e1c784 Merge remote-tracking branch 'origin/test' into test 2026-01-12 15:26:36 +08:00
wxr
77b1be3e0a 版本管理修改下载url连接 2026-01-12 14:38:34 +08:00
FCL
ccfa341429 fix:流程回调接口增加DeptDataPermissionIgnore注解 2026-01-09 14:10:20 +08:00
FCL
0ddf5cb33f fix:流程回调接口增加DeptDataPermissionIgnore注解 2026-01-09 14:09:40 +08:00
FCL
7e7295cb74 feat:qms阶段性提交 2026-01-09 11:26:52 +08:00
FCL
c78f6b0992 feat:qms权限组件-临时提交 2026-01-09 11:04:32 +08:00
houjunxiang
908a18b6f1 feat：供应商管理 2026-01-08 18:00:36 +08:00
wxr
6e3972d5a0 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-08 16:49:40 +08:00
wxr
202cfe4d26 pc端版本更新返回信息修改 2026-01-08 16:49:29 +08:00
FCL
cd27be0fa5 fix:归库返回数据细节修复 2026-01-08 16:07:38 +08:00
FCL
0b7fb7748a fix:字典翻译数据权限问题修复 2026-01-08 16:04:05 +08:00
wxr
18bece858d 交叉判定等级为0和4判定bug修复 2026-01-07 16:41:32 +08:00
FCL
10716a0ec5 feat:qms阶段性提交 2026-01-07 11:00:12 +08:00
wxr
2b59974442 超差判定添加主样配置id查询 2026-01-07 10:50:54 +08:00
wxr
68831680fd fix 回退bug 2026-01-06 11:12:40 +08:00
wxr
8a1b2f0eb3 回退信息等修改 2026-01-06 10:43:07 +08:00
wxr
8945098344 controller添加忽略部门注解 2026-01-05 16:19:41 +08:00
wxr
d1c26d70f6 分配任务是添加是否配料 2026-01-05 15:46:15 +08:00
FCL
b7db2d34ac 部署调试 2026-01-04 18:48:53 +08:00
wxr
e179cbdd0d Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-04 17:35:15 +08:00
FCL
8fa11eb44c feat:qms阶段性更新 2026-01-04 16:53:52 +08:00
FCL
520e5a9add 暂不提交 2026-01-04 16:42:11 +08:00
FCL
9e3b402b1f fix:报告发起iwork流程细节调整 2026-01-04 16:41:08 +08:00
wxr
0a9348cd60 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-04 11:01:16 +08:00
wxr
80a932e802 样品编号生成修改，如果配置了样品编号生成规则，则以规则生成的为准，否则样品编号就为来样编号 2026-01-04 11:01:07 +08:00
FCL
3ea0b06cc3 fix:报告签名缺失问题修复 2026-01-04 10:32:06 +08:00
FCL
3c4b951c7b feat：设备后端接口-使用记录、设备申请等 2026-01-04 08:58:27 +08:00
lrx
cc2812c458 fix:双杯判定bug优化 2025-12-31 17:53:58 +08:00
wxr
28a8970c03 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-12-31 16:34:13 +08:00
wxr
227960e9b1 方法变更添加查询条件，检测项目及参数值保存允许为Null 2025-12-31 16:34:02 +08:00
FCL
8af535b12c feat：设备后端接口-维护、巡检等 2025-12-31 10:13:25 +08:00
FCL
5e71453113 fix:报告接口微调 2025-12-31 10:12:31 +08:00
wxr
f5fc940f54 fix 2025-12-31 08:38:15 +08:00
wxr
286d512bfe 结果报送，复检修改 2025-12-30 11:20:14 +08:00
FCL
96e3e9567e fix:报告预报url优化 2025-12-29 09:56:06 +08:00
FCL
e7a844cc8f feat:设备接口开发：业务配置、维护等 2025-12-26 17:27:43 +08:00
FCL
91815c5e84 fix:报告数据组装 2025-12-26 10:49:56 +08:00
FCL
cc5e04bb40 Merge remote-tracking branch 'origin/test' into test 2025-12-26 10:24:31 +08:00
FCL
778b5f751d fix:报告数据组装 2025-12-26 10:24:26 +08:00
wxr
09b31ad940 任务数量为空，删除bug 2025-12-25 19:09:49 +08:00
wxr
df9747044d 结果上报修改 2025-12-25 17:45:25 +08:00
wxr
635c30f850 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-12-25 15:12:26 +08:00
wxr
69a3f75f89 结果报送，上报bug修复 2025-12-25 15:12:17 +08:00
FCL
58f9c9a350 Merge remote-tracking branch 'origin/test' into test 2025-12-25 14:52:57 +08:00
FCL
b78c9ed179 fix:报告数据组装 2025-12-25 14:50:37 +08:00
wxr
94074868d9 委检登记bug修复 2025-12-25 14:22:29 +08:00
FCL
f9f87648af fix:报告数据组装 2025-12-25 14:20:13 +08:00
FCL
b8bf7a3d9d fix:报告数据组装 2025-12-25 11:34:30 +08:00
FCL
71bb44e053 Merge remote-tracking branch 'origin/test' into test 2025-12-25 11:10:01 +08:00
FCL
363185faed fix:报告数据组装 2025-12-25 11:04:59 +08:00
FCL
d0aff7840d Merge remote-tracking branch 'origin/test' into test 2025-12-25 10:30:19 +08:00
FCL
575e40773d fix:报告数据组装 2025-12-25 10:28:32 +08:00
chenbowen
8c3a1bdff8 1. 升级版本 2025-12-23 10:50:23 +08:00
FCL
212a28059c feat:更新tio，支持redis指定用户名 2025-12-04 10:39:19 +08:00
FCL
9323bb3706 Merge remote-tracking branch 'origin/test' into test 2025-11-28 15:23:00 +08:00
FCL
b2c34982f9 feat:阶段性代码提交 2025-11-28 15:22:17 +08:00
494 changed files with 10022 additions and 7482 deletions
Expand all files Collapse all files

51
pom.xml
View File

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

0
qms-server/src/main/resources/application-dev.yml → qms-server/src/main/resources/application-dev1.yml
View File

2
qms-server/src/main/resources/application.yml
View File

@@ -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 配置

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

@@ -122,7 +122,7 @@ public interface ErrorCodeConstants {
ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定数据业务不存在");
ErrorCode BUSINESS_SUB_PARENT_SAMPLE_ASSESSMENT_PROJECT_NOT_EXISTS = new ErrorCode(1_032_100_000, "班组判定检测项目数据业务不存在");
ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RECHECK_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复检业务数据不存在");
ErrorCode BUSINESS_SUB_SAMPLE_PARENT_RETEST_NOT_EXISTS = new ErrorCode(1_032_100_000, "分样复测业务数据不存在");
ErrorCode BUSINESS_QC_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样业务不存在");
ErrorCode BUSINESS_QC_PROJECT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "质控样检测项目数据业务不存在");
@@ -150,8 +150,8 @@ public interface ErrorCodeConstants {
/*=================================resource 资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
// ----------设备管理----------
ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");
ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备大类不存在");
ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备信息不存在");
ErrorCode DEVICE_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备大类不存在");
ErrorCode DEVICE_MAINTAIN_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护数据不存在");
ErrorCode DEVICE_MAINTAIN_ITEM_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备维护项不存在");
ErrorCode DEVICE_CONFIG_BUSINESS_RULE_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备业务配置不存在");
@@ -168,27 +168,37 @@ public interface ErrorCodeConstants {
ErrorCode DEVICE_AFFILIATION_RELATIVITY_NOT_EXISTS = new ErrorCode(1_032_150_000, "附属设备关系不存在");
ErrorCode DEVICE_APPLY_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请明细数据不存在");
ErrorCode DEVICE_APPLY_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备申请数据不存在");
ErrorCode DEVICE_CONFIG_FLOW_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备通用流程配置不存在");
// -------------物料试剂-------------
ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在");
ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在");
ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在");
ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_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_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_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次不存在");
ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料批次分发不存在");
ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库，出库不存在");
ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "入库明细,出库明细等不存在");
ErrorCode MATERIAL_BATCH_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次不存在");
ErrorCode MATERIAL_BATCH_GONG_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次工段不存在");
ErrorCode MATERIAL_BATCH_ASSIGN_END = new ErrorCode(1_032_160_000, "物料批次已拆分，不可操作");
ErrorCode GONGDUAN_BELONG_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段所属的物料批次不一致");
ErrorCode GONGDUAN_QUANTITY_MATERIAL_BATCH_NOT_EQUAL = new ErrorCode(1_032_160_000, "工段累加数量和批次数量不一致");
ErrorCode MATERIAL_BATCH_NOT_ASSIGN_FOR_SUBMIT = new ErrorCode(1_032_160_000, "物料批次未拆分，不可提交");
ErrorCode MATERIAL_BATCH_ASSIGN_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料批次分发不存在");
ErrorCode MATERIAL_INVENTORY_INBOUND_NOT_EXISTS = new ErrorCode(1_032_160_000, "入库，出库不存在");
ErrorCode MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_160_000, "入库明细,出库明细等不存在");
ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_150_000, "客户端版本管理不存在");
ErrorCode SYSTEM_VERSION_MANAGEMENT_NOT_EXISTS = new ErrorCode(1_032_160_000, "客户端版本管理不存在");
ErrorCode MATERIAL_LOCATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "存放位置不存在");
ErrorCode MATERIAL_INVENTORY_CHECK_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点不存在");
ErrorCode MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点项不存在");
ErrorCode MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "库存盘点明细不存在");
ErrorCode MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库不存在");
ErrorCode MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");
ErrorCode MATERIAL_LOCATION_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_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, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等不存在");

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

@@ -76,7 +76,10 @@ public interface QmsCommonConstant {
/** 已驳回 **/
String REJECTED = "rejected";
/** 已拒绝 **/
String REFUSED = "refused";
/** 作废 **/
String VOID = "void";
@@ -207,7 +210,9 @@ public interface QmsCommonConstant {
/** 允许提交 **/
String ALLOW_SUBMIT = "allow_submit";
/** 临时数据标识 **/
String TEMP_DATA_CODE = "-1";
}

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

@@ -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"; //设备管理员
}

10
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsSupplierConstant.java Normal file
View File

@@ -0,0 +1,10 @@
package com.zt.plat.module.qms.enums;
public interface QmsSupplierConstant {
String OPERATING_ITEMS_KEY = "operatingItems";
// 供应商属性资质key
String CERTIFICATION_KEY = "certification";
// 评价流程key
String EVALUATION_FLOW_KEY= "OFFICE_SUPPLIER_EVALUATION";
}

11
zt-module-qms/zt-module-qms-server/pom.xml
View File

@@ -16,10 +16,7 @@
<description>
QMS模块。
</description>
<properties>
<zzjc.tio.version>3.9.1.v20251204-RELEASE</zzjc.tio.version>
<liteflow.version>2.15.2</liteflow.version>
</properties>
<dependencies>
<!-- Spring Cloud 基础 -->
<dependency>
@@ -142,27 +139,22 @@
<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>
<!-- pdfbox -->
@@ -199,7 +191,6 @@
<dependency>
<groupId>tech.zzjc.tio</groupId>
<artifactId>zzjc-tio-spring-boot-starter</artifactId>
<version>${zzjc.tio.version}</version>
</dependency>
</dependencies>

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/api/task/QmsApiImpl.java
View File

@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.api.task;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.util.spring.SpringUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO;
import com.alibaba.fastjson.JSONObject;
import org.springframework.validation.annotation.Validated;
@@ -12,6 +13,7 @@ import static com.zt.plat.module.qms.enums.QmsBpmConstant.BPM_CALLBACK_BEAN_NAME
@RestController
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class QmsApiImpl implements QmsApi{
@Override

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessAssayParameterDataController.java
View File

@@ -25,6 +25,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.common.pojo.CommonResult;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.framework.excel.core.util.ExcelUtils;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO;
@@ -36,6 +37,7 @@ import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
@RestController
@RequestMapping("/qms/business-assay-parameter-data")
@Validated
@DeptDataPermissionIgnore(enable = "true")
public class BusinessAssayParameterDataController implements BusinessControllerMarker {

Some files were not shown because too many files have changed in this diff Show More