jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,707 Commits 134 Branches 31 Tags
307bfa19f258bc345edacaa718784326bb32e2bf
Commit Graph

5707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
廖丹龙
307bfa19f2 Accept Merge Request #1921: (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/1921
 2025-03-18 15:55:27 +08:00
liaodanlong
83b051e0b9 材料型号同步添加材料代号 2025-03-18 15:51:56 +08:00
liaodanlong
5bbcd8ec23 材料型号同步添加材料代号 2025-03-18 15:46:22 +08:00
马广威
b211ffdff9 Accept Merge Request #1920: (feature/制造功能优化 -> develop) 
Merge Request: 修改模板样式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1920?initial=true
 2025-03-18 13:44:28 +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
廖丹龙
8c4c65a00f Accept Merge Request #1919: (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/1919
 2025-03-18 11:27:43 +08:00
liaodanlong
3642398724 表面工艺零件图号没有问题 2025-03-18 11:25:46 +08:00
禹翔辉
23bcf13d95 Accept Merge Request #1918: (feature/质检弹窗优化_2 -> 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/1918
 2025-03-18 11:22:47 +08:00
yuxianghui
6b78cb72b3 1、质检弹窗和数量应用弹窗顺序调整 2025-03-18 11:21:56 +08:00
马广威
fde508c563 Accept Merge Request #1917: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1917?initial=true
 2025-03-18 11:05:13 +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
禹翔辉
e0015f9d6b Accept Merge Request #1916: (feature/质检弹窗优化_1 -> develop) 
Merge Request: Merge branch 'feature/质检弹窗优化' into feature/质检弹窗优化_1

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1916
 2025-03-18 10:54:35 +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
马广威
f8b5871912 Accept Merge Request #1915: (feature/制造功能优化 -> develop) 
Merge Request: 修复模板不能下载问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1915?initial=true
 2025-03-18 10:40:19 +08:00
mgw
40a7c14b81 修复模板不能下载问题 2025-03-18 10:39:52 +08:00
马广威
dee616fbef Accept Merge Request #1914: (feature/制造功能优化 -> develop) 
Merge Request: 修复按钮规则；修复排程单取消

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1914?initial=true
 2025-03-18 09:44:20 +08:00
mgw
a2868a2581 修复按钮规则；修复排程单取消 2025-03-18 09:43:48 +08:00
禹翔辉
5e5c7e5512 Accept Merge Request #1913: (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/1913
 2025-03-17 17:31:43 +08:00
yuxianghui
117d90bd5c 质量检查弹出框顺序修改 2025-03-17 17:30:42 +08:00
廖丹龙
fb19a19b25 Accept Merge Request #1912: (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/1912
 2025-03-17 16:50:52 +08:00
liaodanlong
1311669814 材料型号同步修改时赋予默认值 2025-03-17 16:39:49 +08:00
liaodanlong
8347a8b029 零件图号零件名称无数据 问题修复 2025-03-17 16:05:42 +08:00
马广威
2cdad0cec4 Accept Merge Request #1911: (feature/制造功能优化 -> develop) 
Merge Request: 恢复报告

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1911
 2025-03-17 15:03:48 +08:00
mgw
7df5bea5b1 恢复报告 2025-03-17 15:03:17 +08:00
马广威
40965af4c0 Accept Merge Request #1910: (feature/制造功能优化 -> develop) 
Merge Request: 暂时不加载报告

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1910?initial=true
 2025-03-17 14:26:09 +08:00
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