jikimo/jikimo_sf
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="控制系统")