Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能

2024-08-16 16:57:47 +08:00
parent f537fbc597 a277bb402e
commit a07a1ba268
20 changed files with 903 additions and 266 deletions
--- a/sf_machine_connect/views/WorkCenterBarcodes.xml
+++ b/sf_machine_connect/views/WorkCenterBarcodes.xml
@@ -26,6 +26,7 @@
                <filter string="自动编程" name="no_manual_quotation" domain="[('manual_quotation', '=', False)]"/>
            </xpath>
            <xpath expr="//field[@name='production_id']" position="before">
+                <field name="mixed_search_field"/>
                <field name="product_tmpl_name"/>
                <field name="rfid_code"/>
            </xpath>