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 feature/生产排程

Browse Source
This commit is contained in:
mgw
2023-08-25 09:14:34 +08:00
parent e33a25e47a 9318be0f09
commit eda57036bd
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sf_manufacturing/views/mrp_workcenter_views.xml
View File

@@ -24,19 +24,28 @@
</field>
</record>
<!-- <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">-->
<!-- <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>-->
<!-- <field name="model">mrp.workcenter</field>-->
<!-- <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>-->
<!-- <field name="arch" type="xml">-->
<!-- &lt;!&ndash; Desktop view &ndash;&gt;-->
<!-- <xpath expr="//div[@name='o_wo']" position="inside">-->
<!-- <button class="btn btn-secondary fa fa-desktop" name="action_work_order" type="object"-->
<!-- context="{'search_default_ready': 1, 'search_default_progress': 1, 'search_default_pending': 1, 'desktop_list_view': 1, 'search_default_workcenter_id': active_id}"-->
<!-- title="Work orders" aria-label="Work orders"/>-->
<!-- </xpath>-->
<!-- </field>-->
<!-- </record>-->
<record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
<field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
<field name="model">mrp.workcenter</field>
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
<field name="arch" type="xml">
<!-- Desktop view -->
<xpath expr='(//field[@name="name"])[1]' position="after">
<field name="equipment_status" />
<field name="equipment_image" />
</xpath>
<xpath expr='(//field[@name="name"])[2]' position="after">
<field name="equipment_status" />
<field name="equipment_image" widget="image" />
</xpath>
</field>
</record>
<!-- override to change the no content image -->
<record id="mrp.action_work_orders" model="ir.actions.act_window">
@@ -90,6 +99,7 @@
<field name="arch" type="xml">
<xpath expr="//field[@name='company_id']" position="after">
<field name="users_ids" widget="many2many_tags" string="可操作用户"/>
<field name="equipment_status"/>
</xpath>
<xpath expr="//field[@name='alternative_workcenter_ids']" position="after">
<field name="production_line_id"/>