Commit Graph

17 Commits

Author SHA1 Message Date
yuxianghui
35afdd3b2a 刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块;新增每齿走刀量模型;整体式刀具物料新增关联每齿走刀量对象字段; 2023-09-08 10:20:52 +08:00
yuxianghui
c8129478d5 新增加工方式、刀尖特征、柄部类型、走刀方向、适合冷却液五个模型对象;刀具物料查询新增上述五个关联对象;对产品的整体式刀具物料能力参数进行补充。 2023-09-04 17:29:20 +08:00
jinling.yang
7174de3de6 产品模板的型号手动输入时型号对象的编码,联装类型,夹具物料字段的值显示 2023-08-25 15:46:41 +08:00
jinling.yang
55504c2725 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 2023-08-24 17:32:25 +08:00
jinling.yang
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:14:48 +08:00
jinling.yang
aea68f5239 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
# Conflicts:
#	sf_base/__manifest__.py
#	sf_base/models/__init__.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/sync_common.py
2023-06-27 16:40:58 +08:00
jinling.yang
d18b1808d9 新增同步夹具相关的定时器 2023-06-27 16:35:30 +08:00
mgw
65c8d4a4e9 sf刀具重构完成,同步方法测试完成 2023-06-25 16:44:10 +08:00
yuxianghui
3a8c65c8d1 解决sf代码冲突问题 2023-06-13 11:19:06 +08:00
mgw
bf3c7e2b4d sf刀具基础信息已初步建立 2023-06-08 14:58:40 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00
gqh
8776fc7d6c 合并代码 2022-11-07 11:21:31 +08:00
gqh
a49a24e9e6 合并代码 2022-11-07 10:59:22 +08:00
jinling.yang
002653957e 改造制造订单里的生成工单 2022-10-27 17:27:40 +08:00
jinling.yang
71a925334e 生成产品的BOM上的加工工序 2022-10-26 17:27:32 +08:00
gqh
14ef518bd5 注册机床 2022-10-08 15:43:44 +08:00
gqh
11b0675241 初次提交,智能工厂基础数据 2022-09-26 12:02:52 +08:00