|
|
@@ -731,10 +731,11 @@ class RunMain:
|
|
|
"current":progress.get("current",0),
|
|
|
"total":progress.get("total",0),
|
|
|
"error":progress.get("error",0),
|
|
|
- "folder":progress.get("folder",0)
|
|
|
+ "folder":progress.get("folder",None)
|
|
|
},
|
|
|
"msg_type": "detail_progress",
|
|
|
}
|
|
|
+ print("\033[1;32;40m 详情页消息 \033[0m",data)
|
|
|
message_queue.put_nowait(data)
|
|
|
def move_error_folders(self, one_path, target_folder, message=""):
|
|
|
if os.path.exists(one_path):
|
|
|
@@ -974,7 +975,7 @@ class RunMain:
|
|
|
)
|
|
|
except BaseException as e:
|
|
|
detail_error_progress+=1
|
|
|
- detail_progress = {"status":"处理失败","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
|
|
|
+ detail_progress = {"status":"处理失败","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress,"folder":""}
|
|
|
self.sendAsyncMessage(
|
|
|
msg="处理失败",
|
|
|
goods_arts=[],
|
|
|
@@ -1033,7 +1034,7 @@ class RunMain:
|
|
|
"current":detail_finish_progress,
|
|
|
"total":self.total_num,
|
|
|
"error":self.fail_num,
|
|
|
- "folder":out_put_dir_resp[0] if len(all_detail_path_list) > 0 else "",
|
|
|
+ "folder":out_put_dir_resp[0] if text_status=="处理完成" else "",
|
|
|
}
|
|
|
self.sendAsyncMessage(
|
|
|
msg=text_status,
|
rambo