1.static_data_process.py 路网异常修复 2.替换Dispatch 表为 DispatchSetting 表

equipment/dump.py

@@ -118,7 +118,7 @@ class DumpInfo(WalkManage):
         self.dump_material = {}
         for dump_id in get_value("dynamic_dump_set"):
             try:
-                unload_area_id = session_mysql.query(Dispatch).filter_by(dump_id=dump_id, isauto=1, isdeleted=0).first().unload_area_id
+                unload_area_id = session_mysql.query(DispatchSetting).filter_by(dump_id=dump_id, isauto=1, isdeleted=0).first().unload_area_id
                 dump_material_id = session_postgre.query(DumpArea).filter_by(Id=unload_area_id).first().Materials
                 self.dump_material[dump_id] = dump_material_id
             except Exception as es:

equipment/excavator.py

@@ -131,7 +131,7 @@ class ExcavatorInfo(WalkManage):
         self.logger.info(self.dynamic_excavator_set)
         for excavator_id in self.dynamic_excavator_set:
             try:
-                load_area_id = session_mysql.query(Dispatch).filter_by(exactor_id=excavator_id, isdeleted=0, isauto=1).first().load_area_id
+                load_area_id = session_mysql.query(DispatchSetting).filter_by(exactor_id=excavator_id, isdeleted=0, isauto=1).first().load_area_id
                 excavator_material_id = session_postgre.query(DiggingWorkArea).filter_by(Id=load_area_id).first().Material
                 self.excavator_material[excavator_id] = excavator_material_id
             except Exception as es:

equipment/truck.py

@@ -273,7 +273,6 @@ class TruckInfo(WalkManage):
                 if task in empty_task_set + heavy_task_set and item is None:
                     raise Exception(f"矿卡 {truck_id} 配对关系异常")
             except Exception as es:
-                self.logger.error("配对关系异常")
                 self.logger.error(es)
                 session_postgre.rollback()
                 session_mysql.rollback()

path_plan/priority_control.py

@@ -112,7 +112,7 @@ class PriorityController:
         for dump_id in get_value("dynamic_dump_set"):
             for excavator_id in get_value("dynamic_excavator_set"):
                 try:
-                    item = session_mysql.query(Dispatch).filter_by(dump_id=dump_id, exactor_id=excavator_id, isauto=1,
+                    item = session_mysql.query(DispatchSetting).filter_by(dump_id=dump_id, exactor_id=excavator_id, isauto=1,
                                                                isdeleted=0).first()
                 except Exception as es:
                     session_postgre.rollback()