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

Accept Merge Request #107: (feature/修复sf的bug -> develop)

Browse Source 
Merge Request: 页面优化及部分bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/107
This commit is contained in:
杨金灵
2023-01-31 10:37:58 +08:00
parent e93906a5f0 e2ae08c33f
commit 210ee9d38d
12 changed files with 118 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sf_manufacturing/views/model_type_view.xml
View File

@@ -31,10 +31,21 @@
<form string="模型类型">
<group>
<field name="name" required="1"/>
<field name="embryo_tolerance" required="1"/>
<field name="embryo_tolerance" required="1" string="胚料容余(mm)"/>
</group>
<group>
<field name='routing_tmpl_ids'>
<field name='product_routing_tmpl_ids'>
<tree editable='bottom'>
<field name="sequence" widget="handle" string="序号"/>
<field name="route_workcenter_id" string="工序"/>
<field name="routing_type" string="类型"/>
<field name="is_repeat" string="重复"/>
<field name="workcenter_ids" string="工作中心" widget="many2many_tags"/>
</tree>
</field>
</group>
<group>
<field name='embryo_routing_tmpl_ids'>
<tree editable='bottom'>
<field name="sequence" widget="handle" string="序号"/>
<field name="route_workcenter_id" string="工序"/>

6
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -308,6 +308,9 @@
</xpath>
<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加工")]}'>
<group>
<field name="cnc_ids" widget="one2many" string="工作程序">
@@ -327,6 +330,8 @@
<field name="remark"/>
</tree>
</field>
</group>
<group>
<field name="cnc_worksheet" string="工作指令" widget="pdf_viewer"/>
</group>
</page>
@@ -335,7 +340,6 @@
<page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","后置三元质量检测")]}'>
<group>
<field name="test_results" widget="selection"/>
</group>
<div class="col-12 col-lg-6 o_setting_box">
<button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"