jikimo/jikimo_sf
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 develop

Browse Source 
# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
#	sf_route_workcenter/models/workcenter.py
This commit is contained in:
gqh
2022-11-07 11:00:14 +08:00
parent a49a24e9e6 a33b16cf78
commit 84cf25f39d
7 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sf_base/views/mrp_routing_workcenter_view.xml
View File

@@ -17,27 +17,49 @@
</record>
#-----------------工单-------------------
<record model="ir.ui.view" id="view_mrp_workorder_form_inherit_sf">
<field name="name">mrp.workorder.form.inherit.sf</field>
<record model="ir.ui.view" id="view_mrp_production_workorder_form_inherit_sf">
<field name="name">mrp.production.workorder.form.inherit.sf</field>
<field name="model">mrp.workorder</field>
<field name="inherit_id" ref="mrp.mrp_production_workorder_tree_view"/>
<field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
<field name="arch" type="xml">
<field name="production_id" position="after">
<field name="processing_panel" readonly="1"/>
</field>
</field>
</record>
<!-- <record model="ir.ui.view" id="view_mrp_production_workorder_tree_inherit_sf">-->
<!-- <field name="name">mrp.production.workorder.tree.inherit.sf</field>-->
<!-- <field name="model">mrp.workorder</field>-->
<!-- <field name="inherit_id" ref="mrp.mrp_production_workorder_tree_view"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <field name="workcenter_id" position="replace">-->
<!-- <filter name="workcenter_ids" string="工作中心" />-->
<!-- </field>-->
<!-- </field>-->
<!-- </record>-->
<!-- <record model="ir.ui.view" id="view_mrp_production_workorder_filter_inherit_sf">-->
<!-- <field name="name">mrp.production.workorder.filter.inherit.sf</field>-->
<!-- <field name="model">mrp.workorder</field>-->
<!-- <field name="inherit_id" ref="mrp.view_mrp_production_workorder_form_view_filter"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <xpath expr="//filter[@name='work_center']" position="replace">-->
<!-- <filter name="work_center" string="工作中心" context="{'group_by': 'workcenter_ids'}"/>-->
<!-- </xpath>-->
<!-- </field>-->
<!-- </record>-->
#-----------------制造订单里的工单-------------------
<record model="ir.ui.view" id="view_mrp_production_workorder_tree_editable_inherit_sf">
<field name="name">mrp.production.workorder.tree.editable.inherit.sf</field>
<field name="model">mrp.workorder</field>
<field name="inherit_id" ref="mrp.mrp_production_workorder_tree_editable_view"/>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="processing_panel"/>
</field>
</field>
</record>
#-----------------制造订单-------------------
<!-- <record model="ir.ui.view" id="view_mrp_production_form_inherit_sf">-->
<!-- <field name="name">mrp.production.form.inherit.sf</field>-->
<!-- <field name="model">mrp.production</field>-->
<!-- <field name="inherit_id" ref="mrp.mrp_production_form_view"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <field name="workorder_ids" position="after">-->
<!-- </field>-->
<!-- </field>-->
<!-- </record>-->
</data>
</odoo>

29
sf_base/views/mrs_common_view.xml
View File

@@ -277,10 +277,26 @@
</record>
#------------------托盘------------------
<<<<<<< HEAD
=======
<record id="action_sf_tray" model="ir.actions.act_window">
<field name="name">托盘</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.tray</field>
<field name="view_mode">tree,form</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
创建托盘吧
</p>
</field>
</record>
>>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
<record id="view_sf_tray_search" model="ir.ui.view">
<field name="name">sf.tray.search</field>
<field name="model">sf.tray</field>
<field name="arch" type="xml">
<<<<<<< HEAD
<!-- <group>-->
@@ -293,6 +309,12 @@
<filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
</group>
<!-- </group>-->
=======
<search string="托盘">
<field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
</search>
>>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
</field>
</record>
@@ -312,7 +334,9 @@
<field name="name">sf.tray.form</field>
<field name="model">sf.tray</field>
<field name="arch" type="xml">
<header><field name = 'state' widget="radio" options="{'horizontal': True}"/></header>
<header>
<field name='state' widget="radio" options="{'horizontal': True}"/>
</header>
<form string="托盘">
<group string="基本信息" name="group1">
<group>
@@ -326,6 +350,7 @@
</field>
</record>
<<<<<<< HEAD
<record id="action_sf_tray" model="ir.actions.act_window">
<field name="name">托盘</field>
<field name="type">ir.actions.act_window</field>
@@ -337,6 +362,8 @@
</p>
</field>
</record>
=======
>>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
</data>
</odoo>