diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java index 3de599009..1ebb4d447 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java @@ -263,6 +263,9 @@ public interface LoadingListQueryMapper { updated_at = CURRENT_TIMESTAMP(3), version = version + 1 WHERE id = #{planId} AND plan_status = 'EDITING' AND version = #{expectedVersion} + AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task task + JOIN fl_loading_pick_assignment assignment ON assignment.pick_task_id=task.id + WHERE task.loading_plan_id=fl_loading_plan.id AND task.task_status<>'LOADING') AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task task WHERE task.loading_plan_id=fl_loading_plan.id AND task.task_status<>'LOADING') AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task task @@ -281,6 +284,9 @@ public interface LoadingListQueryMapper { b.updated_by = #{operatorId}, b.updated_by_name = #{operatorName}, b.updated_at = CURRENT_TIMESTAMP(3), b.version = b.version + 1 WHERE p.id = #{planId} AND p.plan_status='EDITING' + AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task task + JOIN fl_loading_pick_assignment assignment ON assignment.pick_task_id=task.id + WHERE task.loading_plan_id=p.id AND task.task_status<>'LOADING') AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task task WHERE task.loading_plan_id=p.id AND task.task_status<>'LOADING') AND NOT EXISTS (SELECT 1 FROM fl_loading_pick_task task