mgw
|
21876f4b9d
|
暂时不加载报告
|
2025-03-17 14:25:40 +08:00 |
|
马广威
|
5a8df0a1ae
|
Accept Merge Request #1909: (feature/制造功能优化 -> develop)
Merge Request: 暂时屏蔽工厂名称
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1909?initial=true
|
2025-03-17 14:18:43 +08:00 |
|
mgw
|
d280d2b776
|
暂时屏蔽工厂名称
|
2025-03-17 14:18:07 +08:00 |
|
禹翔辉
|
323a204a48
|
Accept Merge Request #1907: (feature/质量检查弹出框优化 -> develop)
Merge Request: 质量检查弹出框顺序修改
Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1907
|
2025-03-17 13:52:58 +08:00 |
|
禹翔辉
|
3ce7f1771a
|
Merge branch refs/heads/develop into refs/heads/feature/质量检查弹出框优化
|
2025-03-17 13:52:03 +08:00 |
|
马广威
|
e1dc2bde7e
|
Accept Merge Request #1908: (feature/制造功能优化 -> develop)
Merge Request: 出厂检验报告
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1908?initial=true
|
2025-03-17 13:49:25 +08:00 |
|
mgw
|
495f1962df
|
恢复流程控制
|
2025-03-17 13:47:56 +08:00 |
|
mgw
|
221eb7c3a1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
# Conflicts:
# quality_control/security/ir.model.access.csv
# quality_control/wizard/quality_check_wizard.py
# sf_quality/__manifest__.py
# sf_quality/models/__init__.py
# sf_quality/models/stock.py
|
2025-03-17 13:46:40 +08:00 |
|
mgw
|
af529d21ec
|
调整报告公开可访问
|
2025-03-17 13:39:59 +08:00 |
|
liaodanlong
|
0a1b48ed93
|
零件图号零件名称数据填充
|
2025-03-17 11:26:42 +08:00 |
|
mgw
|
db881ac594
|
调整报告格式
|
2025-03-17 11:26:29 +08:00 |
|
mgw
|
61776ca6a3
|
完善出厂报告需求功能
|
2025-03-17 11:14:20 +08:00 |
|
yuxianghui
|
6da31b4f48
|
质量检查弹出框顺序修改
|
2025-03-17 10:54:18 +08:00 |
|
mgw
|
84f74ae09f
|
出库单写入报告到bfm
|
2025-03-17 09:34:47 +08:00 |
|
mgw
|
561b515242
|
调整数据类型
|
2025-03-17 09:12:44 +08:00 |
|
mgw
|
71e79502f9
|
增加报告写入bfm方法
|
2025-03-14 19:59:13 +08:00 |
|
mgw
|
67f3c29af3
|
调整二维码内容
|
2025-03-14 17:58:22 +08:00 |
|
mgw
|
5d703b8b73
|
缓存报告附件，并清理旧附件
|
2025-03-14 17:44:57 +08:00 |
|
mgw
|
7755cc3982
|
优化接口;质量检查wizard添加发布按钮
|
2025-03-14 15:45:45 +08:00 |
|
管欢
|
34565c5d79
|
Accept Merge Request #1906: (feature/优化调拨列表 -> develop)
Merge Request: 修复外协入库单根据图号查询不到
Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1906
|
2025-03-14 15:43:18 +08:00 |
|
mgw
|
0f537a3158
|
增加文件下载功能
|
2025-03-14 14:54:13 +08:00 |
|
mgw
|
7f99b4ba8b
|
记录历史报告名字、增加状态修改
|
2025-03-14 14:22:25 +08:00 |
|
mgw
|
4138903bff
|
调整向导提示语逻辑
|
2025-03-14 14:02:14 +08:00 |
|
mgw
|
4200fdbf3b
|
限制可上传文件类型
|
2025-03-14 13:52:54 +08:00 |
|
mgw
|
214f45850e
|
增加对新增删除行的控制
|
2025-03-14 12:58:26 +08:00 |
|
mgw
|
c23aa4de75
|
调整报告样式
|
2025-03-14 11:13:50 +08:00 |
|
hyyy
|
f66ff6339d
|
修改
|
2025-03-14 10:52:50 +08:00 |
|
mgw
|
f9525beb65
|
调整发布业务逻辑
|
2025-03-14 10:44:54 +08:00 |
|
mgw
|
35bcfa6fa1
|
调整按钮
|
2025-03-14 09:50:13 +08:00 |
|
mgw
|
7b6dda3d75
|
重新发布按钮也增加二次确认
|
2025-03-13 19:17:49 +08:00 |
|
mgw
|
954ff6b848
|
对发布按钮进行二次确认控制
|
2025-03-13 19:13:57 +08:00 |
|
mgw
|
af3a2880e8
|
添加发布前校验数据
|
2025-03-13 18:55:59 +08:00 |
|
mgw
|
424a496046
|
调整预览报表model名字
|
2025-03-13 18:33:26 +08:00 |
|
mgw
|
bd2ba3bb49
|
添加合格图章
|
2025-03-13 17:55:13 +08:00 |
|
mgw
|
2d4926f8b7
|
优化上传逻辑
|
2025-03-13 17:23:26 +08:00 |
|
hyyy
|
9d84b68525
|
修改报错问题
|
2025-03-13 17:21:22 +08:00 |
|
guanhuan
|
3baf3e60e8
|
修复外协入库单根据图号查询不到
|
2025-03-13 17:21:05 +08:00 |
|
mgw
|
16dbfc3867
|
限制测量列数
|
2025-03-13 17:13:51 +08:00 |
|
hyyy
|
6de31608d1
|
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-13 17:07:26 +08:00 |
|
hyyy
|
73ce21ef99
|
优化，修复bug
|
2025-03-13 17:07:19 +08:00 |
|
mgw
|
c632926348
|
调整报表展示
|
2025-03-13 17:07:07 +08:00 |
|
禹翔辉
|
a421055348
|
Accept Merge Request #1903: (feature/工单Rfid优化 -> develop)
Merge Request: 1、完成 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错
Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1903
|
2025-03-13 16:47:39 +08:00 |
|
yuxianghui
|
cd114d183b
|
处理质检单控制方式为非数量时，调拨单验证时存在不合格质检单的提示信息数量问题
|
2025-03-13 16:45:09 +08:00 |
|
mgw
|
20efa0bdab
|
去除重复声明
|
2025-03-13 16:44:03 +08:00 |
|
mgw
|
839b3c981d
|
配合前端列数修改
|
2025-03-13 16:39:10 +08:00 |
|
廖丹龙
|
395db2cf5f
|
Accept Merge Request #1904: (feature/tool_standard_library_process -> develop)
Merge Request: 删除无用代码
Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1904
|
2025-03-13 16:21:00 +08:00 |
|
黄焱
|
1ca069b149
|
Accept Merge Request #1905: (feature/前端样式修改 -> develop)
Merge Request: 取消销售订单的下游清单界面优化
Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1905
|
2025-03-13 16:14:31 +08:00 |
|
mgw
|
061714413c
|
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-13 16:13:09 +08:00 |
|
mgw
|
f780d47562
|
发布相关
|
2025-03-13 16:12:48 +08:00 |
|
hyyy
|
082e25feae
|
增加添加删除列
|
2025-03-13 16:10:43 +08:00 |
|