Merge branch 'feature/生产线驾驶舱优化' into feature/优化驾驶舱
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
'security/ir.model.access.csv',
|
||||
'wizard/wizard_view.xml',
|
||||
'views/tool_base_views.xml',
|
||||
'views/mrp_workcenter_views.xml',
|
||||
'views/sf_maintenance_equipment.xml',
|
||||
'views/menu_view.xml',
|
||||
'views/tool_material_search.xml',
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
from . import base
|
||||
from . import tool_material_search
|
||||
from . import maintenance_equipment
|
||||
from . import mrp_workorder
|
||||
|
||||
|
||||
@@ -36,3 +36,12 @@ class CNCprocessing(models.Model):
|
||||
# 调用CAM工单程序用刀计划创建方法
|
||||
self.env['sf.cam.work.order.program.knife.plan'].create_cam_work_plan(obj)
|
||||
return obj
|
||||
|
||||
|
||||
class MrpWorkCenter(models.Model):
|
||||
_inherit = 'mrp.workcenter'
|
||||
|
||||
def action_tool_order(self):
|
||||
action = self.env.ref('sf_tool_management.sf_functional_tool_assembly_view_act')
|
||||
result = action.read()[0]
|
||||
return result
|
||||
|
||||
33
sf_tool_management/views/mrp_workcenter_views.xml
Normal file
33
sf_tool_management/views/mrp_workcenter_views.xml
Normal file
@@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
<record id="mrp_workcenter_kanban_tool" model="ir.ui.view">
|
||||
<field name="name">mrp.workcenter.kanban.tool</field>
|
||||
<field name="model">mrp.workcenter</field>
|
||||
<field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//kanban//templates//t//div//div[2]//div//div//div//t[2]" position="after">
|
||||
<t t-if="record.name != '功能刀具组装中心'">
|
||||
<button string="组装单" name="action_tool_order" type="object" class="btn-primary"
|
||||
attrs="{'invisible': [('name', '!=', '功能刀具组装中心')]}"/>
|
||||
</t>
|
||||
</xpath>
|
||||
<xpath expr="//kanban//templates//t//div//div[2]//div//div//div//t[2]" position="replace">
|
||||
<t t-if="record.workorder_count.raw_value <= 0">
|
||||
<button class="btn btn-warning" name="%(mrp.act_product_mrp_production_workcenter)d" type="action"
|
||||
attrs="{'invisible': [('name', '=', '功能刀具组装中心')]}">
|
||||
<span>安排订单</span>
|
||||
</button>
|
||||
</t>
|
||||
</xpath>
|
||||
<xpath expr="//kanban//templates//t//div//div[2]//div//div//div//t[1]" position="replace">
|
||||
<t t-if="record.workorder_count.raw_value > 0">
|
||||
<button class="btn btn-primary" name="action_work_order" type="object"
|
||||
attrs="{'invisible': [('name', '=', '功能刀具组装中心')]}"
|
||||
context="{'search_default_ready': 1, 'search_default_progress': 1}">
|
||||
<span>工单</span>
|
||||
</button>
|
||||
</t>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user