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/刀具物料与夹具物料的反注册

Browse Source 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
This commit is contained in:
jinling.yang
2023-08-08 17:18:06 +08:00
parent b3f2065edd be53b012f1
commit e638245b8a
22 changed files with 797 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_mrs_connect/models/res_config_setting.py
View File

@@ -36,8 +36,7 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步资源库品牌")
self.env['sf.machine.control_system'].sync_all_machine_tool_type_control_system()
_logger.info("同步资源库控制系统")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
self.env['sf.machine_tool.category'].sync_all_machine_tool_category()
_logger.info("同步资源库机床类型")
# self.env['sf.production.process.parameter'].sync_all_production_process_parameter()
@@ -66,7 +65,16 @@ class ResConfigSettings(models.TransientModel):
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()
# _logger.info("同步夹具型号")
# self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
# _logger.info("同步功能夹具类型")
# self.env['sf.functional.fixture'].sync_all_functional_fixture()
# _logger.info("同步功能夹具")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
_logger.info("同步资源库机床型号")
except Exception as e:
_logger.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员")