|
|
3b306b4137
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-27 14:16:56 +08:00 |
|
|
|
9b99e41676
|
下发配料添加检查是否都存在配料必填数据
|
2025-11-27 14:16:44 +08:00 |
|
FCL
|
1dbbeba233
|
Merge remote-tracking branch 'origin/test' into test
|
2025-11-27 11:42:19 +08:00 |
|
FCL
|
b92d61648f
|
fix:样品库接口调整
|
2025-11-27 11:42:14 +08:00 |
|
|
|
b85eb7ea91
|
原始记录单，无数据时bug修复
|
2025-11-27 10:19:53 +08:00 |
|
|
|
76069855ec
|
新增内部简码标签打印数据查询
|
2025-11-27 09:44:08 +08:00 |
|
|
|
e133ec82c8
|
样品接收查询修改
|
2025-11-26 17:59:27 +08:00 |
|
|
|
be75cb4cf9
|
结果报送，bug修复
|
2025-11-26 16:09:25 +08:00 |
|
|
|
b320d36181
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-26 15:01:29 +08:00 |
|
FCL
|
172f04a260
|
fix:样品库接口调整
|
2025-11-26 12:00:22 +08:00 |
|
|
|
821ce6a7cf
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-26 10:43:01 +08:00 |
|
FCL
|
c7fe2db73c
|
fix:样品库接口调整
|
2025-11-26 10:38:57 +08:00 |
|
|
|
984ae17431
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-26 10:25:24 +08:00 |
|
|
|
4fd689c530
|
分析任务加上分析人员id。自动配料根据分析人员id查询用户数据，设置分析人账号。
|
2025-11-26 10:25:13 +08:00 |
|
FCL
|
2c377a76ec
|
fix:样品库接口调整
|
2025-11-26 09:38:43 +08:00 |
|
FCL
|
d25658f202
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java
|
2025-11-26 08:44:33 +08:00 |
|
FCL
|
a3a31d8600
|
fix:样品库接口调整
|
2025-11-25 18:21:59 +08:00 |
|
|
|
daafd3ae37
|
fix
|
2025-11-25 17:37:10 +08:00 |
|
|
|
91df898e09
|
自动火试金配料接口
|
2025-11-25 14:46:36 +08:00 |
|
FCL
|
baa7884fd7
|
fix:报告明细数据接口改造，修改“固定列”的处理逻辑
|
2025-11-25 14:09:46 +08:00 |
|
FCL
|
94757f31de
|
Merge branch 'zt-test' into test
|
2025-11-25 09:36:47 +08:00 |
|
FCL
|
5657f8cf09
|
feat:qms阶段性提交:检验流程调整、报告、样品库等
|
2025-11-25 09:34:25 +08:00 |
|
|
|
a49bee0abd
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-25 09:17:53 +08:00 |
|
|
|
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 |
|
|
|
cc79a15a16
|
参数错误修改
|
2025-11-24 15:07:02 +08:00 |
|
|
|
1e82c22284
|
超差判定修改
|
2025-11-24 14:50:13 +08:00 |
|
|
|
c2d067e47c
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-24 10:31:53 +08:00 |
|
|
|
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 |
|
|
|
87fbd54692
|
fix
|
2025-11-21 11:35:10 +08:00 |
|
|
|
918f8465a9
|
修改T_BSN_SB_PRN_SMP_ASMT表名到T_BSN_SB_PRN_SMP_ASMT_PRJ
|
2025-11-21 11:34:56 +08:00 |
|
|
|
5ef620fa9a
|
修改表名T_BSN_SB_SMP_ASMT到T_BSN_SB_SMP_ASMT_PRJ
|
2025-11-21 10:44:16 +08:00 |
|
|
|
2b45f932dc
|
查询修改
|
2025-11-21 10:31:23 +08:00 |
|
|
|
6ca60e94cd
|
报表模板取消标记。BusinessControllerMarker
|
2025-11-20 18:08:18 +08:00 |
|
|
|
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 |
|
|
|
c6c44828e0
|
方法变更样品查询
|
2025-11-19 17:18:32 +08:00 |
|
|
|
1f8aebf598
|
Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test
|
2025-11-19 17:04:28 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
