From 2a964bc30ebe93e60faa8c99032cab6cc3d007c7 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 14 Nov 2023 16:48:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E7=BB=84?= =?UTF-8?q?=E8=A3=85=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BB=91=E5=AE=9A=E5=AF=B9=E8=B1=A1=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=88=80=E5=85=B7=E6=A0=87=E5=87=86=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E7=BB=84=E8=A3=85=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 37 ++++++++++--------- sf_tool_management/views/tool_base_views.xml | 2 +- sf_tool_management/wizard/wizard.py | 39 ++++++++++---------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 4b9edfe6..1fb775c3 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -688,45 +688,46 @@ class FunctionalToolAssembly(models.Model): # 整体式刀具型号 integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号', readonly=True) - cutting_tool_integral_model_id = fields.Many2one('sf.cutting.tool.material', string='整体式刀具型号', readonly=True) - integral_name = fields.Char('整体式刀具名称', readonly=True) + cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', readonly=True) + integral_name = fields.Char('整体式刀具名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', readonly=True) # 刀片型号 blade_code_id = fields.Many2one('stock.lot', '刀片序列号', readonly=True) - cutting_tool_blade_model_id = fields.Many2one('sf.cutting.tool.material', string='刀片型号', readonly=True) - blade_name = fields.Char('刀片名称', readonly=True) + cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', readonly=True) + blade_name = fields.Char('刀片名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True) # 刀杆型号 bar_code_id = fields.Many2one('stock.lot', '刀杆序列号', readonly=True) - cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting.tool.material', string='刀杆型号', readonly=True) - bar_name = fields.Char('刀杆名称', readonly=True) + cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', readonly=True) + bar_name = fields.Char('刀杆名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True) # 刀盘型号 pad_code_id = fields.Many2one('stock.lot', '刀盘序列号', readonly=True) - cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting.tool.material', string='刀盘型号', readonly=True) - pad_name = fields.Char('刀盘名称', readonly=True) + cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', readonly=True) + pad_name = fields.Char('刀盘名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) # 刀柄型号 handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', readonly=True) - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting.tool.material', string='刀柄型号', readonly=True) - handle_name = fields.Char('刀柄名称', readonly=True) + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', readonly=True) + handle_name = fields.Char('刀柄名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True) # 夹头型号 chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', readonly=True) - cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting.tool.material', string='夹头型号', readonly=True) - chuck_name = fields.Char('夹头名称', readonly=True) + cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', readonly=True) + chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) @api.depends('integral_code_id', 'blade_code_id', 'bar_code_id', 'pad_code_id', 'handle_code_id', 'chuck_code_id') def _compute_auto_fill(self): for record in self: if record.integral_code_id: - record.cutting_tool_integral_model_id = record.integral_code_id.product_id.cutting_tool_material_id.id + print(record.integral_code_id.product_id) + record.cutting_tool_integral_model_id = record.integral_code_id.product_id.cutting_tool_model_id.id record.integral_name = record.integral_code_id.product_id.name record.sf_tool_brand_id_1 = record.integral_code_id.product_id.brand_id.id else: @@ -734,7 +735,7 @@ class FunctionalToolAssembly(models.Model): record.integral_name = None record.sf_tool_brand_id_1 = None if record.blade_code_id: - record.cutting_tool_blade_model_id = record.blade_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_blade_model_id = record.blade_code_id.product_id.cutting_tool_model_id.id record.blade_name = record.blade_code_id.product_id.name record.sf_tool_brand_id_2 = record.blade_code_id.product_id.brand_id.id else: @@ -742,7 +743,7 @@ class FunctionalToolAssembly(models.Model): record.blade_name = None record.sf_tool_brand_id_2 = None if record.bar_code_id: - record.cutting_tool_cutterbar_model_id = record.bar_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterbar_model_id = record.bar_code_id.product_id.cutting_tool_model_id.id record.bar_name = record.bar_code_id.product_id.name record.sf_tool_brand_id_3 = record.bar_code_id.product_id.brand_id.id else: @@ -750,7 +751,7 @@ class FunctionalToolAssembly(models.Model): record.bar_name = None record.sf_tool_brand_id_3 = None if record.pad_code_id: - record.cutting_tool_cutterpad_model_id = record.pad_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterpad_model_id = record.pad_code_id.product_id.cutting_tool_model_id.id record.pad_name = record.pad_code_id.product_id.name record.sf_tool_brand_id_4 = record.pad_code_id.product_id.brand_id.id else: @@ -758,7 +759,7 @@ class FunctionalToolAssembly(models.Model): record.pad_name = None record.sf_tool_brand_id_4 = None if record.handle_code_id: - record.cutting_tool_cutterhandle_model_id = record.handle_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterhandle_model_id = record.handle_code_id.product_id.cutting_tool_model_id.id record.handle_name = record.handle_code_id.product_id.name record.sf_tool_brand_id_5 = record.handle_code_id.product_id.brand_id.id else: @@ -766,7 +767,7 @@ class FunctionalToolAssembly(models.Model): record.handle_name = None record.sf_tool_brand_id_5 = None if record.chuck_code_id: - record.cutting_tool_cutterhead_model_id = record.chuck_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterhead_model_id = record.chuck_code_id.product_id.cutting_tool_model_id.id record.chuck_name = record.chuck_code_id.product_id.name record.sf_tool_brand_id_6 = record.chuck_code_id.product_id.brand_id.id else: diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index c1495df7..a63e650f 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -796,7 +796,7 @@ - + diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 0c554ca9..53d7f28a 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -17,7 +17,8 @@ class ToolChangeRequirementInformation(models.TransientModel): functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True) # replacement_tool_code = fields.Char(string='待换功能刀具编码', readonly=True) - replacement_tool_name_id = fields.Many2one('product.product', string='待换功能刀具名称', ) + replacement_tool_name_id = fields.Many2one('product.product', string='待换功能刀具名称', + domain=[('name', '=', '功能刀具')]) replacement_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='待换功能刀具类型') replacement_tool_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精') @@ -139,42 +140,42 @@ class FunctionalToolAssemblyOrder(models.TransientModel): # 整体式刀具型号 integral_code_id = fields.Many2one('stock.lot', string='整体式刀具序列号', domain=[('product_id.cutting_tool_material_id.name', '=', '整体式刀具')]) - cutting_tool_integral_model_id = fields.Many2one('sf.cutting.tool.material', string='整体式刀具型号', readonly=True) + cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号', readonly=True) integral_name = fields.Char('整体式刀具名称', readonly=True) sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌', readonly=True) # 刀片型号 blade_code_id = fields.Many2one('stock.lot', '刀片序列号', domain=[('product_id.cutting_tool_material_id.name', '=', '刀片')]) - cutting_tool_blade_model_id = fields.Many2one('sf.cutting.tool.material', string='刀片型号', readonly=True) + cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号', readonly=True) blade_name = fields.Char('刀片名称', readonly=True) sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True) # 刀杆型号 bar_code_id = fields.Many2one('stock.lot', '刀杆序列号', domain=[('product_id.cutting_tool_material_id.name', '=', '刀杆')]) - cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting.tool.material', string='刀杆型号', readonly=True) + cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号', readonly=True) bar_name = fields.Char('刀杆名称', readonly=True) sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True) # 刀盘型号 pad_code_id = fields.Many2one('stock.lot', '刀盘序列号', domain=[('product_id.cutting_tool_material_id.name', '=', '刀盘')]) - cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting.tool.material', string='刀盘型号', readonly=True) + cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号', readonly=True) pad_name = fields.Char('刀盘名称', readonly=True) sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True) # 刀柄型号 handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄')]) - cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting.tool.material', string='刀柄型号', readonly=True) + cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号', readonly=True) handle_name = fields.Char('刀柄名称', readonly=True) sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True) # 夹头型号 chuck_code_id = fields.Many2one('stock.lot', '夹头序列号', domain=[('product_id.cutting_tool_material_id.name', '=', '夹头')]) - cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting.tool.material', string='夹头型号', readonly=True) + cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号', readonly=True) chuck_name = fields.Char('夹头名称', readonly=True, compute='_compute_auto_fill') sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True) @@ -207,7 +208,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): def _compute_auto_fill(self): for record in self: if record.integral_code_id: - record.cutting_tool_integral_model_id = record.integral_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_integral_model_id = record.integral_code_id.product_id.cutting_tool_model_id.id record.integral_name = record.integral_code_id.product_id.name record.sf_tool_brand_id_1 = record.integral_code_id.product_id.brand_id.id else: @@ -215,7 +216,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): record.integral_name = None record.sf_tool_brand_id_1 = None if record.blade_code_id: - record.cutting_tool_blade_model_id = record.blade_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_blade_model_id = record.blade_code_id.product_id.cutting_tool_model_id.id record.blade_name = record.blade_code_id.product_id.name record.sf_tool_brand_id_2 = record.blade_code_id.product_id.brand_id.id else: @@ -223,7 +224,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): record.blade_name = None record.sf_tool_brand_id_2 = None if record.bar_code_id: - record.cutting_tool_cutterbar_model_id = record.bar_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterbar_model_id = record.bar_code_id.product_id.cutting_tool_model_id.id record.bar_name = record.bar_code_id.product_id.name record.sf_tool_brand_id_3 = record.bar_code_id.product_id.brand_id.id else: @@ -231,7 +232,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): record.bar_name = None record.sf_tool_brand_id_3 = None if record.pad_code_id: - record.cutting_tool_cutterpad_model_id = record.pad_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterpad_model_id = record.pad_code_id.product_id.cutting_tool_model_id.id record.pad_name = record.pad_code_id.product_id.name record.sf_tool_brand_id_4 = record.pad_code_id.product_id.brand_id.id else: @@ -239,7 +240,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): record.pad_name = None record.sf_tool_brand_id_4 = None if record.handle_code_id: - record.cutting_tool_cutterhandle_model_id = record.handle_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterhandle_model_id = record.handle_code_id.product_id.cutting_tool_model_id.id record.handle_name = record.handle_code_id.product_id.name record.sf_tool_brand_id_5 = record.handle_code_id.product_id.brand_id.id else: @@ -247,7 +248,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): record.handle_name = None record.sf_tool_brand_id_5 = None if record.chuck_code_id: - record.cutting_tool_cutterhead_model_id = record.chuck_code_id.product_id.cutting_tool_material_id.id + record.cutting_tool_cutterhead_model_id = record.chuck_code_id.product_id.cutting_tool_model_id.id record.chuck_name = record.chuck_code_id.product_id.name record.sf_tool_brand_id_6 = record.chuck_code_id.product_id.brand_id.id else: @@ -302,12 +303,12 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'barcode_id': stock_lot.id, 'functional_tool_name_id': self.functional_tool_name_id.id, 'mrs_cutting_tool_type_id': self.functional_tool_type_id.id, - 'cutting_tool_integral_model_id': self.cutting_tool_integral_model_id.id, - 'cutting_tool_blade_model_id': self.cutting_tool_blade_model_id.id, - 'cutting_tool_cutterbar_model_id': self.cutting_tool_cutterbar_model_id.id, - 'cutting_tool_cutterpad_model_id': self.cutting_tool_cutterpad_model_id.id, - 'cutting_tool_cutterhandle_model_id': self.cutting_tool_cutterhandle_model_id.id, - 'cutting_tool_cutterhead_model_id': self.cutting_tool_cutterhead_model_id.id, + 'cutting_tool_integral_model_id': self.integral_code_id.product_id.id, + 'cutting_tool_blade_model_id': self.blade_code_id.product_id.id, + 'cutting_tool_cutterbar_model_id': self.bar_code_id.product_id.id, + 'cutting_tool_cutterpad_model_id': self.pad_code_id.product_id.id, + 'cutting_tool_cutterhandle_model_id': self.handle_code_id.product_id.id, + 'cutting_tool_cutterhead_model_id': self.chuck_code_id.product_id.id, 'diameter': self.functional_tool_diameter, 'tool_grade': None, 'machining_accuracy': None,