mgw
|
0702e1dd51
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 18:26:58 +08:00 |
|
mgw
|
08fa26d9c8
|
调整报告样式
|
2025-03-21 18:25:20 +08:00 |
|
mgw
|
311b95bca5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 13:18:22 +08:00 |
|
mgw
|
c6f1bc80a7
|
调整原有质检单图纸获取逻辑
|
2025-03-21 13:15:59 +08:00 |
|
mgw
|
3f6f9bb709
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-20 15:44:11 +08:00 |
|
mgw
|
f85f614190
|
质检标准类型是出厂检验报告时可以更换控制方式-需要增加校验
|
2025-03-20 15:41:10 +08:00 |
|
mgw
|
49a1ec353a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-20 08:49:47 +08:00 |
|
mgw
|
d6a7a3c919
|
取消发布增加二次确认；发布状态隐藏
|
2025-03-20 08:45:40 +08:00 |
|
mgw
|
70b21c607e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 16:31:48 +08:00 |
|
mgw
|
be0df6e66b
|
调整报告逻辑
|
2025-03-18 16:26:39 +08:00 |
|
mgw
|
282458c945
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 13:45:19 +08:00 |
|
mgw
|
cb445393ce
|
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-18 13:43:36 +08:00 |
|
hyyy
|
25ba61607f
|
修改模板样式
|
2025-03-18 13:42:42 +08:00 |
|
胡尧
|
f6e87493d3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-18 11:28:23 +08:00 |
|
yuxianghui
|
6b78cb72b3
|
1、质检弹窗和数量应用弹窗顺序调整
|
2025-03-18 11:21:56 +08:00 |
|
mgw
|
b65682f5c9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-18 11:04:36 +08:00 |
|
mgw
|
bfe9c51d57
|
处理质检可能存在多个出厂检验报告问题
|
2025-03-18 11:04:19 +08:00 |
|
yuxianghui
|
24166c2e71
|
Merge branch 'feature/质检弹窗优化' into feature/质检弹窗优化_1
|
2025-03-18 10:53:29 +08:00 |
|
yuxianghui
|
8fb90c1c35
|
调拨验证提示数据信息优化
|
2025-03-18 10:52:34 +08:00 |
|
mgw
|
4618c83b2f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 09:45:00 +08:00 |
|
mgw
|
a2868a2581
|
修复按钮规则；修复排程单取消
|
2025-03-18 09:43:48 +08:00 |
|
mgw
|
e89400f04e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-18 09:18:47 +08:00 |
|
yuxianghui
|
117d90bd5c
|
质量检查弹出框顺序修改
|
2025-03-17 17:30:42 +08:00 |
|
胡尧
|
051f8128e9
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-17 15:05:47 +08:00 |
|
mgw
|
7df5bea5b1
|
恢复报告
|
2025-03-17 15:03:17 +08:00 |
|
mgw
|
21876f4b9d
|
暂时不加载报告
|
2025-03-17 14:25:40 +08:00 |
|
mgw
|
d280d2b776
|
暂时屏蔽工厂名称
|
2025-03-17 14:18:07 +08:00 |
|
禹翔辉
|
3ce7f1771a
|
Merge branch refs/heads/develop into refs/heads/feature/质量检查弹出框优化
|
2025-03-17 13:52:03 +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
|
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
|
67f3c29af3
|
调整二维码内容
|
2025-03-14 17:58:22 +08:00 |
|
mgw
|
5d703b8b73
|
缓存报告附件，并清理旧附件
|
2025-03-14 17:44:57 +08:00 |
|
胡尧
|
a6a2e53111
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-14 13:52:18 +08:00 |
|
mgw
|
c23aa4de75
|
调整报告样式
|
2025-03-14 11:13:50 +08:00 |
|
mgw
|
f9525beb65
|
调整发布业务逻辑
|
2025-03-14 10:44:54 +08:00 |
|
mgw
|
35bcfa6fa1
|
调整按钮
|
2025-03-14 09:50:13 +08:00 |
|
mgw
|
424a496046
|
调整预览报表model名字
|
2025-03-13 18:33:26 +08:00 |
|
mgw
|
bd2ba3bb49
|
添加合格图章
|
2025-03-13 17:55:13 +08:00 |
|
mgw
|
c632926348
|
调整报表展示
|
2025-03-13 17:07:07 +08:00 |
|
yuxianghui
|
cd114d183b
|
处理质检单控制方式为非数量时，调拨单验证时存在不合格质检单的提示信息数量问题
|
2025-03-13 16:45:09 +08:00 |
|
mgw
|
f780d47562
|
发布相关
|
2025-03-13 16:12:48 +08:00 |
|
mgw
|
04b255d5c6
|
检测报告发布流程
|
2025-03-13 14:10:06 +08:00 |
|
胡尧
|
53779b89a7
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 13:06:26 +08:00 |
|
yuxianghui
|
9d042dc61e
|
1、处理调拨单二次验证时其他提示信息窗口直接关闭问题；2、处理特殊途径-制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 问题
|
2025-03-13 13:02:22 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
mgw
|
d577630657
|
增加报告相关结构
|
2025-03-12 14:06:03 +08:00 |
|