Merge branch 'feature/刀具组接口18-19优化' into feature/中控接口优化1

# Conflicts:
#	sf_warehouse/models/model.py

sf_warehouse/models/model.py

@@ -389,7 +389,7 @@ class ShelfLocation(models.Model):
                 # record.location_status = '空闲'
 
 
-    #调取获取货位信息接口
+    # 调取获取货位信息接口
     def get_sf_shelf_location_info(self):
         # sf_sync_config = self.env['res.config.settings'].get_values()
         # token = sf_sync_config['token']
@@ -401,7 +401,9 @@ class ShelfLocation(models.Model):
         # objs_all = self.env['maintenance.equipment'].search([('id', '=', self.id)])
         # machine_tool_list = []
 
-        r = requests.get(crea_url, headers=headers)
+        params = {'DeviceId': 'Cabinet-AL'}
+        r = requests.get(crea_url, params=params, headers=headers)
+
         ret = r.json()
 
         print(ret)