diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index e4b49292..8b799eac 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -180,14 +180,21 @@ class FunctionalToolWarning(models.Model): install_tool_time = fields.Char("装刀时间", readonly=False) outbound_time = fields.Char('出库时间', readonly=False) on_board_time = fields.Char('上机时间', readonly=False) + machine_table_name_id = fields.Many2one('maintenance.equipment', string='机床名称', readonly=False, tracking=True, + group_expand='_read_group_machine_table_name_ids') + @api.model + def _read_group_machine_table_name_ids(self, categories, domain, order): + machine_table_name_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) + return categories.browse(machine_table_name_ids) + machine_tool_code = fields.Char('机台号', readonly=False) cutting_tool_code = fields.Char('刀位号', readonly=False) idle_time = fields.Char('闲置时长', readonly=False) alarm_value = fields.Char('报警值', readonly=False) used_value = fields.Char('已使用值', readonly=False) alarm_type = fields.Char('报警类型', readonly=False) - alarm_time = fields.Char('报警时间', readonly=False) dispose_user = fields.Char('处理人', readonly=False) + alarm_time = fields.Char('报警时间', readonly=False) dispose_time = fields.Char('处理时间', readonly=False) dispose_func = fields.Char('处理方法/措施', readonly=False) remark = fields.Char('备注', readonly=False) @@ -251,17 +258,36 @@ class RealTimeDistributionOfFunctionalTools(models.Model): image = fields.Binary('图片', readonly=True) # 功能刀具实时分布 - tool_stock_num = fields.Char(string='刀具房库存数量', readonly=False) - side_shelf_num = fields.Char(string='线边货架货架数量', readonly=False) - on_tool_stock_num = fields.Char(string='机内刀库库存数量', readonly=False) - tool_stock_total = fields.Char(string='合计', readonly=False) - return_reuse_num_re = fields.Char(string='归还再用数量(精)', readonly=False) - return_reuse_num_co = fields.Char(string='归还再用数量(粗)', readonly=False) - return_processing_num = fields.Char(string='归还需磨削数量', readonly=False) - return_total = fields.Char(string='合计', readonly=False) - total = fields.Char(string='总计', readonly=False) + tool_stock_num = fields.Integer(string='刀具房库存数量', readonly=False) + side_shelf_num = fields.Integer(string='线边货架货架数量', readonly=False) + on_tool_stock_num = fields.Integer(string='机内刀库库存数量', readonly=False) + tool_stock_total = fields.Integer(string='合计(库存)', readonly=True, compute='_compute_tool_stock_total') + return_reuse_num_re = fields.Integer(string='归还再用数量(精)', readonly=False) + return_reuse_num_co = fields.Integer(string='归还再用数量(粗)', readonly=False) + return_processing_num = fields.Integer(string='归还需磨削数量', readonly=False) + return_total = fields.Integer(string='合计(归还)', readonly=True, compute='_compute_return_total') + total = fields.Integer(string='总计', readonly=True, compute='_compute_total') remark = fields.Char(string='备注/说明', readonly=False) + @api.depends('tool_stock_num', 'side_shelf_num', 'on_tool_stock_num') + def _compute_tool_stock_total(self): + for record in self: + if record: + self.tool_stock_total = record.tool_stock_num + record.side_shelf_num + record.on_tool_stock_num + + @api.depends('return_reuse_num_re', 'return_reuse_num_co', 'return_processing_num') + def _compute_return_total(self): + for record in self: + if record: + self.return_total = record.return_reuse_num_re + record.return_reuse_num_co + record.return_processing_num + + @api.depends('tool_stock_total', 'return_total') + def _compute_total(self): + for record in self: + if record: + self.total = record.tool_stock_total + record.return_total + + class InboundAndOutboundRecordsOfFunctionalTools(models.Model): _name = 'sf.inbound.and.outbound.records.of.functional.tools' @@ -377,6 +403,8 @@ class MachineTableToolChangingApply(models.Model): status = fields.Selection([('0', '未操作'), ('1', '已换刀申请'), ('2', '已转移')], string='操作状态', default='0') + sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装') + @api.model def _read_group_names(self, categories, domain, order): names = categories._search([], order=order, access_rights_uid=SUPERUSER_ID) @@ -471,7 +499,8 @@ class MachineTableToolChangingApply(models.Model): 'used_tool_time': None, 'reason_for_applying': None, 'remark': None, - 'status': '0' + 'status': '0', + 'sf_functional_tool_assembly_id': None, }) @@ -485,6 +514,16 @@ class MachineTableToolChangingApply(models.Model): 'status': '0' }) + def open_sf_functional_tool_assembly(self): + """ + 跳转到功能刀具组装界面按键功能 + :return: + """ + action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act') + result = action.read()[0] + result['domain'] = [('sf_machine_table_tool_changing_apply_id', '=', self.id)] + return result + class CAMWorkOrderProgramKnifePlan(models.Model): _name = 'sf.cam.work.order.program.knife.plan' @@ -519,12 +558,14 @@ class CAMWorkOrderProgramKnifePlan(models.Model): reason_for_applying = fields.Char(string='申请原因', readonly=False) remark = fields.Char(string='备注说明', readonly=False) + sf_functional_tool_assembly_id = fields.Many2one('sf.functional.tool.assembly', '功能刀具组装') + def apply_for_tooling(self): """ 申请装刀 :return: """ - self.env['sf.functional.tool.assembly'].create({ + record = self.env['sf.functional.tool.assembly'].create({ 'functional_tool_code': self.functional_tool_code, 'name': self.functional_tool_name_id.id, 'functional_tool_type_id': self.functional_tool_type_id.id, @@ -538,33 +579,43 @@ class CAMWorkOrderProgramKnifePlan(models.Model): 'use_tool_time': self.need_knife_time, 'machine_tool_name_id': self.machine_table_name_id.id, 'machine_tool_code': self.cam_procedure_code, - 'cutter_spacing_code': self.cam_cutter_spacing_code + 'cutter_spacing_code': self.cam_cutter_spacing_code, + 'sf_cam_work_order_program_knife_plan_id': self.id }) + self.sf_functional_tool_assembly_id = record.id # 将计划执行状态改为执行中 self.env['sf.cam.work.order.program.knife.plan'].search( - [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '1', - 'applicant': self.env.user.name}) - + [('functional_tool_code', '=', self.functional_tool_code)]).write({ + 'plan_execute_status': '1', + 'applicant': self.env.user.name}) def revocation(self): """ 撤回装刀申请 :return: """ - - self.env['sf.functional.tool.assembly'].search( [('functional_tool_code', '=', self.functional_tool_code), ('loading_task_source', '=', '0')]).unlink() - # 将计划执行状态改为待执行 + # 将计划执行状态改为待执行，同时清除申请人、功能刀具组装字段数据 self.env['sf.cam.work.order.program.knife.plan'].search( - [('functional_tool_code', '=', self.functional_tool_code)]).write({'plan_execute_status': '0', - 'applicant': None}) - - + [('functional_tool_code', '=', self.functional_tool_code)]).write({ + 'plan_execute_status': '0', + 'applicant': None, + 'sf_functional_tool_assembly_id': None, + }) + def open_sf_functional_tool_assembly(self): + """ + 跳转到功能刀具组装界面按键功能 + :return: + """ + action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act') + result = action.read()[0] + result['domain'] = [('sf_cam_work_order_program_knife_plan_id', '=', self.id)] + return result class FunctionalToolAssembly(models.Model): @@ -572,6 +623,7 @@ class FunctionalToolAssembly(models.Model): _description = '功能刀具组装' _order = 'use_tool_time asc' + functional_tool_code = fields.Char(string='功能刀具编码', readonly=True) name = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=True) functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True, @@ -656,6 +708,26 @@ class FunctionalToolAssembly(models.Model): remark = fields.Char(string='备注说明', readonly=True) check_box_1 = fields.Boolean(string='复选框', default=False, readonly=False) + sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请') + sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan', 'CAM工单程序用刀计划') + + def open_sf_cam_work_order_program_knife_plan(self): + """ + 跳转到CAM工单程序用刀计划界面按钮功能 + """ + action = self.env.ref('sf_tool_management.sf_cam_work_order_program_knife_plan_view_act') + result = action.read()[0] + result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)] + return result + + def open_sf_machine_table_tool_changing_apply(self): + """ + 跳转到机床换刀申请界面按钮功能 + """ + action = self.env.ref('sf_tool_management.sf_machine_table_tool_changing_apply_view_act') + result = action.read()[0] + result['domain'] = [('sf_functional_tool_assembly_id', '=', self.id)] + return result def cancel_functional_tool_assembly(self): """ diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 87aceb92..37220acb 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -235,7 +235,7 @@ - + @@ -313,17 +313,34 @@ - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + @@ -551,6 +568,7 @@ type="action" context="{ 'default_name':name, 'default_machine_tool_code': machine_tool_code, + 'default_functional_tool_code': functional_tool_code, 'default_functional_tool_name_id': functional_tool_name_id, 'default_functional_tool_type_id': functional_tool_type_id, 'default_cutter_spacing_code': cutter_spacing_code, @@ -573,6 +591,8 @@ class="btn-primary" attrs="{'invisible': [('status', '!=', '0')]}" /> +