Accept Merge Request #1766: (feature/制造功能优化 -> develop)

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

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1766?initial=true

sf_manufacturing/views/mrp_workorder_view.xml

@@ -311,7 +311,7 @@
             <xpath expr="//page[1]" position="before">
                 <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
-<!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
+                        <field name="_barcode_scanned" widget="barcode_handler"/>
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
                         </group>