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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废

Browse Source 
# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv
This commit is contained in:
jinling.yang
2024-07-17 19:32:21 +08:00
parent 8726f8cac3 11ec448e81
commit 7163e025d2
6 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/views/mrp_production_addional_change.xml
View File

@@ -457,6 +457,9 @@
</xpath>
<xpath expr="//filter[@name='planning_issues']" position="before">
<separator/>
<filter string="返工且已编程" name="filter_rework_programmed"
domain="[('state', '=', 'rework'),('programming_state', '=', '已编程')]"/>
<separator/>
<filter name="filter_programming" string="编程中"
domain="[('programming_state', '=', '编程中')]"/>
<filter name="filter_programmed" string="已编程"
@@ -557,7 +560,7 @@
<field name="arch" type="xml">
<form>
<group>
<field name="handle_result"/>
<!-- <field name="handle_result"/>-->
<field name="test_report" readonly="1" widget="pdf_viewer"/>
</group>
</form>

2
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -185,7 +185,7 @@
<xpath expr="//label[1]" position="before">
<field name='routing_type' readonly="1"/>
<field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
<field name="rfid_code" cache="True"
<field name="rfid_code" force_save="1" readonly="1" cache="True"
attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
<field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
</xpath>