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

Merge branch 'feature/中控对接接口优化' into feature/中控接口注释及工厂数据处理

Browse Source 
# Conflicts:
#	sf_manufacturing/views/mrp_production_addional_change.xml
This commit is contained in:
yuxianghui
2024-04-25 14:10:22 +08:00
parent 961f7bfdc5 9d96e0681c
commit 53ed0d76a6
11 changed files with 74 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -23,6 +23,9 @@
<field name="product_id" position="after">
<field name="equipment_id" optional="hide"/>
</field>
<xpath expr="//field[@name='qty_remaining']" position="after">
<field name="manual_quotation" optional="show"/>
</xpath>
<xpath expr="//field[@name='date_planned_start']" position="replace">
<field name="date_planned_start" string="计划开始日期" optional="show"/>
</xpath>
@@ -174,6 +177,8 @@
attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"
sum="real duration"/>
<field name="glb_file" readonly="1" widget="Viewer3D" string="加工模型"/>
<field name="manual_quotation" readonly="1"
attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
<field name="processing_panel" readonly="1"
attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
<field name="equipment_id"