Commit Graph

412 Commits

Author SHA1 Message Date
FCL
0fe155e89b Merge remote-tracking branch 'origin/test' into test 2026-02-24 14:04:02 +08:00
YBP
b8c89d5f78 文件记录分类明细修改文件上传bug 2026-02-24 13:36:13 +08:00
FCL
195703718d fix:调试用代码 2026-02-24 10:42:14 +08:00
wxr
c8774d3954 fix bug修复 2026-02-23 15:44:41 +08:00
wxr
0c31940e55 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-02-23 13:42:26 +08:00
wxr
0851f33efd 任务分配等修改 2026-02-23 13:42:13 +08:00
YBP
4228b49bf5 文件记录分类明细-删除-文件上传 2026-02-12 18:12:36 +08:00
YBP
9b80219390 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-02-12 18:12:25 +08:00
lrx
26eb271f06 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-02-12 18:09:07 +08:00
lrx
3d392054c1 fix:配料元素提交bug修改 2026-02-12 18:08:56 +08:00
shusir
fdd3657ba9 fix:物料出入库更新预警级别、大类删除检查、入库返回明细数据标签打印; 2026-02-12 17:23:32 +08:00
YBP
bafdcd501d 文件记录分类明细-修改-历史版本 2026-02-12 15:15:06 +08:00
lrx
0aacc686a6 fix:分析-下发自动火试金任务,查询为空优化 2026-02-12 13:53:34 +08:00
FCL
3ab81a8ead feat:通用附件上传和查看组件及示例 2026-02-12 12:03:32 +08:00
FCL
f9695c983a Merge remote-tracking branch 'origin/test' into test 2026-02-12 11:11:20 +08:00
FCL
e42a48f9b3 feat:Dict注解支持单个对象返回的场景 2026-02-12 11:11:08 +08:00
shusir
ba696174ab fix:库存预警级别 2026-02-11 17:56:38 +08:00
shusir
4a94b0c841 fix:申请过和非申请的溶液配置 2026-02-11 16:47:31 +08:00
wxr
112a9f935d 商检综合样,如果没有需要赋值的,则不处理 2026-02-11 16:25:52 +08:00
YBP
27070fd8ad 文件记录分类更新-修改 2026-02-11 15:37:57 +08:00
YBP
68de07f232 文件记录 2026-02-11 14:06:40 +08:00
shusir
f13e72d8d0 feat:溶液配置 2026-02-10 18:07:10 +08:00
wxr
b315bec634 试金发起复检委托时,配料需要带上。 2026-02-09 20:18:30 +08:00
shusir
3769261039 fix:物料入库 2026-02-09 18:05:59 +08:00
wxr
044053bc33 方法变更bug修复 2026-02-09 11:47:50 +08:00
wxr
24a5b4b231 来样品位bug修复 2026-02-09 10:53:32 +08:00
shusir
0b2d10e662 fix:物料入库、物料库存相关接口 2026-02-06 18:02:00 +08:00
wxr
a7e82da877 来源品位赋值 2026-02-06 16:58:45 +08:00
wxr
6c90826af3 匹配修改 2026-02-06 15:56:31 +08:00
wxr
600540862a 配料取数及设置修改 2026-02-06 15:04:52 +08:00
shusir
c6f4034685 fix:物料新增入库 2026-02-05 18:02:28 +08:00
wxr
e29c43032c 样品委托提交时参数中配置了默认值,业务参数添加默认值 2026-02-05 17:24:39 +08:00
wxr
83fe91812d 任务分配报错bug修复 2026-02-05 17:18:10 +08:00
shusir
50cfdea28d Merge remote-tracking branch 'origin/test' into test 2026-02-05 08:32:13 +08:00
wxr
7d8a5c1e88 荧光线、分析时间等修改 2026-02-04 19:31:41 +08:00
FCL
9014e8bcc8 Merge remote-tracking branch 'origin/test' into test 2026-02-04 18:21:51 +08:00
FCL
fa43a6579a 报告增加属性 2026-02-04 18:07:42 +08:00
shusir
d5b40bfba0 feat:准备物料入库接口 2026-02-04 18:03:51 +08:00
wxr
33b5ec7be5 Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test 2026-02-04 16:18:01 +08:00
wxr
5a82d9abd8 任务分配及分析任务提交时配料值赋值 2026-02-04 16:17:51 +08:00
shusir
a96fa0ed9b fix:物料验收流程 2026-02-03 18:02:09 +08:00
shusir
8121c7a97f fix:调整物料验收接口 2026-02-02 18:09:24 +08:00
wxr
a8330ade63 方法变更修改 2026-02-02 17:54:20 +08:00
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