From cbc9264b2c7957a807aca57855b006ea0609665a Mon Sep 17 00:00:00 2001 From: "JIKIMO-YXH\\xianghui" <3437689193@qq.com> Date: Wed, 1 Nov 2023 17:26:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96CAM=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E7=BB=84=E8=A3=85=E5=8D=95=E4=B8=AD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E5=90=8D=E7=A7=B0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=BB=84=E8=A3=85=E5=8D=95=E7=AD=89=E7=9A=84form?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E5=8E=BB=E9=99=A4=E7=BB=84=E8=A3=85=E5=8D=95=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E8=BE=93=E5=87=BA=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 7 +++---- sf_tool_management/wizard/wizard.py | 5 ----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 11811657..b657184b 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -14,7 +14,7 @@ class FunctionalCuttingToolEntity(models.Model): # code = fields.Char('序列号') barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) - name = fields.Char('名称', size=20) + name = fields.Char(related='barcode_id.name') functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True) mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号') mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', @@ -623,7 +623,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model): """ record = self.env['sf.functional.tool.assembly'].create({ 'barcode_id': self.barcode_id.id, - 'name': self.functional_tool_name_id.id, + 'functional_tool_name_id': self.functional_tool_name_id.id, 'functional_tool_type_id': self.functional_tool_type_id.id, 'functional_tool_diameter': self.diameter, 'functional_tool_length': self.tool_loading_length, @@ -664,7 +664,6 @@ class CAMWorkOrderProgramKnifePlan(models.Model): }) - class FunctionalToolAssembly(models.Model): _name = 'sf.functional.tool.assembly' _description = '功能刀具组装单' @@ -673,7 +672,7 @@ class FunctionalToolAssembly(models.Model): assembly_order_code = fields.Char(string='编码', readonly=True) barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True) functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True) - name = fields.Char( string='功能刀具名称', readonly=True) + name = fields.Char(string='名称', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, group_expand='_read_group_functional_tool_type_ids') diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 2e2bc17f..0c554ca9 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -273,7 +273,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel): stock_lot = self.create_assemble_warehouse_receipt() # 创建刀具组装入库单 self.create_stocking_picking(stock_lot) - print('已运行1') desc_1 = { 'barcode_id': stock_lot.id, 'integral_code_id': self.integral_code_id.id, @@ -293,13 +292,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'tool_loading_person': self.env.user.name, 'tool_loading_time': fields.Datetime.now() } - print('已运行2') functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([ ('machine_tool_name_id', '=', self.machine_tool_name_id.id), ('cutter_spacing_code', '=', self.cutter_spacing_code), ('assemble_status', '=', '0'), ]) - print('已运行3') # 封装功能刀具数据 desc_2 = { 'barcode_id': stock_lot.id, @@ -323,10 +320,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'applicable_range': None, 'image': None, } - print('已运行4') # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录 record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2) - print('已运行5') self.env['sf.functional.tool.warning'].create({ 'functional_cutting_tool_id': record_1.id, 'functional_tool_assembly_id': functional_tool_assembly.id,