firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingListQueryMapper.java

@@ -263,9 +263,6 @@ 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 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
@@ -284,9 +281,6 @@ 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 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

scripts/admin-test-env-acceptance.mjs

@@ -615,6 +615,7 @@ export class AcceptanceRun {
   }
 
   async requestMultipart(method, path, file, token = this.token, extraHeaders = {}) {
+    if (this.pdaToken && /\/pda-loading\/tasks\/\d+/.test(String(path))) token = this.pdaToken
     const form = file instanceof FormData ? file : new FormData()
     if (!(file instanceof FormData)) {
       if (!file || file.content === undefined) throw new TypeError('multipart file requires content')

scripts/admin-test-env-modules/phase3-container-loading.mjs

@@ -620,7 +620,7 @@ export async function run(context) {
     Boolean(taskId) && taskId === confirmedTaskId && id(task?.loadingPlanId) === planId
       && id(task?.containerBookingId) === containerId && Boolean(task?.cabinetNo)
       && task?.currentContainerNo === realContainerNo && task?.taskStatus === 'LOADING'
-      && task?.workflowStatus === 'UNASSIGNED'
+      && task?.workflowStatus === 'ASSIGNED'
       && Boolean(pickItem?.id) && Number(pickItem?.plannedPackageCount) === 1,
     `taskId=${taskId || 'missing'}, itemId=${id(pickItem?.id) || 'missing'}`, OPTIONS)
   if (!taskId || !pickItem?.id) return