fix: 允许等待重试任务手动重新执行 (#70)

client/src/pdd_ui_event.py

@@ -608,7 +608,7 @@ class PDDTaskPageEvent(QObject):
             self._stop_after_current(content)
 
     @pyqtSlot(str, str, str)
-    def _on_collect_outcome(self, kind: str, message: str, _task_id: str) -> None:
+    def _on_collect_outcome(self, kind: str, message: str, task_id: str) -> None:
         if self._closing:
             return
         self._reload()
@@ -622,6 +622,13 @@ class PDDTaskPageEvent(QObject):
             )
         elif kind == "result_pending":
             self._on_claim_retryable_failed(message)
+        elif kind == "failed" and self._is_retry_wait_task(task_id):
+            content = (
+                f"自动获取：已停止 · 任务 {task_id} 重试已暂停；"
+                "请选择该任务点击“重新执行”，或重新启动获取任务"
+            )
+            self._show_retry_paused(content)
+            self._stop_after_current(content)
         elif kind in {"manual_review", "failed"}:
             self._show_claim_error("采集任务需要处理", message)
             self._stop_after_current(message)
@@ -632,6 +639,29 @@ class PDDTaskPageEvent(QObject):
             self._show_claim_error("自动获取已停止", content)
             self._stop_after_current(content)
 
+    def _is_retry_wait_task(self, task_id: str) -> bool:
+        """判断失败结果对应的任务是否仍可在本地重试。"""
+
+        if not task_id:
+            return False
+        try:
+            task = self._repository.get_task(task_id)
+        except Exception:
+            return False
+        return task is not None and task.status is TaskStatus.RETRY_WAIT
+
+    def _show_retry_paused(self, content: str) -> None:
+        """用持久警告说明任务不会自行倒计时重试。"""
+
+        InfoBar.warning(
+            title="重试已暂停",
+            content=content,
+            isClosable=True,
+            duration=-1,
+            position=InfoBarPosition.TOP_RIGHT,
+            parent=self._page,
+        )
+
     def _show_claim_error(self, title: str, content: str) -> None:
         """显示不会自动消失的可恢复错误，同时保留底部状态文字。"""
 

client/src/task_repository.py

@@ -262,6 +262,7 @@ class TaskRepository:
         if row["task_type"] != TaskType.COLLECT.value:
             raise CollectRerunError("采购任务不能重新执行，以免重复下单")
         allowed_statuses = {
+            TaskStatus.RETRY_WAIT.value,
             TaskStatus.SUCCEEDED.value,
             TaskStatus.FAILED.value,
             TaskStatus.CANCELLED.value,
@@ -272,17 +273,20 @@ class TaskRepository:
                 TaskStatus.CLAIMED.value: "待执行",
                 TaskStatus.RUNNING.value: "执行中",
                 TaskStatus.RESULT_PENDING.value: "结果待提交",
-                TaskStatus.RETRY_WAIT.value: "等待重试",
             }.get(row["status"], row["status"])
             raise CollectRerunError(f"任务当前为“{status_name}”，不能重新采集")
-        unsent_count = int(
-            connection.execute(
-                "SELECT COUNT(*) FROM outbox_events"
-                " WHERE task_id = ? AND status != 'sent'",
-                (row["id"],),
-            ).fetchone()[0]
-        )
-        if unsent_count:
+        unsent = connection.execute(
+            "SELECT status, last_error FROM outbox_events"
+            " WHERE task_id = ? AND status != 'sent'"
+            " ORDER BY id DESC LIMIT 1",
+            (row["id"],),
+        ).fetchone()
+        if unsent is not None and unsent["status"] == OutboxStatus.FAILED.value:
+            reason = unsent["last_error"] or "Admin 未接收上次结果"
+            raise CollectRerunError(
+                f"任务上次结果提交失败：{reason}；请先处理后再重新采集"
+            )
+        if unsent is not None:
             raise CollectRerunError("任务仍有未发送的结果，请先完成提交")
 
     def start_collect_run(