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

修复同步刀具标准库

Browse Source
This commit is contained in:
jinling.yang
2023-11-02 17:17:34 +08:00
parent eb835ae5c8
commit 36270477d5
12 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sf_mrs_connect/__manifest__.py
View File

@@ -13,6 +13,7 @@
'depends': ['sf_base', 'base_setup'],
'data': [
'data/ir_cron_data.xml',
'security/ir.model.access.csv',
'views/res_config_settings_views.xml'
],
'demo': [

4
sf_mrs_connect/models/res_config_setting.py
View File

@@ -48,7 +48,7 @@ class ResConfigSettings(models.TransientModel):
self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
_logger.info("同步刀具类型完成")
self.env['sf.cutting.tool.type'].sync_all_tool_type()
_logger.info("同步所有刀具型号完成")
_logger.info("同步功能刀具类型完成")
self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
_logger.info("同步夹具物料完成")
self.env['sf.fixture.material'].sync_all_fixture_material()
@@ -56,7 +56,7 @@ class ResConfigSettings(models.TransientModel):
self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
_logger.info("同步夹具型号完成")
self.env['sf.fixture.model'].sync_all_fixture_model()
_logger.info("同步功能夹具类型完成")
_logger.info("同步夹具型号类型完成")
self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
_logger.info("同步功能夹具类型完成")
self.env['sf.machine_tool.type'].sync_all_machine_tool_type()

24
sf_mrs_connect/models/sync_common.py
View File

@@ -1815,9 +1815,11 @@ class Cutting_tool_standard_library(models.Model):
"integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
"integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
"cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
result['factory_short_name']),
"cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
result['factory_short_name']),
"fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
"suitable_machining_method_ids": [(6, 0, [])] if not item.get(
@@ -1861,9 +1863,11 @@ class Cutting_tool_standard_library(models.Model):
"integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
"integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
"cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
result['factory_short_name']),
"cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
result['factory_short_name']),
"fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
"suitable_machining_method_ids": [(6, 0, [])] if not item.get(
@@ -1976,9 +1980,11 @@ class Cutting_tool_standard_library(models.Model):
"integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
"integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
"cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
result['factory_short_name']),
"cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
result['factory_short_name']),
"fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
"suitable_machining_method_ids": [(6, 0, [])] if not item.get(
@@ -2022,9 +2028,11 @@ class Cutting_tool_standard_library(models.Model):
"integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
"integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
"cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
result['factory_short_name']),
"cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
result['factory_short_name']),
"fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
"suitable_machining_method_ids": [(6, 0, [])] if not item.get(

7
sf_mrs_connect/security/ir.model.access.csv Normal file
View File

@@ -0,0 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_sf_static_resource_datasync,sf_static_resource_datasync,model_sf_static_resource_datasync,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_sf_static_resource_datasync sf_static_resource_datasync model_sf_static_resource_datasync base.group_user 1 1 1 1