jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购库存销售模块问题

Browse Source 
# Conflicts:
#	sf_base/models/tool_base_new.py
This commit is contained in:
jinling.yang
2024-01-09 16:55:19 +08:00
parent f82cb462cf 7f6025afc0
commit 4c3e7e40cb
13 changed files with 160 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_base/models/tool_base_new.py
View File

@@ -108,7 +108,6 @@ class CuttingToolModel(models.Model):
cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc')
feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz(整体式刀具)')
feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz(刀片)')
material_model_id = fields.Many2one('sf.materials.model', '材料型号')
# 适用夹头型号可以多选
# chuck_ids = fields.Many2many(