jikimo/test
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
This commit is contained in:
jinling.yang
2023-06-29 17:14:48 +08:00
parent aea68f5239 3907901dc3
commit 0f7f67aade
141 changed files with 20125 additions and 4856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/models/fixture.py
View File

@@ -41,7 +41,7 @@ class FixtureModel(models.Model):
clamp_workpiece_height_max = fields.Char(string="夹持工件高度MAX[mm]")
clamp_workpiece_diameter_max = fields.Char(string="夹持工件直径MAX[mm]")
maximum_carrying_weight = fields.Char(string="最大承载重量[kg]")
Maximum_clamping_force = fields.Char(string="最大夹持力[n]")
maximum_clamping_force = fields.Char(string="最大夹持力[n]")
materials_model_id = fields.Many2one('sf.materials.model', string="材料型号")
driving_way = fields.Char(string="驱动方式")
apply_machine_tool_type = fields.Char(string="适用机床型号")