jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

Browse Source 
# Conflicts:
#	sf_base/views/base_view.xml
#	sf_mrs_connect/models/sync_common.py
This commit is contained in:
qihao.gong@jikimo.com
2023-08-18 14:34:37 +08:00
parent c924426725 607eac90c6
commit 43d6794151
24 changed files with 1254 additions and 2601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sf_mrs_connect/models/res_config_setting.py
View File

@@ -56,9 +56,15 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步所有功能刀具列表...")
self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
_logger.info("同步所有功能刀具列表完成")
self.env['sf.fixture.material'].sync_all_fixture_material()
_logger.info("同步夹具物料")
self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
_logger.info("同步联装类型")
# self.env['sf.fixture.model'].sync_all_fixture_model()
# _logger.info("同步夹具型号")
self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
_logger.info("同步功能夹具类型")
# self.env['sf.functional.fixture'].sync_all_functional_fixture()
# self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
# _logger.info("同步联装类型")
# self.env['sf.fixture.model'].sync_all_fixture_model()