二次调度代码优化

core/group.py

@@ -473,33 +473,33 @@ class GroupDispatcher:
 
             self.logger.info(f'======================= 开始处理调度车辆 {truck_name} =======================')
 
-            # try:
-            # 全智能模式
-            if self.group.group_mode == 1:
-                self.logger.info("调度模式：全智能模式调度")
-                self.full_dynamic_mode(truck_id, solver, truck_dispatch, truck_info, truck_task, truck_trip)
-
-            # 空车智能模式
-            elif self.group.group_mode == 2:
-                self.logger.info("调度模式：空车智能模式调度")
-                self.semi_dynamic_mode(truck_id, solver, truck_dispatch, truck_info, truck_task, truck_trip)
-            # 定铲派车
-            elif self.group.group_mode == 3:
-                self.logger.info("调度模式：固定模式调度")
-                try:
-                    truck_dispatch[truck_id] = DispatchInfo.get_truck_match(truck_id)
-                except Exception as es:
-                    self.logger.error("固定派车-计算异常")
-                    self.logger.error(es)
-
-            # 分流配比模式
-            elif self.group.group_mode == 4:
-                self.logger.info("调度模式：分流配比模式调度")
-                self.ratio_mode(truck_id, truck_dispatch, truck_task)
+            try:
+                # 全智能模式
+                if self.group.group_mode == 1:
+                    self.logger.info("调度模式：全智能模式调度")
+                    self.full_dynamic_mode(truck_id, solver, truck_dispatch, truck_info, truck_task, truck_trip)
+
+                # 空车智能模式
+                elif self.group.group_mode == 2:
+                    self.logger.info("调度模式：空车智能模式调度")
+                    self.semi_dynamic_mode(truck_id, solver, truck_dispatch, truck_info, truck_task, truck_trip)
+                # 定铲派车
+                elif self.group.group_mode == 3:
+                    self.logger.info("调度模式：固定模式调度")
+                    try:
+                        truck_dispatch[truck_id] = DispatchInfo.get_truck_match(truck_id)
+                    except Exception as es:
+                        self.logger.error("固定派车-计算异常")
+                        self.logger.error(es)
+
+                # 分流配比模式
+                elif self.group.group_mode == 4:
+                    self.logger.info("调度模式：分流配比模式调度")
+                    self.ratio_mode(truck_id, truck_dispatch, truck_task)
 
-            # except Exception as es:
-            #     self.logger.error("调度调用异常")
-            #     self.logger.error(es)
+            except Exception as es:
+                self.logger.error("调度调用异常")
+                self.logger.error(es)
 
             self.logger.info(f'======================= 派车计划计算结束 {truck_name} =======================')