From b835103cefafa5581f27febb76fe4fa2bc3f1f35 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Fri, 16 Jun 2023 10:07:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A0=B9=E6=8D=AE=E6=89=80=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E7=B1=BB=E5=9E=8B=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=88=E8=AF=A5=E5=8A=9F=E8=83=BD=E5=B7=B2=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 691b7268..ae13cb56 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -58,6 +58,29 @@ class FunctionalCuttingToolEntity(models.Model): total = fields.Text(string='总计') # remark = fields.Text(string='备注/说明') + # @api.onchange('functional_cutting_tool_id') + # def get_functional_cutting_tool_info(self): + # for item in self: + # item.code = item.functional_cutting_tool_id.code, + # item.name = item.functional_cutting_tool_id.name, + # item.functional_model_number = item.functional_cutting_tool_id.functional_model_number, + # item.integral_model_number = item.functional_cutting_tool_id.integral_model_number, + # item.blade_model_number = item.functional_cutting_tool_id.blade_model_number, + # item.cutterbar_model_number = item.functional_cutting_tool_id.cutterbar_model_number, + # item.cutterpad_model_number = item.functional_cutting_tool_id.cutterpad_model_number, + # item.handle_model_number = item.functional_cutting_tool_id.handle_model_number, + # item.chuck_model_number = item.functional_cutting_tool_id.chuck_model_number, + # item.diameter = item.functional_cutting_tool_id.diameter, + # item.tool_grade = item.functional_cutting_tool_id.tool_grade, + # item.machining_accuracy = item.functional_cutting_tool_id.machining_accuracy, + # item.ctool_lengthode = item.functional_cutting_tool_id.tool_length, + # item.blade_number = item.functional_cutting_tool_id.blade_number, + # item.integral_blade_length = item.functional_cutting_tool_id.integral_blade_length, + # item.effective_blade_length = item.functional_cutting_tool_id.effective_blade_length, + # item.max_life = item.functional_cutting_tool_id.max_life, + # item.is_standard = item.functional_cutting_tool_id.is_standard, + # item.applicable_range = item.functional_cutting_tool_id.applicable_range, + @api.model def create(self, vals): From 062b50d34c0180987a6e6e684e2d3d75501b52d7 Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Fri, 16 Jun 2023 11:01:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A4=87=E6=B3=A8=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/base.py | 4 ++-- sf_base/models/tool_base.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sf_base/models/base.py b/sf_base/models/base.py index aeb0c0ac..b547f5b6 100644 --- a/sf_base/models/base.py +++ b/sf_base/models/base.py @@ -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="控制系统") diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py index 33426cd4..e396d82c 100644 --- a/sf_base/models/tool_base.py +++ b/sf_base/models/tool_base.py @@ -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('备注')