Skip to content

fix(DeliveryJobs): 当有待运送货物时,提醒用户并直接结束任务#665

Merged
he0119 merged 5 commits intomainfrom
fix/ongoing-delivery
Feb 22, 2026
Merged

fix(DeliveryJobs): 当有待运送货物时,提醒用户并直接结束任务#665
he0119 merged 5 commits intomainfrom
fix/ongoing-delivery

Conversation

@he0119
Copy link
Contributor

@he0119 he0119 commented Feb 21, 2026

Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:

  • 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:

  • 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:

  • 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。
Original summary in English

Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with user-facing prompts and automatic task termination.

New Features:

  • Add user prompt when attempting to complete a delivery job that still has undelivered cargo.

Bug Fixes:

  • Ensure delivery jobs can correctly complete even when remaining cargo exists, preventing inconsistent task states.

Enhancements:

  • Adjust DeliveryJobs depot and cargo packing pipeline configuration to align with the new completion and reminder behavior.

新功能:

  • 当配送任务中仍有剩余货物时,新增用户提示与自动完成行为。

错误修复:

  • 修正配送任务流程,使在仍有未交付货物时任务能正确结束,避免出现不一致的任务状态。

优化改进:

  • 调整 DeliveryJobs 仓库与货物打包节点配置,以匹配新的完成逻辑与提醒行为。
Original summary in English

Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:

  • 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:

  • 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:

  • 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。
Original summary in English

Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with user-facing prompts and automatic task termination.

New Features:

  • Add user prompt when attempting to complete a delivery job that still has undelivered cargo.

Bug Fixes:

  • Ensure delivery jobs can correctly complete even when remaining cargo exists, preventing inconsistent task states.

Enhancements:

  • Adjust DeliveryJobs depot and cargo packing pipeline configuration to align with the new completion and reminder behavior.

@he0119 he0119 force-pushed the fix/ongoing-delivery branch from bde62a0 to b080a41 Compare February 22, 2026 00:30
@he0119 he0119 marked this pull request as ready for review February 22, 2026 00:46
Copilot AI review requested due to automatic review settings February 22, 2026 00:46
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

嗨,我已经审查了你的改动,一切看起来都很棒!


Sourcery 对开源项目是免费的——如果你喜欢我们的审查,请考虑分享 ✨
帮我变得更有用!请在每条评论上点 👍 或 👎,我会根据你的反馈改进后续的代码审查。
Original comment in English

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

本 PR 调整 DeliveryJobs(配送工作)在“货物装箱”阶段的流水线逻辑:当检测到仍有待运送货物时,向用户提示并直接结束任务,同时补齐多语言本地化文案,以避免任务状态不一致。

Changes:

  • 新增 DeliveryJobsPackCargo 分发节点,集中承载装箱流程的状态判断与跳转。
  • 新增 DeliveryJobsOngoingDelivery OCR 检测:识别到“有待运送的货物”等提示时 StopTask 并通过 $task.DeliveryJobs.OngoingDelivery 提示用户。
  • 更新仓库节点进入货物后的跳转逻辑,并为各语言新增对应的本地化字符串。

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
assets/resource_fast/pipeline/DeliveryJobs/PackCargo.json 新增装箱流程入口/分发节点与“有待运送货物”检测后停止任务的逻辑
assets/resource_fast/pipeline/DeliveryJobs/DepotNode.json 进入货物界面后改为进入新的装箱流程分发节点;扩展“在货物界面”OCR 期望文本以覆盖更多子界面
assets/misc/locales/zh_tw.json 新增 ongoing delivery 提示文案
assets/misc/locales/zh_cn.json 新增 ongoing delivery 提示文案
assets/misc/locales/ko_kr.json 新增 ongoing delivery 提示文案
assets/misc/locales/ja_jp.json 新增 ongoing delivery 提示文案
assets/misc/locales/en_us.json 新增 ongoing delivery 提示文案

@he0119 he0119 merged commit 25cf6e4 into main Feb 22, 2026
21 checks passed
@he0119 he0119 deleted the fix/ongoing-delivery branch February 22, 2026 00:58
HYY1116 pushed a commit to HYY1116/MaaEnd that referenced this pull request Feb 25, 2026
## Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:
- 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:
- 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:
- 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with
user-facing prompts and automatic task termination.

New Features:
- Add user prompt when attempting to complete a delivery job that still
has undelivered cargo.

Bug Fixes:
- Ensure delivery jobs can correctly complete even when remaining cargo
exists, preventing inconsistent task states.

Enhancements:
- Adjust DeliveryJobs depot and cargo packing pipeline configuration to
align with the new completion and reminder behavior.

</details>

新功能:
- 当配送任务中仍有剩余货物时,新增用户提示与自动完成行为。

错误修复:
- 修正配送任务流程,使在仍有未交付货物时任务能正确结束,避免出现不一致的任务状态。

优化改进:
- 调整 DeliveryJobs 仓库与货物打包节点配置,以匹配新的完成逻辑与提醒行为。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:
- 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:
- 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:
- 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with
user-facing prompts and automatic task termination.

New Features:
- Add user prompt when attempting to complete a delivery job that still
has undelivered cargo.

Bug Fixes:
- Ensure delivery jobs can correctly complete even when remaining cargo
exists, preventing inconsistent task states.

Enhancements:
- Adjust DeliveryJobs depot and cargo packing pipeline configuration to
align with the new completion and reminder behavior.

</details>

</details>
MistEO pushed a commit that referenced this pull request Mar 9, 2026
## Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:
- 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:
- 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:
- 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with
user-facing prompts and automatic task termination.

New Features:
- Add user prompt when attempting to complete a delivery job that still
has undelivered cargo.

Bug Fixes:
- Ensure delivery jobs can correctly complete even when remaining cargo
exists, preventing inconsistent task states.

Enhancements:
- Adjust DeliveryJobs depot and cargo packing pipeline configuration to
align with the new completion and reminder behavior.

</details>

新功能:
- 当配送任务中仍有剩余货物时,新增用户提示与自动完成行为。

错误修复:
- 修正配送任务流程,使在仍有未交付货物时任务能正确结束,避免出现不一致的任务状态。

优化改进:
- 调整 DeliveryJobs 仓库与货物打包节点配置,以匹配新的完成逻辑与提醒行为。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:
- 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:
- 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:
- 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with
user-facing prompts and automatic task termination.

New Features:
- Add user prompt when attempting to complete a delivery job that still
has undelivered cargo.

Bug Fixes:
- Ensure delivery jobs can correctly complete even when remaining cargo
exists, preventing inconsistent task states.

Enhancements:
- Adjust DeliveryJobs depot and cargo packing pipeline configuration to
align with the new completion and reminder behavior.

</details>

</details>
MistEO pushed a commit that referenced this pull request Mar 9, 2026
## Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:
- 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:
- 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:
- 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with
user-facing prompts and automatic task termination.

New Features:
- Add user prompt when attempting to complete a delivery job that still
has undelivered cargo.

Bug Fixes:
- Ensure delivery jobs can correctly complete even when remaining cargo
exists, preventing inconsistent task states.

Enhancements:
- Adjust DeliveryJobs depot and cargo packing pipeline configuration to
align with the new completion and reminder behavior.

</details>

新功能:
- 当配送任务中仍有剩余货物时,新增用户提示与自动完成行为。

错误修复:
- 修正配送任务流程,使在仍有未交付货物时任务能正确结束,避免出现不一致的任务状态。

优化改进:
- 调整 DeliveryJobs 仓库与货物打包节点配置,以匹配新的完成逻辑与提醒行为。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

更新交付任务完成逻辑,以在仍有剩余货物时提供面向用户的提示,并支持自动结束任务。

New Features:
- 当尝试完成仍有未交付货物的交付任务时,新增用户提示。

Bug Fixes:
- 确保在仍有剩余货物的情况下,交付任务也能正确完成,避免任务状态不一致。

Enhancements:
- 调整 DeliveryJobs 的仓库及货物打包流水线配置,使其与新的完成逻辑和提醒行为保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update delivery job completion logic to handle remaining cargo with
user-facing prompts and automatic task termination.

New Features:
- Add user prompt when attempting to complete a delivery job that still
has undelivered cargo.

Bug Fixes:
- Ensure delivery jobs can correctly complete even when remaining cargo
exists, preventing inconsistent task states.

Enhancements:
- Adjust DeliveryJobs depot and cargo packing pipeline configuration to
align with the new completion and reminder behavior.

</details>

</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants