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

Merge branch refs/heads/develop into refs/heads/feature/设备维保

Browse Source
This commit is contained in:
龚启豪
2023-06-28 10:39:23 +08:00
parent 1eea2bb1c3 6dc167fae1
commit ec0da8cf76
21 changed files with 4647 additions and 1771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
sf_mrs_connect/data/ir_cron_data.xml
View File

@@ -154,137 +154,137 @@
<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_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_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_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_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_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_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_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_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_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_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_cron27">
<field name="name">同步夹头型号</field>
<field name="model_id" ref="model_sf_chuck"/>
<field name="state">code</field>
<field name="code">model.sync_chuck()</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_cron27"> -->
<!-- <field name="name">同步夹头型号</field> -->
<!-- <field name="model_id" ref="model_sf_chuck"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_chuck()</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_cron28">
<field name="name">同步夹头类型</field>
<field name="model_id" ref="model_sf_chuck_model"/>
<field name="state">code</field>
<field name="code">model.sync_chuck_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_cron28"> -->
<!-- <field name="name">同步夹头类型</field> -->
<!-- <field name="model_id" ref="model_sf_chuck_model"/> -->
<!-- <field name="state">code</field> -->
<!-- <field name="code">model.sync_chuck_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_cron29">
<field name="name">同步资源库夹紧元件型号</field>

31
sf_mrs_connect/models/res_config_setting.py
View File

@@ -42,18 +42,15 @@ 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_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.integral.cutting.tool'].sync_integral_cutting_tool()
# _logger.info("同步整体式刀具类型完成")
# _logger.info("同步每日刀具物料...")
# self.env['sf.cutting.tool.material'].sync_cutting_tool_material()
# _logger.info("同步每日刀具物料完成")
_logger.info("同步每日刀具物料...")
self.env['sf.cutting.tool.material'].sync_cutting_tool_material()
_logger.info("同步每日刀具物料完成")
_logger.info("同步所有刀具物料...")
self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
_logger.info("同步所有刀具物料完成")
@@ -132,6 +129,21 @@ class ResConfigSettings(models.TransientModel):
# _logger.info("同步每日同步功能刀具列表...")
# self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool()
# _logger.info("同步每日功能刀具列表完成")
_logger.info("同步每日刀具类型...")
self.env['sf.cutting.tool.type'].sync_tool_type()
_logger.info("同步每日刀具类型完成")
_logger.info("同步所有刀具类型...")
self.env['sf.cutting.tool.type'].sync_all_tool_type()
_logger.info("同步所有刀具类型完成")
_logger.info("同步每日刀具型号...")
self.env['sf.cutting.tool.model'].sync_tool_model()
_logger.info("同步每日刀具型号完成")
_logger.info("同步所有刀具型号...")
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("同步所有功能刀具列表完成")
@@ -149,7 +161,6 @@ class ResConfigSettings(models.TransientModel):
_logger.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员")
@api.model
def get_values(self):
"""

3817
sf_mrs_connect/models/sync_common.py
View File

File diff suppressed because it is too large Load Diff