1、解决 装夹预调工单扫描Rfid码时提示语的制造订单号显示重复了 的缺陷， 添加工单扫描的Rfid不是托盘是其他物料的提示；2、解决刀具管理模块的菜单依赖问题；3、管理员添加货位的操作权限

sf_manufacturing/models/mrp_workorder.py

@@ -1040,10 +1040,11 @@ class SfWorkOrderBarcodes(models.Model):
         workorder = self.env['mrp.workorder'].browse(self.ids)
         # workorder_preset = self.env['mrp.workorder'].search(
         #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
-        workorder_old = self.env['mrp.workorder'].search([('rfid_code', '=', barcode)])
-        if workorder_old:
+        workorder_olds = self.env['mrp.workorder'].search(
+            [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
+        if workorder_olds:
             name = ''
-            for workorder in workorder_old:
+            for workorder in workorder_olds:
                 name = '%s  %s' % (name, workorder.production_id.name)
             raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name)
         if workorder:
@@ -1073,6 +1074,8 @@ class SfWorkOrderBarcodes(models.Model):
                                 for item in workorder_rfid:
                                     item.write({'rfid_code': barcode})
                             logging.info("Rfid绑定成功！！！")
+                        else:
+                            raise UserError('该Rfid【%s】绑定的是【%s】, 不是托盘！！！' % (barcode, lot.product_id.name))
                     self.process_state = '待检测'
                     self.date_start = datetime.now()
                 else:

sf_tool_management/__manifest__.py

@@ -19,9 +19,9 @@
         'views/functional_tool_views.xml',
         'views/mrp_workcenter_views.xml',
         'views/sf_maintenance_equipment.xml',
-        'views/menu_view.xml',
         'views/tool_material_search.xml',
         'views/fixture_material_search_views.xml',
+        'views/menu_view.xml',
         'data/tool_data.xml',
     ],
     'demo': [

sf_tool_management/views/fixture_material_search_views.xml

@@ -95,12 +95,4 @@
         <field name="res_model">sf.fixture.material.search</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <menuitem
-            sequence="25"
-            name="夹具物料查询"
-            id="menu_sf_fixture_material_search"
-            action="action_sf_fixture_material_search"
-            parent="menu_sf_fixture"
-    />
 </odoo>

sf_tool_management/views/menu_view.xml

@@ -120,5 +120,13 @@
                 parent="menu_sf_tool_material"
         />
 
+        <menuitem
+            sequence="25"
+            name="夹具物料查询"
+            id="menu_sf_fixture_material_search"
+            action="action_sf_fixture_material_search"
+            parent="menu_sf_fixture"
+    />
+
     </data>
 </odoo>

sf_warehouse/security/ir.model.access.csv

@@ -137,6 +137,7 @@ access_sf_shelf_location_wizard_group_sf_stock_user_group_sf_stock_user,sf_shelf
 access_sf_shelf_location_wizard_group_sf_stock_manager,sf_shelf_location_wizard_group_sf_stock_manager,model_sf_shelf_location_wizard,sf_warehouse.group_sf_stock_manager,1,1,1,0
 
 access_sf_shelf_location_group_sf_tool_user,sf.shelf.location.group_sf_tool_user,model_sf_shelf_location,sf_base.group_sf_tool_user,1,1,0,0
+access_sf_shelf_group_user,sf.shelf.location.group_user,model_sf_shelf_location,base.group_user,1,1,0,0