From 5250f304be7d29f3adc8228aefa07e59f3f97b08 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Thu, 27 Aug 2026 18:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java | 2 +- .../firstleg/repository/LoadingPickItemMapperContractTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java index a39cba50e..e6e12e61a 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java @@ -232,6 +232,7 @@ public interface LoadingPickItemMapper extends BaseMapper /** * 以结算后的装柜计划事实为完成口径，不能只检查当前 PDA 任务中的明细。 * PARTIAL 在本查询前已把计划箱数收敛为实际拣货箱数；收敛前的严格小于关系由结算计划校验。 + * 异步完成期间任务会在 COMPLETING/COMPLETION_FAILED 间切换，不能把任务状态当成明细未完成事实。 */ @Select(""" SELECT COUNT(*) @@ -244,7 +245,6 @@ public interface LoadingPickItemMapper extends BaseMapper JOIN fl_loading_pick_task pick_task ON pick_task.id = pick_item.pick_task_id WHERE pick_item.loading_plan_item_id = plan_item.id AND pick_task.loading_plan_id = #{planId} - AND pick_task.task_status = 'LOADING' AND ( (pick_item.item_status = 'PICKED' AND pick_item.picked_package_count = plan_item.package_count) diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java index 6a91c556b..06477ebdf 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickItemMapperContractTest.java @@ -63,7 +63,7 @@ class LoadingPickItemMapperContractTest { .contains("plan_item.loading_plan_id = #{planId}") .contains("plan_item.deleted = 0") .contains("pick_task.loading_plan_id = #{planId}") - .contains("pick_task.task_status = 'LOADING'") + .doesNotContain("pick_task.task_status") .contains("pick_item.item_status = 'PICKED'") .contains("pick_item.picked_package_count = plan_item.package_count") .contains("pick_item.item_status = 'PARTIAL'")