From 0fa2656aad6902c19090a2fa37c1de121f52217a Mon Sep 17 00:00:00 2001 From: yuxianghui <1608204036@qq.com> Date: Mon, 21 Aug 2023 10:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E7=9A=84=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 120 +++---- sf_tool_management/views/tool_base_views.xml | 344 ++++++++++++------- 2 files changed, 288 insertions(+), 176 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index f780dad9..d39b92fa 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -52,18 +52,18 @@ class FunctionalCuttingToolEntity(models.Model): 'sf_functional_cutting_tool_entity_id', string='夹头型号', domain= [('cutting_tool_type', '=', '夹头')]) - cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - - @api.onchange('cutting_tool_material') - def _onchange_cutting_tool_material(self): - for record in self: - if record: - if record.cutting_tool_material == '1': - record.mrs_cutting_tool_integral_model_ids = None - if record.cutting_tool_material == '0': - record.mrs_cutting_tool_blade_model_ids = None - record.mrs_cutting_tool_cutterbar_model_ids = None - record.mrs_cutting_tool_cutterpad_model_ids = None + # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + # + # @api.onchange('cutting_tool_material') + # def _onchange_cutting_tool_material(self): + # for record in self: + # if record: + # if record.cutting_tool_material == '1': + # record.mrs_cutting_tool_integral_model_ids = None + # if record.cutting_tool_material == '0': + # record.mrs_cutting_tool_blade_model_ids = None + # record.mrs_cutting_tool_cutterbar_model_ids = None + # record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)') @@ -126,18 +126,18 @@ class FunctionalCuttingToolEntityCache(models.Model): 'sf_functional_cutting_tool_entity_cache_id', string='夹头型号', domain= [('cutting_tool_type', '=', '夹头')]) - cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - - @api.onchange('cutting_tool_material') - def _onchange_cutting_tool_material(self): - for record in self: - if record: - if record.cutting_tool_material == '1': - record.mrs_cutting_tool_integral_model_ids = None - if record.cutting_tool_material == '0': - record.mrs_cutting_tool_blade_model_ids = None - record.mrs_cutting_tool_cutterbar_model_ids = None - record.mrs_cutting_tool_cutterpad_model_ids = None + # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + # + # @api.onchange('cutting_tool_material') + # def _onchange_cutting_tool_material(self): + # for record in self: + # if record: + # if record.cutting_tool_material == '1': + # record.mrs_cutting_tool_integral_model_ids = None + # if record.cutting_tool_material == '0': + # record.mrs_cutting_tool_blade_model_ids = None + # record.mrs_cutting_tool_cutterbar_model_ids = None + # record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)') @@ -203,18 +203,18 @@ class FunctionalToolWarning(models.Model): string='夹头型号', readonly=True, domain=[('cutting_tool_type', '=', '夹头')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - - @api.onchange('cutting_tool_material') - def _onchange_cutting_tool_material(self): - for record in self: - if record: - if record.cutting_tool_material == '1': - record.mrs_cutting_tool_integral_model_ids = None - if record.cutting_tool_material == '0': - record.mrs_cutting_tool_blade_model_ids = None - record.mrs_cutting_tool_cutterbar_model_ids = None - record.mrs_cutting_tool_cutterpad_model_ids = None + # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + # + # @api.onchange('cutting_tool_material') + # def _onchange_cutting_tool_material(self): + # for record in self: + # if record: + # if record.cutting_tool_material == '1': + # record.mrs_cutting_tool_integral_model_ids = None + # if record.cutting_tool_material == '0': + # record.mrs_cutting_tool_blade_model_ids = None + # record.mrs_cutting_tool_cutterbar_model_ids = None + # record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], @@ -329,18 +329,18 @@ class RealTimeDistributionOfFunctionalTools(models.Model): string='夹头型号', readonly=True, domain=[('cutting_tool_type', '=', '夹头')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - - @api.onchange('cutting_tool_material') - def _onchange_cutting_tool_material(self): - for record in self: - if record: - if record.cutting_tool_material == '1': - record.mrs_cutting_tool_integral_model_ids = None - if record.cutting_tool_material == '0': - record.mrs_cutting_tool_blade_model_ids = None - record.mrs_cutting_tool_cutterbar_model_ids = None - record.mrs_cutting_tool_cutterpad_model_ids = None + # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + # + # @api.onchange('cutting_tool_material') + # def _onchange_cutting_tool_material(self): + # for record in self: + # if record: + # if record.cutting_tool_material == '1': + # record.mrs_cutting_tool_integral_model_ids = None + # if record.cutting_tool_material == '0': + # record.mrs_cutting_tool_blade_model_ids = None + # record.mrs_cutting_tool_cutterbar_model_ids = None + # record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], @@ -450,18 +450,18 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model): string='夹头型号', readonly=True, domain=[('cutting_tool_type', '=', '夹头')], related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids') - cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') - - @api.onchange('cutting_tool_material') - def _onchange_cutting_tool_material(self): - for record in self: - if record: - if record.cutting_tool_material == '1': - record.mrs_cutting_tool_integral_model_ids = None - if record.cutting_tool_material == '0': - record.mrs_cutting_tool_blade_model_ids = None - record.mrs_cutting_tool_cutterbar_model_ids = None - record.mrs_cutting_tool_cutterpad_model_ids = None + # cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0') + # + # @api.onchange('cutting_tool_material') + # def _onchange_cutting_tool_material(self): + # for record in self: + # if record: + # if record.cutting_tool_material == '1': + # record.mrs_cutting_tool_integral_model_ids = None + # if record.cutting_tool_material == '0': + # record.mrs_cutting_tool_blade_model_ids = None + # record.mrs_cutting_tool_cutterbar_model_ids = None + # record.mrs_cutting_tool_cutterpad_model_ids = None diameter = fields.Float('直径(mm)', readonly=True, related='functional_cutting_tool_id.diameter') tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')], diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 02ab3ce6..361ea14a 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -35,36 +35,64 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,36 +194,64 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -335,36 +391,64 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -492,36 +576,64 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +