解决冲突

sf_machine_connect/controllers/controllers.py

@@ -1300,9 +1300,6 @@ class Sf_Dashboard_Connect(http.Controller):
         machine_list = ast.literal_eval(kw['machine_list'])
         time_threshold = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
 
-        alarm_last_24_time = 0.0
-        alarm_all_time = 0.0
-
         def fetch_result_as_dict(cursor):
             """辅助函数：将查询结果转为字典"""
             columns = [desc[0] for desc in cursor.description]
@@ -1311,6 +1308,9 @@ class Sf_Dashboard_Connect(http.Controller):
         # 获取当前时间的时间戳
         current_timestamp = datetime.now().timestamp()
         for item in machine_list:
+            alarm_last_24_time = 0.0
+            alarm_all_time = 0.0
+
             euipment_obj = request.env['maintenance.equipment'].sudo().search([('code', '=', item)])
             # 机床上线时间段
             first_online_duration = current_timestamp - euipment_obj.first_online_time.timestamp()