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

Accept Merge Request #109: (feature/工单的cnc工单加工面显示bug修复 -> develop)

Browse Source 
Merge Request: 工单的cnc工单加工面显示bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/109
This commit is contained in:
杨金灵
2023-01-31 12:03:20 +08:00
parent 8957fec332 7b78e2451a
commit afcea7f715
1 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -56,7 +56,7 @@
<field name="view_ids" eval="[(5, 0, 0), <field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}), (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}),
(0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/> (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>
<!-- <field name="target">fullscreen</field>--> <!-- <field name="target">fullscreen</field>-->
<field name="target">current</field> <field name="target">current</field>
<field name="domain">[('state', 'not in', ['done', 'cancel'])]</field> <field name="domain">[('state', 'not in', ['done', 'cancel'])]</field>
<field name="context">{'search_default_workcenter_id': active_id}</field> <field name="context">{'search_default_workcenter_id': active_id}</field>
@@ -110,7 +110,10 @@
attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/> attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
</sheet> </sheet>
<field name="production_id" position="after">
<field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',
'前置三元定位检测','后置三元质量检测','解除装夹'))]}"/>
</field>
<xpath expr="//page[1]" position="before"> <xpath expr="//page[1]" position="before">
<page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'> <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
<group> <group>
@@ -309,11 +312,7 @@
</xpath> </xpath>
<xpath expr="//page[1]" position="before"> <xpath expr="//page[1]" position="before">
<field name="production_id" position="after">
<field name="processing_panel" readonly="1"/>
</field>
<page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'> <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<group>
<field name="cnc_ids" widget="one2many" string="工作程序"> <field name="cnc_ids" widget="one2many" string="工作程序">
<tree> <tree>
<field name="sequence_number"/> <field name="sequence_number"/>
@@ -331,7 +330,6 @@
<field name="remark"/> <field name="remark"/>
</tree> </tree>
</field> </field>
</group>
<group> <group>
<field name="cnc_worksheet" string="工作指令" widget="pdf_viewer"/> <field name="cnc_worksheet" string="工作指令" widget="pdf_viewer"/>
</group> </group>