From 72eada06394ee82c23fe71c39683d17d6d62d97f Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Wed, 4 Sep 2024 17:55:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7?= =?UTF-8?q?=E7=BB=84=E8=A3=85tree=E3=80=81form=E8=A7=86=E5=9B=BE=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E8=B0=83=E6=95=B4=EF=BC=9B2=E3=80=81=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E5=86=85=E5=AE=B9=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B3=E3=80=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E7=BB=84=E8=A3=85=E5=8D=95=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E6=96=B9=E6=B3=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/models/base.py | 13 ++- sf_tool_management/views/tool_base_views.xml | 103 +++++++++---------- sf_tool_management/wizard/wizard.py | 2 +- 3 files changed, 58 insertions(+), 60 deletions(-) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index 2876bc8f..a464d5cb 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -32,7 +32,7 @@ class MachineTableToolChangingApply(models.Model): domain=[('product_id.name', '=', '功能刀具')], related='functional_tool_name_id.barcode_id') rfid = fields.Char('Rfid', related='functional_tool_name_id.rfid') - functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '1')], + functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', domain=[('assemble_status', '=', '2')], string='功能刀具名称') functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True, related='functional_tool_name_id.after_assembly_functional_tool_type_id') @@ -375,16 +375,17 @@ class FunctionalToolAssembly(models.Model): tool_loading_length = fields.Float(string='总长度(mm)', readonly=True) functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True) effective_length = fields.Float(string='有效长(mm)', readonly=True) - loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')], - string='装刀任务来源', readonly=True) + loading_task_source = fields.Selection( + [('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装'), ('3', '寿命到期组装')], + string='装刀任务来源', readonly=True) use_tool_time = fields.Datetime(string='用刀时间', readonly=True) production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True) machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True) machine_tool_code = fields.Char(string='机台号', readonly=True) applicant = fields.Char(string='申请人', readonly=True) apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True) - assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0', - tracking=True, readonly=True) + assemble_status = fields.Selection([('0', '待组装'), ('1', '组装中'), ('2', '已组装'), ('3', '已取消')], + string='组装状态', default='0', tracking=True, readonly=True) cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True) whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True) reason_for_applying = fields.Char(string='申请原因', readonly=True) @@ -622,6 +623,8 @@ class FunctionalToolAssembly(models.Model): code = 'J' + datetime elif loading_task_source == '2': code = 'K' + datetime + elif loading_task_source == '3': + code = 'S' + datetime else: code = False functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search( diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 390fcb15..480fc357 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -446,19 +446,19 @@ - + - + - - - - - - - +
+ +

@@ -496,20 +497,19 @@ - - - - - + + + - + + + + - + @@ -650,28 +650,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -685,9 +663,27 @@ + + + + + + + + + + + + + @@ -705,20 +701,19 @@ + + + - - - - - - + - + + @@ -743,7 +738,7 @@ tree,form,search - {'search_default_no_assemble_status':1} + {'search_default_no_assemble_status':2} diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index aa5c645e..d38411bc 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -725,7 +725,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel): 'after_assembly_effective_length': self.after_assembly_effective_length, 'L_D_number': self.L_D_number, 'hiding_length': self.hiding_length, - 'assemble_status': '1', + 'assemble_status': '2', 'tool_loading_person': self.env.user.name, 'image': self.image, 'tool_loading_time': fields.Datetime.now()