Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

# Conflicts:
#	sf_base/__manifest__.py
#	sf_base/models/__init__.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/sync_common.py
This commit is contained in:
jinling.yang
2023-06-27 16:40:58 +08:00
11 changed files with 3340 additions and 355 deletions

View File

@@ -154,115 +154,115 @@
<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_fixture_material">
<field name="name">同步夹具物料</field>
@@ -318,71 +318,4 @@
<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_cron29">-->
<!-- <field name="name">同步资源库夹紧元件型号</field>-->
<!-- <field name="model_id" ref="model_sf_fixture_clamping_element"/>-->
<!-- <field name="state">code</field>-->
<!-- <field name="code">model.sync_fixture_clamping_element()</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_cron30">-->
<!-- <field name="name">同步资源库夹紧元件类型</field>-->
<!-- <field name="model_id" ref="model_sf_clamping_element_type"/>-->
<!-- <field name="state">code</field>-->
<!-- <field name="code">model.sync_clamping_element_type()</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_cron31">-->
<!-- <field name="name">同步资源库导向元件类型</field>-->
<!-- <field name="model_id" ref="model_sf_guide_element_type"/>-->
<!-- <field name="state">code</field>-->
<!-- <field name="code">model.sync_guide_element_type()</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_cron31">-->
<!-- <field name="name">同步资源库导向元件导向方式</field>-->
<!-- <field name="model_id" ref="model_sf_guide_element_guide_mode"/>-->
<!-- <field name="state">code</field>-->
<!-- <field name="code">model.sync_guide_element_guide_mode()</field>-->
<!-- <field name="interval_number">1</field>-->
<!-- <field name="interval_type">days</field>-->
<!-- <field name="numbercall">-1</field>-->
<!-- <field name="doall" eval="False"/>-->
<!-- </record>-->
</odoo>