Commit Graph

397 Commits

Author SHA1 Message Date
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