解决冲突

sf_warehouse/models/model.py

@@ -516,7 +516,15 @@ class ShelfLocation(models.Model):
         crea_url = config['center_control_url'] + "/AutoDeviceApi/GetLocationInfos"
 
         params = {'DeviceId': device_id}
-        r = requests.get(crea_url, params=params, headers=headers)
+        # r = requests.get(crea_url, params=params, headers=headers)
+        r = self.env['api.request.log'].log_request(
+            'get',
+            crea_url,
+            name='库位信息',
+            responser='中控系统',
+            params=params,
+            headers=headers
+        )
 
         ret = r.json()
 

sf_warehouse/models/sync_common.py

@@ -121,12 +121,13 @@ class MrsShelfLocationDataSync(models.Model):
                         tool.tool_in_out_stock_location(location_id)
                         if tool:
                             location_id.product_sn_id = tool.barcode_id.id
-                            # 修改功能刀具状态
-                            if item.get('State') == '报警':
-                                if tool.functional_tool_status != item.get('State'):
-                                    tool.write({
-                                        'functional_tool_status': item['State']
-                                    })
+                            # 修改功能刀具标准状态值和已使用寿命值、功能刀具状态
+                            if 'LifeStd' in item and 'LifeUse' in item:
+                                tool.sudo().write({
+                                    'max_lifetime_value': item['LifeStd'],
+                                    'used_value': item['LifeUse'],
+                                    'functional_tool_status': item['State'],
+                                })
                         else:
                             location_id.product_sn_id = False
                             if item['RfidCode']: