Commit Graph

690 Commits

Author SHA1 Message Date
FCL
1f7bf9c828 Merge remote-tracking branch 'origin/test' into test 2026-04-09 16:35:18 +08:00
FCL
9a480d6154 fix:设备测试问题处理 2026-04-09 16:35:05 +08:00
shusir
31b90f6dde fix:盘点调整为支持预盘点,数据权限支持多部门id。 2026-04-09 15:31:03 +08:00
wxr
d99f4dd443 未配置子样与方法的处理 2026-04-09 11:15:03 +08:00
YBP
279792e363 文件记录-问题修改 2026-04-09 09:10:53 +08:00
shusir
185179ed65 Merge remote-tracking branch 'origin/test' into test 2026-04-08 18:06:08 +08:00
shusir
6b774c83a8 fix:bug修复 2026-04-08 18:05:48 +08:00
wxr
ef2eddf89b Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-04-08 16:23:35 +08:00
wxr
63557ee19e 临时样细节处理 2026-04-08 16:23:25 +08:00
FCL
37c183cace Merge remote-tracking branch 'origin/test' into test 2026-04-08 16:11:32 +08:00
FCL
4fb1e50400 fix:设备细节调整 2026-04-08 16:11:28 +08:00
shusir
e244167726 Merge remote-tracking branch 'origin/test' into test 2026-04-08 16:06:05 +08:00
shusir
c8776349a5 fix:验收检验结果处理,批次工段业务场景,根据code查物料时的业务场景判断。 2026-04-08 16:05:41 +08:00
YBP
1f1df467d4 文件记录-添加文件修改通知单 2026-04-07 18:20:38 +08:00
wxr
d12af3b102 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-04-07 17:31:09 +08:00
wxr
198ab81c31 自动上报处理 2026-04-07 17:31:00 +08:00
shusir
79a9c5d7fa fix:提交供应商接口修改,调整物料模块接口数据权限。 2026-04-07 16:39:06 +08:00
wxr
0a5bedfa72 检测项目分配(已指定定检测方法) 2026-04-03 18:12:49 +08:00
shusir
b05531e1a9 Merge remote-tracking branch 'origin/test' into test 2026-04-03 18:01:13 +08:00
shusir
ceb3c7084b fix:修复供应商属性返回文件列表;物料验收检验联调整个流程; 2026-04-03 18:00:32 +08:00
YBP
dc8849fb80 文件记录,流程修改 2026-04-03 17:53:27 +08:00
wxr
59cf9bd8b6 委托登记消息延迟15s消费 2026-04-03 13:39:39 +08:00
FCL
cd2b1ca298 fix:权限调试 2026-04-03 09:46:18 +08:00
FCL
c81bffa767 Merge remote-tracking branch 'origin/test' into test 2026-04-03 08:53:23 +08:00
shusir
eac4f99dcf fix:物料验收检化验处理检验结果 2026-04-02 18:19:20 +08:00
FCL
7623c96ca9 fix:设备业务配置增加字段 2026-04-02 17:50:51 +08:00
wxr
ea62776bfd 西南铜检验委托临时样品 2026-04-02 16:09:52 +08:00
shusir
9887c99571 Merge remote-tracking branch 'origin/test' into test 2026-04-01 17:58:52 +08:00
shusir
d9abb2cb93 fix:物料验收检化验获取当前节点和下一个节点信息。 2026-04-01 17:58:40 +08:00
YBP
93fac8ec5a 优化onlyoffice在线编辑 2026-04-01 17:23:47 +08:00
wxr
bef89bd4f3 按检测项目分配 2026-04-01 13:52:10 +08:00
YBP
c18eaae2be 文件记录流程优化 2026-03-31 18:13:02 +08:00
shusir
630ce302de Merge remote-tracking branch 'origin/test' into test 2026-03-31 17:58:21 +08:00
shusir
1ca82dadcc fix:临时修复标准溶液的报错; 2026-03-31 17:58:07 +08:00
FCL
b2bed3491b fix:期间核查、检定校准附件 2026-03-31 16:34:43 +08:00
FCL
2c19e36453 fix:设备图片 2026-03-31 16:09:33 +08:00
shusir
bb316b837f fix:物料验收检化验节点自动执行;二维码组装与解析,支持只序列化指定的字段; 2026-03-31 15:54:17 +08:00
YBP
c04e3d70ad 修改文件分发/文件查看添加权限,重复记录更新过期日期 2026-03-31 15:03:13 +08:00
FCL
490d9978a9 fix:期间核查、检定校准细节调整 2026-03-31 10:48:54 +08:00
FCL
6e3183c1a1 Merge remote-tracking branch 'origin/test' into test 2026-03-31 10:40:15 +08:00
FCL
95ce4d5b1e fix:期间核查、检定校准细节调整 2026-03-31 10:40:11 +08:00
YBP
80981bea25 增加文件附件表 2026-03-30 21:15:21 +08:00
shusir
f76ca9e043 fix:物料检化验测试获取流程节点 2026-03-30 18:20:06 +08:00
shusir
d12f6be2b2 fix:物料检化验接口调整 2026-03-30 18:12:50 +08:00
wxr
5559145b7f 处理样品数量及检测项目 2026-03-30 13:48:04 +08:00
wxr
bff37a43d4 委托登记修改 2026-03-30 11:11:29 +08:00
shusir
a1264669a9 fix:标签二维码用json字符串,暂时只有code; 2026-03-30 10:34:54 +08:00
wxr
4307fe3c1d 二进制文件禁止对比 2026-03-27 18:43:38 +08:00
shusir
5882e7d84c Merge remote-tracking branch 'origin/test' into test 2026-03-27 18:08:58 +08:00
shusir
94b1fe6a9c fix:物料增加标签需要的字段 2026-03-27 18:08:23 +08:00