jikimo/test
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
This commit is contained in:
jinling.yang
2023-06-29 17:14:48 +08:00
parent aea68f5239 3907901dc3
commit 0f7f67aade
141 changed files with 20125 additions and 4856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
sf_mrs_connect/data/ir_cron_data.xml
View File

@@ -154,116 +154,6 @@
<field name="doall" eval="False"/>
</record>
<!-- <record model="ir.cron" id="sf_cron17"> -->
<!-- <field name="name">同步整体式刀具型号</field> -->
<!-- <field name="model_id" ref="model_sf_integral_cutting_tool"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_integral_cutting_tool()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron18"> -->
<!-- <field name="name">同步整体式刀具类型</field> -->
<!-- <field name="model_id" ref="model_sf_integral_cutting_tool_model"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_integral_cutting_tool_model()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron19"> -->
<!-- <field name="name">同步刀片型号</field> -->
<!-- <field name="model_id" ref="model_sf_blade"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_blade()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron20"> -->
<!-- <field name="name">同步刀片类型</field> -->
<!-- <field name="model_id" ref="model_sf_blade_model"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_blade_model()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron21"> -->
<!-- <field name="name">同步刀杆型号</field> -->
<!-- <field name="model_id" ref="model_sf_cutter_bar"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_cutter_bar()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron22"> -->
<!-- <field name="name">同步刀杆类型</field> -->
<!-- <field name="model_id" ref="model_sf_cutter_bar_model"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_cutter_bar_model()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron23"> -->
<!-- <field name="name">同步刀盘型号</field> -->
<!-- <field name="model_id" ref="model_sf_cutter_pad"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_cutter_pad()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron24"> -->
<!-- <field name="name">同步刀盘类型</field> -->
<!-- <field name="model_id" ref="model_sf_cutter_pad_model"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_cutter_pad_model()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron25"> -->
<!-- <field name="name">同步刀柄型号</field> -->
<!-- <field name="model_id" ref="model_sf_handle"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_handle()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<!-- <record model="ir.cron" id="sf_cron26"> -->
<!-- <field name="name">同步刀柄类型</field> -->
<!-- <field name="model_id" ref="model_sf_handle_model"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_handle_model()</field> -->
<!-- <field name="interval_number">1</field> -->
<!-- <field name="interval_type">days</field> -->
<!-- <field name="numbercall">-1</field> -->
<!-- <field name="doall" eval="False"/> -->
<!-- </record> -->
<record model="ir.cron" id="sf_fixture_material">
<field name="name">同步夹具物料</field>
<field name="model_id" ref="model_sf_fixture_material"/>

26
sf_mrs_connect/models/res_config_setting.py
View File

@@ -42,11 +42,6 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步资源库机床类型")
# self.env['sf.production.process.parameter'].sync_all_production_process_parameter()
# _logger.info("同步表面工艺参数")
_logger.info("定时同步每日功能刀具类型列表...")
# self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model()
_logger.info("同步每日功能刀具类型完成")
_logger.info("同步所有功能刀具类型...")
self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
_logger.info("同步所有功能刀具类型完成")
_logger.info("同步每日刀具物料...")
self.env['sf.cutting.tool.material'].sync_cutting_tool_material()
@@ -54,6 +49,12 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步所有刀具物料...")
self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
_logger.info("同步所有刀具物料完成")
_logger.info("定时同步每日功能刀具类型列表...")
self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model()
_logger.info("同步每日功能刀具类型完成")
_logger.info("定时同步所有功能刀具类型列表...")
self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
_logger.info("同步所有功能刀具类型完成")
_logger.info("同步每日刀具类型...")
self.env['sf.cutting.tool.type'].sync_tool_type()
_logger.info("同步每日刀具类型完成")
@@ -67,12 +68,6 @@ class ResConfigSettings(models.TransientModel):
self.env['sf.cutting.tool.model'].sync_all_tool_model()
_logger.info("同步所有刀具型号完成")
_logger.info("同步每日同步功能刀具列表...")
self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool()
_logger.info("同步每日功能刀具列表完成")
_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()
@@ -83,15 +78,6 @@ class ResConfigSettings(models.TransientModel):
_logger.info("同步功能夹具类型")
self.env['sf.functional.fixture'].sync_all_functional_fixture()
_logger.info("同步功能夹具")
# self.env['sf.fixture.clamping.element'].sync_all_fixture_clamping_element()
# _logger.info("同步资源库夹紧元件型号")
# self.env['sf.clamping.element.type'].sync_all_clamping_element_type()
# _logger.info("同步资源库夹紧元件类型")
# self.env['sf.guide.element.type'].sync_all_guide_element_type()
# _logger.info("同步资源库导向元件类型")
# self.env['sf.guide.element.guide.mode'].sync_all_guide_element_guide_mode()
# _logger.info("同步资源库导向元件导向方式")
except Exception as e:
_logger.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员")

3931
sf_mrs_connect/models/sync_common.py
View File

File diff suppressed because it is too large Load Diff