From 4609ddfa7a15c6269943f1937cdd6d210ec21021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B5=93?= <1440513926@qq.com> Date: Fri, 18 Jul 2025 09:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B9=E5=85=B7=E5=9E=8B=E5=8F=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E8=A1=A8=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/models/fixture.py | 18 +++++++++--------- sf_mrs_connect/controllers/__init__.py | 2 -- sf_mrs_connect/models/sync_common.py | 2 -- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index 82997a01..c344f978 100644 --- a/sf_base/models/fixture.py +++ b/sf_base/models/fixture.py @@ -36,23 +36,23 @@ class FixtureModel(models.Model): status = fields.Boolean('状态') active = fields.Boolean('有效', default=False) - zero_chuck_ids = fields.One2many('mrs.basic_parameters.zero.chuck', 'fixture_model_id', + zero_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='零点卡盘基本参数') - zero_tray_ids = fields.One2many('mrs.basic_parameters.zero.tray', 'fixture_model_id', + zero_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='零点托盘基本参数') - pneumatic_fixture_ids = fields.One2many('mrs.basic_parameters.pneumatic.fixture', 'fixture_model_id', + pneumatic_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='气动夹具基本参数') - jaw_vice_fixture_ids = fields.One2many('mrs.basic_parameters.jaw.vice.fixture', 'fixture_model_id', + jaw_vice_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='虎钳夹具基本参数') - magnet_fixture_ids = fields.One2many('mrs.basic_parameters.magnet.fixture', 'fixture_model_id', + magnet_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='磁吸夹具基本参数') - magnet_tray_ids = fields.One2many('mrs.basic_parameters.magnet.tray', 'fixture_model_id', + magnet_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='磁吸托盘基本参数') - adapter_board_fixture_ids = fields.One2many('mrs.basic_parameters.adapter.board.fixture', 'fixture_model_id', + adapter_board_fixture_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='转接板(锁板)夹具基本参数') - scroll_chuck_ids = fields.One2many('mrs.basic_parameters.scroll.chuck', 'fixture_model_id', + scroll_chuck_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='三爪卡盘基本参数') - air_tray_ids = fields.One2many('mrs.basic_parameters.air.tray', 'fixture_model_id', + air_tray_ids = fields.One2many('sf.fixture.materials.basic.parameters', 'fixture_model_id', string='气吸托盘基本参数') # def _get_code(self, fixture_model_type_code): diff --git a/sf_mrs_connect/controllers/__init__.py b/sf_mrs_connect/controllers/__init__.py index c57cd7f7..e046e49f 100644 --- a/sf_mrs_connect/controllers/__init__.py +++ b/sf_mrs_connect/controllers/__init__.py @@ -1,3 +1 @@ from . import controllers -from . import sync_controller -from . import refresh_controller \ No newline at end of file diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index 3aad8090..2dd8cfff 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -8,8 +8,6 @@ import requests from odoo import models from odoo.exceptions import ValidationError from odoo.addons.sf_base.commons.common import Common -from odoo.addons.sf_mrs_connect.models.common import Common - _logger = logging.getLogger(__name__)