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

将采集到的数据添加到机床对象的page中

Browse Source
This commit is contained in:
mgw
2022-11-03 17:37:19 +08:00
parent 9ee33ae0b9
commit 99d56cb53e
7 changed files with 130 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/inspectionProfiles/profiles_settings.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

8
.idea/jikimo-sf.iml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/jikimo-sf.iml" filepath="$PROJECT_DIR$/.idea/jikimo-sf.iml" />
</modules>
</component>
</project>

170
sf_base/views/mrs_base_view.xml
View File

@@ -100,53 +100,57 @@
<field name="model">mrs.machine_tool.type</field> <field name="model">mrs.machine_tool.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="机床型号"> <form string="机床型号">
<group string="基本信息"> <group string="基本信息" name="base_info">
<group> <group>
<field name="code" force_save="1" readonly="1"/> <field name="code" force_save="1" readonly="1"/>
<field name="name" required="1"/> <field name="name" required="1"/>
</group> </group>
<group> <group>
<field name="brand_id" required="1" <field name="brand_id" required="1"
domain="[('tag_ids', '=', '机床')]" domain="[('tag_ids', '=', '机床')]"
options="{'no_create': True}"/> options="{'no_create': True}"/>
</group> </group>
</group> </group>
<group string="参数"> <group string="参数">
<group> <group>
<field name="knife_type" required="1"/> <field name="knife_type" required="1"/>
<field name="number_of_knife_library" required="1" options="{'format': false}"/> <field name="number_of_knife_library" required="1" options="{'format': false}"/>
<field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/> <field name="number_of_axles" required="1" widget="radio" options="{'horizontal': true}"/>
<label for="x_axis" string="加工行程(mm)" <label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"/> attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<div class="o_address_format" <div class="o_address_format"
attrs="{'invisible': [('number_of_axles', '=', False)]}"> attrs="{'invisible': [('number_of_axles', '=', False)]}">
<label for="x_axis" string="x"/> <label for="x_axis" string="x"/>
<field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/> <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
<label for="y_axis" string="y"/> <label for="y_axis" string="y"/>
<field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/> <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
<label for="z_axis" string="z"/> <label for="z_axis" string="z"/>
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/> <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
<label for="b_axis" string="b" <label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/> attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
<field name="b_axis" class="o_address_city" required="1" <field name="b_axis" class="o_address_city" required="1"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}" attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
options="{'format': false}"/> options="{'format': false}"/>
<label for="c_axis" string="c" <label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/> attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
<field name="c_axis" class="o_address_zip" required="1" <field name="c_axis" class="o_address_zip" required="1"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}" attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
options="{'format': false}"/> options="{'format': false}"/>
</div> </div>
</group> </group>
<group> <group>
<field name="rotate_speed" string="转速(min)" required="1" options="{'format': false}"/> <field name="rotate_speed" string="转速(min)" required="1" options="{'format': false}"/>
<field name="precision" required="1" string="加工精度(mm)"/> <field name="precision" required="1" string="加工精度(mm)"/>
<field name="control_system_id" required="1" options="{'no_create': True}"/> <field name="control_system_id" required="1" options="{'no_create': True}"/>
</group> </group>
</group> </group>
<group string="其它"> <group string="其它">
<field name="remark"/> <field name="remark"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
@@ -375,43 +379,49 @@
<field name="code" readonly="1" string="行业编码" force_save="1"/> <field name="code" readonly="1" string="行业编码" force_save="1"/>
</group> </group>
</group> </group>
<group string="参数"> <notebook>
<group> <page string="参数">
<field name="knife_type" required="1"/> <group string="参数">
<field name="number_of_knife_library" required="1" options="{'format': false}"/> <group>
<field name="number_of_axles" widget="radio" options="{'horizontal': true}"/> <field name="knife_type" required="1"/>
<label for="x_axis" string="加工行程(mm)" <field name="number_of_knife_library" required="1" options="{'format': false}"/>
attrs="{'invisible': [('number_of_axles', '=', False)]}"/> <field name="number_of_axles" widget="radio" options="{'horizontal': true}"/>
<div class="o_address_format" <label for="x_axis" string="加工行程(mm)"
attrs="{'invisible': [('number_of_axles', '=', False)]}"> attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
<label for="x_axis" string="x"/> <div class="o_address_format"
<field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/> attrs="{'invisible': [('number_of_axles', '=', False)]}">
<label for="y_axis" string="y"/> <label for="x_axis" string="x"/>
<field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/> <field name="x_axis" class="o_address_city" required="1" options="{'format': false}"/>
<label for="z_axis" string="z"/> <label for="y_axis" string="y"/>
<field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/> <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
<label for="b_axis" string="b" <label for="z_axis" string="z"/>
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/> <field name="z_axis" class="o_address_zip" required="1" options="{'format': false}"/>
<field name="b_axis" class="o_address_city" required="1" <label for="b_axis" string="b"
attrs="{'invisible': [('number_of_axles', '=', '三轴')]}" attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
options="{'format': false}"/> <field name="b_axis" class="o_address_city" required="1"
<label for="c_axis" string="c" attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/> options="{'format': false}"/>
<field name="c_axis" class="o_address_zip" required="1" <label for="c_axis" string="c"
attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}" attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
options="{'format': false}"/> <field name="c_axis" class="o_address_zip" required="1"
</div> attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
</group> options="{'format': false}"/>
<group> </div>
<field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/> </group>
<field name="precision" required="1" string="加工精度(mm)"/> <group>
<field name="control_system_id" required="1" options="{'no_create': True}"/> <field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
<field name="state" widget="selection"/> <field name="precision" required="1" string="加工精度(mm)"/>
</group> <field name="control_system_id" required="1" options="{'no_create': True}"/>
</group> <field name="state" widget="selection"/>
<group string="其它"> </group>
<field name="remark"/> </group>
</group> </page>
<page string="其他">
<group string="其他">
<field name="remark"/>
</group>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>

7
sf_base/views/mrs_common_view.xml
View File

@@ -285,10 +285,11 @@
<field name="name" string="名称" filter_domain="[('name','ilike',self)]"/> <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码" filter_domain="[('code','ilike',self)]"/> <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
<!-- <field name="state" string="状态" filter_domain="[('state','ilike',self)]"/>--> <!-- <field name="state" string="状态" filter_domain="[('state','ilike',self)]"/>-->
</search> <group string="分组">
<group string="分组">
<filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/> <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
</group> </group>
</search>
</field> </field>
</record> </record>

2
sf_bf_connect/__manifest__.py
View File

@@ -12,7 +12,7 @@
'website': 'https://www.sf.cs.jikimo.com', 'website': 'https://www.sf.cs.jikimo.com',
'depends': ['account', 'sf_base', 'base', 'sale'], 'depends': ['account', 'sf_base', 'base', 'sale'],
'data': [ 'data': [
'views/sale_process_order_view.xml' # 'views/sale_process_order_view.xml'
], ],
'demo': [ 'demo': [
], ],

26
sf_bf_connect/views/sale_process_order_view.xml
View File

@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<data> <data>
<record model="ir.ui.view" id="view_sf_form_inherit"> <!-- <record model="ir.ui.view" id="view_sf_form_inherit">-->
<field name="model">sale.order</field> <!-- <field name="model">sale.order</field>-->
<field name="inherit_id" ref="sale.view_order_form"/> <!-- <field name="inherit_id" ref="sale.view_order_form"/>-->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml">-->
<xpath expr="//page[@name='Customer Signature']" position="before"> <!--&lt;!&ndash; <xpath expr="//page[@name='Customer Signature']" position="before">&ndash;&gt;-->
<page string="Bfm Line"> <!--&lt;!&ndash; <page string="Bfm Line">&ndash;&gt;-->
<group> <!--&lt;!&ndash; <group>&ndash;&gt;-->
<field name="bfm_process_order_ids"/> <!--&lt;!&ndash; <field name="bfm_process_order_ids"/>&ndash;&gt;-->
</group> <!--&lt;!&ndash; </group>&ndash;&gt;-->
</page> <!--&lt;!&ndash; </page>&ndash;&gt;-->
</xpath> <!--&lt;!&ndash; </xpath>&ndash;&gt;-->
</field> <!-- </field>-->
</record> <!-- </record>-->
</data> </data>
</odoo> </odoo>