Commit Graph

429 Commits

Author SHA1 Message Date
wxr
e9259122b7 人工配料bug修复 2026-01-31 14:51:58 +08:00
wxr
fbd13f50d4 任务单添加配料方式 2026-01-31 13:43:58 +08:00
shusir
58ab9961c4 feat:物料验收流程接口 2026-01-30 17:16:02 +08:00
wxr
3302a2ee7c 补正系数修改 2026-01-30 16:58:32 +08:00
FCL
1bbfa9a950 Merge remote-tracking branch 'origin/test' into test 2026-01-30 14:57:29 +08:00
shusir
57bf9b0cd5 Merge remote-tracking branch 'origin/test' into test 2026-01-30 14:17:21 +08:00
shusir
5bf435b08e fix:完善批次接口,准备物料验收入库模块及验收新建接口。 2026-01-30 14:16:54 +08:00
FCL
3bf8ee09b7 Merge remote-tracking branch 'origin/test' into test 2026-01-30 14:09:44 +08:00
FCL
4444d9e3c0 fix:报告编制细节修复 2026-01-30 14:09:32 +08:00
wxr
9348c33f1b 补正系数、人工还是自动配料 2026-01-30 09:31:58 +08:00
wxr
969fb2edf7 公式计算bug修复 2026-01-29 19:05:28 +08:00
wxr
e6d08d975f Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-29 19:05:01 +08:00
wxr
3cd25f68ef 复检时分析的任务节点修改 2026-01-29 19:01:42 +08:00
shusir
5a03ed1cab fix:新增物料批次提交,物料大类删除校验。 2026-01-29 17:56:30 +08:00
shusir
1c5588a05a fix:调整物料批次接口 2026-01-29 15:39:16 +08:00
FCL
2111c8b3ad feat:设备管理流程类功能开发 2026-01-29 15:25:45 +08:00
shusir
675e1fe850 fix:接口完善,新增库存管理的物料分页列表 2026-01-28 18:01:06 +08:00
FCL
c7d4399e53 feat:设备流程接口 2026-01-28 17:43:19 +08:00
FCL
2fae2ccac2 fix:供应商接口去除权限注解 2026-01-28 16:27:40 +08:00
shusir
533b96fb6a fix:接口完善 2026-01-28 09:00:33 +08:00
shusir
525d588c20 fix:调整物料分类/大类创建接口,新家删除和详情接口 2026-01-27 12:00:20 +08:00
wxr
be2f28cef5 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-27 11:18:20 +08:00
wxr
ce9aff5583 中铜国贸商检委托也提前生成样品编号,与来样编号一致 2026-01-27 11:18:11 +08:00
FCL
71206f43a3 fix:代码调试 2026-01-27 11:15:23 +08:00
shusir
0d164c660e fix:新增物料批次接口及批次拆分及接口。 2026-01-26 18:05:23 +08:00
wxr
2336c370fa 检验委托的一般委托和仲裁委托修改 2026-01-26 17:54:27 +08:00
wxr
a578426458 样品收样不再判断样品在那个分析室 2026-01-26 14:02:35 +08:00
wxr
892596fc2e Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-01-26 13:37:07 +08:00
wxr
50a868e0a0 班组送样等bug修复 2026-01-26 13:36:56 +08:00
shusir
99b6521c19 Merge remote-tracking branch 'origin/test' into test 2026-01-26 09:03:02 +08:00
shusir
215ec8b5aa feat:新增物料分类,物料大类的新建与树列表及分页列表。 2026-01-26 08:59:16 +08:00
wxr
b408d1e726 修改pom文件,liteflow版本管理前移,防止被父liteflow版本覆盖 2026-01-24 11:15:19 +08:00
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