Commit Graph

368 Commits

Author SHA1 Message Date
FCL
0b7fb7748a fix:字典翻译数据权限问题修复 2026-01-08 16:04:05 +08:00
wxr
18bece858d 交叉判定等级为0和4判定bug修复 2026-01-07 16:41:32 +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
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
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
wxr
2b8f9da407 检验委托样品生成bug修复 2025-12-25 10:49:14 +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
wxr
3659edb3f5 检验委托生成样品修改 2025-12-25 10:19:38 +08:00
wxr
b4bfece4b3 分析取数修改 2025-12-24 18:36:05 +08:00
wxr
5ca2253522 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-12-24 18:03:32 +08:00
wxr
76b44686fb 复测及原始记录修改 2025-12-24 18:03:22 +08:00
FCL
dc23a86c29 fix:报告数据组装 2025-12-24 15:23:16 +08:00
wxr
b0d45e5cde 样品生成,子样方法配置错误提示 2025-12-24 13:55:21 +08:00
FCL
d9f7330f57 Merge remote-tracking branch 'origin/test' into test 2025-12-24 13:42:42 +08:00
FCL
f4e4d56e97 feat: 设备模块部分代码生成;报告接口; 2025-12-24 13:42:36 +08:00
FCL
171c406b29 feat: 设备模块部分代码生成;报告接口; 2025-12-24 13:42:31 +08:00
wxr
4019440537 简码打印修改 2025-12-24 10:14:41 +08:00