diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 328c04dd..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1673428094330 - - - - - - - - - - - - - \ No newline at end of file diff --git a/sf_machine_connect/__manifest__.py b/sf_machine_connect/__manifest__.py index 7f116a51..8579b691 100644 --- a/sf_machine_connect/__manifest__.py +++ b/sf_machine_connect/__manifest__.py @@ -20,7 +20,7 @@ 'views/WorkCenterBarcodes.xml', 'views/Stock_picking_Barcodes.xml', 'views/machine_monitor.xml', - # 'views/machine_info_present.xml', + 'views/machine_info_present.xml', ], 'assets': { diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index 1941f09a..0e06678f 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -109,6 +109,7 @@ class FtpButton(models.Model): # 'type': 'ir.actions.act_window', # 'target': 'new' # } + # def up_all(self): # """ # 此函数用于将NC代码全部下发到机床 @@ -144,7 +145,6 @@ class FtpButton(models.Model): # # _logger.info("=====================================", e) # # raise UserError('NC下发执行超时, 请检查下发状态') - def check_compensation_before_up(self): """ 下发NC代码前自动补偿三元检测偏差值 @@ -234,8 +234,41 @@ class WorkCenterBarcode(models.Model): compensation_value_x = fields.Float(string='X轴补偿值') compensation_value_y = fields.Float(string='Y轴补偿值') - button_compensation_state = fields.Boolean(string='是否已经补偿') + button_compensation_state = fields.Boolean(string='是否已经补偿', readonly=True) + button_up_all_state = fields.Boolean(string='是否已经全部下发', readonly=True) machine_tool_id = fields.Many2one('sf.machine_tool', string='机床') + machine_tool_name = fields.Char(string='机床名称', default='未知机床', compute='_run_info', readonly=True) + machine_tool_type_id = fields.Char(string='机床型号', default='未知型号', compute='_run_info', readonly=True) + machine_tool_status = fields.Boolean(string='在线状态', compute='_run_info', readonly=True) + machine_tool_run_status = fields.Selection([('0', '关机中'), ('1', '加工中'), ('2', '加工中'), ('3', '等待中')], + string='运行状态', compute='_run_info', readonly=True, default='0') + machine_tool_timestamp = fields.Datetime('时间戳', compute='_run_info', readonly=True) + machine_tool_time_on = fields.Char('总在线时长', compute='_run_info', readonly=True) + machine_tool_time_on_now = fields.Char('本次在线时长', compute='_run_info', readonly=True) + machine_tool_tool_num = fields.Integer('当前刀具', compute='_run_info', readonly=True) + machine_tool_program = fields.Char('当前程序', compute='_run_info', readonly=True) + machine_tool_machine_ip = fields.Char('机床IP', compute='_run_info', readonly=True) + machine_tool_cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')], + string='切削状态', compute='_run_info', readonly=True, default='0') + machine_tool_compensation_value_x = fields.Char('x补偿值', compute='_run_info', readonly=True) + machine_tool_compensation_value_y = fields.Char('y补偿值', compute='_run_info', readonly=True) + + @api.depends('workcenter_id.machine_tool_id.timestamp') + def _run_info(self): + # self.machine_tool_name = '1号机床' + self.machine_tool_name = self.workcenter_id.machine_tool_id.name + self.machine_tool_type_id = self.workcenter_id.machine_tool_id.type_id.name + self.machine_tool_status = self.workcenter_id.machine_tool_id.status + self.machine_tool_run_status = self.workcenter_id.machine_tool_id.run_status + self.machine_tool_timestamp = self.workcenter_id.machine_tool_id.timestamp + self.machine_tool_time_on = self.workcenter_id.machine_tool_id.time_on + self.machine_tool_time_on_now = self.workcenter_id.machine_tool_id.time_on_now + self.machine_tool_tool_num = self.workcenter_id.machine_tool_id.tool_num + self.machine_tool_program = self.workcenter_id.machine_tool_id.program + self.machine_tool_machine_ip = self.workcenter_id.machine_tool_id.machine_ip + self.machine_tool_cut_status = self.workcenter_id.machine_tool_id.cut_status + self.machine_tool_compensation_value_x = self.compensation_value_x + self.machine_tool_compensation_value_y = self.compensation_value_y def compensation(self): @@ -256,6 +289,8 @@ class WorkCenterBarcode(models.Model): except Exception as e: _logger.info("=====================================", e) raise UserError('补偿值获取失败，或机床未连接，请检查') + # 补偿执行完毕后，按钮标志位变为true + self.button_compensation_state = True def up_all(self): """ @@ -291,6 +326,8 @@ class WorkCenterBarcode(models.Model): # except Exception as e: # _logger.info("=====================================", e) # raise UserError('NC下发执行超时, 请检查下发状态') + # 下发都执行完毕后，按钮标志位变为true + self.button_up_all_state = True def get__state(self): pay_time = str(datetime.now()) diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml index 4a2e6e69..cddeba78 100644 --- a/sf_machine_connect/views/compensation.xml +++ b/sf_machine_connect/views/compensation.xml @@ -12,10 +12,14 @@
- +