Commit Graph

156 Commits

Author SHA1 Message Date
mgw
d0d1a640d9 调整报告页码 2025-04-08 10:10:36 +08:00
mgw
f912a81e7b 调整报告产品取值 2025-04-08 09:48:05 +08:00
mgw
5bf86930e9 调整页脚布局 2025-03-28 14:23:41 +08:00
mgw
1a5c8e5f56 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-28 14:01:17 +08:00
mgw
8b1e12eb9f 质检报告优化 2025-03-28 14:00:55 +08:00
liaodanlong
d2155b17b4 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process
# Conflicts:
#	sf_manufacturing/models/product_template.py
2025-03-26 17:01:13 +08:00
mgw
f011c1efda 调整报告样式 2025-03-25 15:00:18 +08:00
mgw
3285d4da57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-25 10:35:00 +08:00
mgw
b39281d057 调整报告编号 2025-03-25 10:32:12 +08:00
mgw
16ae845ad9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-24 13:41:39 +08:00
mgw
85789d137b 修复线上pdf版本报告变形 2025-03-24 13:35:43 +08:00
mgw
d2b02bb6f7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-24 11:03:07 +08:00
mgw
a5c5b499f1 调整报告样式 2025-03-24 11:00:49 +08:00
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