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

Accept Merge Request #203: (feature/sf刀具功能分支 -> develop)

Browse Source 
Merge Request: 智能工厂类型备注样式调整

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
This commit is contained in:
禹翔辉
2023-06-16 11:13:21 +08:00
parent 7d6bd9119b 062b50d34c
commit 8c9a211295
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/models/base.py
View File

@@ -73,7 +73,7 @@ class MachineTool(models.Model):
z_axis = fields.Integer('Z轴')
b_axis = fields.Integer('B轴')
c_axis = fields.Integer('C轴')
remark = fields.Text('备注')
remark = fields.Char('备注')
is_binding = fields.Boolean('是否绑定机床', default=False)
precision = fields.Float('加工精度')
control_system_id = fields.Many2one('sf.machine.control_system',
@@ -296,7 +296,7 @@ class MachineToolType(models.Model):
z_axis = fields.Integer('Z轴')
b_axis = fields.Integer('B轴')
c_axis = fields.Integer('C轴')
remark = fields.Text('备注')
remark = fields.Char('备注')
precision = fields.Float('加工精度')
control_system_id = fields.Many2one('sf.machine.control_system',
string="控制系统")

14
sf_base/models/tool_base.py
View File

@@ -53,7 +53,7 @@ class FunctionalCuttingToolModel(models.Model):
name = fields.Char('名称')
code = fields.Char('编码')
remark = fields.Text('备注')
remark = fields.Char('备注')
# 整体式刀具
@@ -94,7 +94,7 @@ class IntegralCuttingToolModel(models.Model):
name = fields.Char('名称')
# 关联刀具物料
cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
remark = fields.Text('备注')
remark = fields.Char('备注')
# 刀片
@@ -140,7 +140,7 @@ class BladeModel(models.Model):
cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
# 刀片类型字段，关联刀片对象
blade_ids = fields.One2many('sf.blade', 'blade_model_number', '刀片类型')
remark = fields.Text('备注')
remark = fields.Char('备注')
# 刀杆
@@ -180,7 +180,7 @@ class CutterBarModel(models.Model):
name = fields.Char('名称')
# 关联刀具物料
cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
remark = fields.Text('备注')
remark = fields.Char('备注')
# 刀盘
@@ -220,7 +220,7 @@ class CutterPadModel(models.Model):
name = fields.Char('名称')
# 关联刀具物料
cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
remark = fields.Text('备注')
remark = fields.Char('备注')
# 刀柄
@@ -260,7 +260,7 @@ class HandleModel(models.Model):
name = fields.Char('名称')
# 关联刀具物料
cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
remark = fields.Text('备注')
remark = fields.Char('备注')
# 夹头对象（夹头型号对象）
@@ -298,4 +298,4 @@ class ChuckModel(models.Model):
name = fields.Char('名称')
# 关联刀具物料
cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
remark = fields.Text('备注')
remark = fields.Char('备注')