From 14d823ab6ed89d26e72b641ee8d8c108b292de63 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 11 Jun 2024 11:58:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=80=E5=85=B7=E9=A2=84=E8=B0=83=E4=BB=AA?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_mrs_connect/models/res_config_setting.py | 6 ++- .../views/res_config_settings_views.xml | 15 ++++++ sf_tool_management/wizard/wizard.py | 9 ++++ sf_tool_management/wizard/wizard_view.xml | 46 +++++++++++++------ 4 files changed, 60 insertions(+), 16 deletions(-) diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py index 035b10a0..159e8d48 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -26,6 +26,7 @@ class ResConfigSettings(models.TransientModel): ftp_port = fields.Char(string='FTP端口') ftp_user = fields.Char(string='FTP用户') ftp_password = fields.Char(string='FTP密码') + enable_tool_presetter = fields.Boolean('是否启用刀具预调仪', default=True) def sf_all_sync(self): try: @@ -108,6 +109,7 @@ class ResConfigSettings(models.TransientModel): ftp_port = config.get_param('ftp_port', default='') ftp_user = config.get_param('ftp_user', default='') ftp_password = config.get_param('ftp_password', default='') + enable_tool_presetter = config.get_param('enable_tool_presetter', default='') values.update( token=token, @@ -121,7 +123,8 @@ class ResConfigSettings(models.TransientModel): ftp_host=ftp_host, ftp_port=ftp_port, ftp_user=ftp_user, - ftp_password=ftp_password + ftp_password=ftp_password, + enable_tool_presetter=enable_tool_presetter ) return values @@ -140,3 +143,4 @@ class ResConfigSettings(models.TransientModel): ir_config.set_param("ftp_port", self.ftp_port or "") ir_config.set_param("ftp_user", self.ftp_user or "") ir_config.set_param("ftp_password", self.ftp_password or "") + ir_config.set_param("enable_tool_presetter", self.enable_tool_presetter or False) diff --git a/sf_mrs_connect/views/res_config_settings_views.xml b/sf_mrs_connect/views/res_config_settings_views.xml index 2be92365..08e9560f 100644 --- a/sf_mrs_connect/views/res_config_settings_views.xml +++ b/sf_mrs_connect/views/res_config_settings_views.xml @@ -114,6 +114,21 @@ +
+

刀具预调仪配置

+
+
+
+ +
+
+
+
+
+
+
+
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py index 58cc0cf6..41a78ed0 100644 --- a/sf_tool_management/wizard/wizard.py +++ b/sf_tool_management/wizard/wizard.py @@ -440,6 +440,15 @@ class FunctionalToolAssemblyOrder(models.TransientModel): compute='_compute_after_assembly_max_lifetime_value') obtain_measurement_status = fields.Boolean('是否获取测量值', default=False) + enable_tool_presetter = fields.Boolean('是否启用刀具预调仪', default=lambda self: self.get_enable_tool_presetter()) + + def get_enable_tool_presetter(self): + """ + 获取是否启用刀具预调仪数据 + """ + sf_sync_config = self.env['res.config.settings'].get_values() + enable_tool_presetter = sf_sync_config['enable_tool_presetter'] + return enable_tool_presetter @api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length') def _compute_after_assembly_functional_tool_length(self): diff --git a/sf_tool_management/wizard/wizard_view.xml b/sf_tool_management/wizard/wizard_view.xml index ad8de498..b6e15586 100644 --- a/sf_tool_management/wizard/wizard_view.xml +++ b/sf_tool_management/wizard/wizard_view.xml @@ -235,10 +235,12 @@ - + - + @@ -258,10 +260,12 @@ - + - + @@ -282,10 +286,12 @@ - + - + @@ -306,10 +312,12 @@ - + - + @@ -329,10 +337,12 @@ - + - + @@ -358,12 +368,14 @@