Commit Graph

205 Commits

Author SHA1 Message Date
FCL
94757f31de Merge branch 'zt-test' into test 2025-11-25 09:36:47 +08:00
FCL
42afe2adb3 feat:qms阶段性提交:检验流程调整、报告、样品库等 2025-11-25 09:36:22 +08:00
FCL
5657f8cf09 feat:qms阶段性提交:检验流程调整、报告、样品库等 2025-11-25 09:34:25 +08:00
wxr
a49bee0abd Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-11-25 09:17:53 +08:00
wxr
d0673f36b1 自动火试金接口-未完 2025-11-25 09:17:39 +08:00
FCL
eaea741480 Merge remote-tracking branch 'origin/test' into test 2025-11-24 18:11:54 +08:00
FCL
44a6e11803 fix:样品库联调调整 2025-11-24 18:11:49 +08:00
wxr
cc79a15a16 参数错误修改 2025-11-24 15:07:02 +08:00
wxr
1e82c22284 超差判定修改 2025-11-24 14:50:13 +08:00
wxr
c2d067e47c Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-11-24 10:31:53 +08:00
wxr
92ec9454ba 结果判定修改 2025-11-24 10:26:51 +08:00
FCL
57041e4adc Merge remote-tracking branch 'origin/test' into test 2025-11-21 16:15:15 +08:00
FCL
a8580e1e30 fix:报告、样品库等细节 2025-11-21 16:14:58 +08:00
wxr
87fbd54692 fix 2025-11-21 11:35:10 +08:00
wxr
918f8465a9 修改T_BSN_SB_PRN_SMP_ASMT表名到T_BSN_SB_PRN_SMP_ASMT_PRJ 2025-11-21 11:34:56 +08:00
wxr
5ef620fa9a 修改表名T_BSN_SB_SMP_ASMT到T_BSN_SB_SMP_ASMT_PRJ 2025-11-21 10:44:16 +08:00
wxr
2b45f932dc 查询修改 2025-11-21 10:31:23 +08:00
wxr
6ca60e94cd 报表模板取消标记。BusinessControllerMarker 2025-11-20 18:08:18 +08:00
wxr
8b3bfe2083 添加班组送样 2025-11-20 17:50:19 +08:00
FCL
9037a27cb8 fix:报告细节 2025-11-19 18:09:02 +08:00
FCL
a26327d4e7 Merge remote-tracking branch 'origin/test' into test 2025-11-19 17:31:46 +08:00
FCL
3028d478fe fix:报告配置、权限细节调整 2025-11-19 17:31:36 +08:00
wxr
c6c44828e0 方法变更样品查询 2025-11-19 17:18:32 +08:00
wxr
1f8aebf598 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2025-11-19 17:04:28 +08:00
wxr
caba1edf4c 子样字段添加及查询修改 2025-11-19 17:04:21 +08:00
FCL
3c70d53533 fix:报告数据报错修复;增加固定字段的数据方式 2025-11-19 16:10:18 +08:00
FCL
0e07b41c22 fix:样品库细节调整 2025-11-19 14:21:11 +08:00
FCL
e6113058c0 fix:子样查询修改 2025-11-19 09:55:48 +08:00
wxr
5ec35399de 子样查询修改 2025-11-19 09:53:03 +08:00
FCL
ac2295cac9 feat:阶段性代码合并 2025-11-18 10:59:14 +08:00
FCL
36289be12b Merge branch 'refs/heads/zt-test' into test
# Conflicts:
#	pom.xml
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
#	zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java
2025-11-18 10:21:01 +08:00
wxr
c858ecf8b4 fix 2025-11-17 21:01:39 +08:00
wxr
18e4245eff 荧光数据错误修复 2025-11-17 20:38:23 +08:00
wxr
376902462b 时间格式化bug修复 2025-11-17 20:12:15 +08:00
FCL
c80aeece47 Merge remote-tracking branch 'origin/test' into test 2025-11-17 16:57:42 +08:00
FCL
12cd5a4d94 feat:样品库接口调整 2025-11-17 16:57:37 +08:00
wxr
524ea2687f 荧光线查询等修改 2025-11-17 16:44:09 +08:00
wxr
24a6e95f26 数据退回等bug修复 2025-11-17 10:00:15 +08:00
wxr
dddf21c94f 配料下发 2025-11-15 17:50:08 +08:00
wxr
6e3e604fca 荧光数据接口 2025-11-15 13:48:47 +08:00
FCL
4394c4ecf8 Merge remote-tracking branch 'origin/test' into test 2025-11-13 17:48:51 +08:00
FCL
e0f6d288b1 feat:样品库功能,开发基本完成,需进一步调细节。 报告数据微调 2025-11-13 17:48:34 +08:00
wxr
6e0886ca5b 荧光采集 2025-11-13 13:54:28 +08:00
wxr
c79590d36e 简码生成标签打印 2025-11-12 13:56:57 +08:00
wxr
6e39ca51c5 单样分析结果查询等 2025-11-11 20:57:56 +08:00
wxr
0c13b35433 分析保存等修改 2025-11-11 17:43:41 +08:00
wxr
398fd2d303 交叉审核 2025-11-10 20:40:45 +08:00
wxr
d7554b49dc 委托登记报表特殊处理日期格式给到锐浪报表 2025-11-10 20:10:38 +08:00
wxr
d9d63ab587 处理空白样样品编号为null导致bug 2025-11-10 18:16:48 +08:00
FCL
3afd68cbfe Merge remote-tracking branch 'origin/test' into test 2025-11-10 18:04:58 +08:00