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

Accept Merge Request #145: (feature/优化NC下发 -> develop)

Browse Source 
Merge Request: NC下发测试成功，请求合并

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/145?initial=true
This commit is contained in:
马广威
2023-02-27 14:57:30 +08:00
parent ad44c7c6a3 659651b930
commit dcdb3534dd
16 changed files with 344 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -51,7 +51,7 @@
<tree position="attributes">
<attribute name="multi_edit"></attribute>
<attribute name="editable"></attribute>
<attribute name="create">false</attribute>
<attribute name="create">False</attribute>
</tree>
</field>
</record>
@@ -342,11 +342,11 @@
<xpath expr="//page[1]" position="before">
<page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
<field name="cnc_ids" widget="one2many" string="工作程序">
<tree>
<tree decoration-success="button_state" decoration-bf="button_state">
<field name="sequence_number"/>
<field name="program_name"/>
<field name="cnc_id" string="文件"/>
<field name="cutting_tool_name"/>
<field name="cutting_tool_name"/>
<field name="cutting_tool_no"/>
<field name="processing_type"/>
<field name="margin_x_y"/>
@@ -356,6 +356,7 @@
<field name="cutting_tool_handle_type"/>
<field name="estimated_processing_time"/>
<field name="remark"/>
<field name="button_state" invisible="1"/>
</tree>
</field>
<group>