Commit d9c18bb7 authored by 张晓彤's avatar 张晓彤

修复修BUG

parent b95e895f
......@@ -614,7 +614,7 @@ class TruckInfo(WalkManage):
# 矿卡绑定物料
self.truck_material_bind = {}
# 矿卡绑定物料modify
self.dump_material_bind_modify = np.full((self.dynamic_truck_num, get_value("dynamic_excavator_num")), 0)
self.dump_material_bind_modify = np.full((self.dynamic_truck_num, get_value("dynamic_dump_num")), 0)
# self.excavator_material_bind_modify =np.zeros(self.dynamic_truck_num)
self.excavator_material_bind_modify = np.full((self.dynamic_truck_num, get_value("dynamic_excavator_num")), 0)
# # group_id
......
......@@ -852,7 +852,7 @@ class Dispatcher(WalkManage):
for truck_index in index:
if len(Seq[truck_index]) > 0:
try:
# try:
# 获取矿卡id
truck_id = truck.truck_index_to_uuid_dict[truck_index]
......@@ -878,10 +878,10 @@ class Dispatcher(WalkManage):
logger.error("非动态调度矿卡")
logger.error(es)
except Exception as es:
# logger.error(f'矿卡 {truck_uuid_to_name_dict[self.truck_index_to_uuid_dict[truck_index]]} 派车计划计算异常')
logger.error(f'矿卡派车计划计算异常')
logger.error(es)
# except Exception as es:
# # logger.error(f'矿卡 {truck_uuid_to_name_dict[self.truck_index_to_uuid_dict[truck_index]]} 派车计划计算异常')
# logger.error(f'矿卡派车计划计算异常')
# logger.error(es)
try:
......@@ -1064,14 +1064,14 @@ class Group(WalkManage):
opt_goto_dump_traffic_flow, opt_goto_excavator_traffic_flow = traffic_flow_plan(truck)
# try:
try:
print("uuid_to_index_dict")
print(dump.dump_uuid_to_index_dict)
print(excavator.excavator_uuid_to_index_dict)
for group_id in self.group_set:
dump_group = self.device_group[group_id][0]
dump_group = self.device_group[group_id][0] # group 类最后更新,读取派车计划及分组情况,和前面的uuid 可能不一致
excavator_group = self.device_group[group_id][1]
print("group")
print(self.device_group)
......@@ -1099,8 +1099,9 @@ class Group(WalkManage):
self.group_opt_goto_excavator_traffic_flow[group_id] = local_opt_goto_excavator_traffic_flow
self.group_actual_goto_dump_traffic_flow[group_id] = local_actual_goto_dump_traffic_flow
self.group_actual_goto_excavator_traffic_flow[group_id] = local_actual_goto_excavator_traffic_flow
# except Exception as es:
# logger.info(es)
except Exception as es:
logger.error(es)
logger.error("分组车流更新异常")
logger.info("group_opt_traffic_flow")
logger.info(self.group_opt_goto_dump_traffic_flow)
......@@ -1218,6 +1219,8 @@ class Group(WalkManage):
for group_dump_index in range(group_dump_num):
dump_index = dump.dump_uuid_to_index_dict[self.group_dump_index_to_uuid_dict[group_id][group_dump_index]]
print(truck.dump_material_bind_modify, truck_index, dump_index)
print(truck.dump_material_bind_modify[truck_index][dump_index], truck_index, dump_index)
dump_material_bind_modify[group_dump_index] = truck.dump_material_bind_modify[truck_index][dump_index]
self.group_excavator_exclude_modify[truck_id] = excavator_exclude_modify
......@@ -1318,7 +1321,7 @@ class Group(WalkManage):
# 下面三个函数保证程序定期执行,不用管他
def process(dispatcher):
try:
# try:
# 更新周期参数
logger.info("#####################################周期更新开始#####################################")
......@@ -1361,8 +1364,8 @@ def process(dispatcher):
logger.info("#####################################周期更新结束#####################################")
except Exception as es:
logger.error(es)
# except Exception as es:
# logger.error(es)
scheduler = sched.scheduler(time.time, time.sleep)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment