fix(overseas): restore pending resource confirmation from original command

2026-10-05 05:40:21 +08:00
parent 28eb43893a
commit 578df0f927
2 changed files with 162 additions and 27 deletions
@@ -124,13 +124,20 @@ interface ContainerConversionResult {
  existingPlanNos: Set<string>
  newPlanCount: number
  existingPlanCount: number
+  resourceRecovered: boolean
 }
 const containerConversionResult = ref<ContainerConversionResult | null>(null)
 let containerPreviewRequest = 0
 let containerPreviewLoadingBookingId = ''
 let containerConversionIdempotencyKey = ''
-const containerConfirmDisabled = computed(() => !containerPreview.value?.ready
-  || containerPreview.value.pendingOrderCount <= 0
+const containerIsResourceRecovery = computed(() => Boolean(containerPreview.value?.resourceRetry || containerConversionResult.value?.resourceRecovered))
+const containerConfirmText = computed(() => containerConversionResult.value
+  ? containerConversionResult.value.resourceRecovered ? '已确认' : '已生成'
+  : containerPreview.value?.resourceRetry ? '重试资源确认' : '确认生成')
+const containerConfirmDisabled = computed(() => !access.can(permission.inboundOrderCreate)
+  || !containerPreview.value?.ready
+  || (!containerPreview.value.resourceRetry && containerPreview.value.pendingOrderCount <= 0)
+  || containerOptionsLoading.value
  || containerPreviewLoading.value
  || actionLoading.value
  || Boolean(containerConversionResult.value))
@@ -755,8 +762,10 @@ async function loadContainerPreview(sourceContainerBookingId = selectedContainer

 async function confirmContainerInboundPlans() {
  const preview = containerPreview.value
-  if (!preview?.ready || preview.pendingOrderCount <= 0 || actionLoading.value) return
-  if (!containerConversionIdempotencyKey) containerConversionIdempotencyKey = idempotencyKey('container-inbound-plan')
+  if (!preview || containerConfirmDisabled.value) return
+  if (preview.resourceRetry) containerConversionIdempotencyKey = preview.resourceRetry.idempotencyKey
+  else if (!containerConversionIdempotencyKey) containerConversionIdempotencyKey = idempotencyKey('container-inbound-plan')
+  const resourceRecovery = Boolean(preview.resourceRetry)
  const bookingId = preview.sourceContainerBookingId
  const commandSnapshot = preview.resourceRetry ?? preview
  const existingPlanNos = new Set(preview.groups.flatMap((group) => group.orders)
@@ -777,8 +786,11 @@ async function confirmContainerInboundPlans() {
      existingPlanNos,
      newPlanCount: plans.length - existingPlanCount,
      existingPlanCount,
+      resourceRecovered: resourceRecovery,
    }
-    ElMessage.success(`已生成 ${plans.length - existingPlanCount} 个入库计划`)
+    ElMessage.success(resourceRecovery
+      ? `已完成 ${plans.length} 个已有计划的资源确认`
+      : `已生成 ${plans.length - existingPlanCount} 个入库计划`)
    containerPreview.value = null
    await Promise.all([load(), loadContainerPreview(bookingId, true)])
  } catch (error) {
@@ -1101,7 +1113,7 @@ onMounted(() => { void load() })
      <el-form-item label="备注"><el-input v-model="transferForm.remark" type="textarea" maxlength="500" placeholder="请输入转仓备注（选填）" /></el-form-item>
    </el-form>
  </AppDialog>
-  <AppDialog class="admin-density-dialog" v-model="containerConvertOpen" title="按柜生成入库计划预览" width="min(1240px, calc(100vw - 80px))" :confirm-text="containerConversionResult ? '已生成' : '确认生成'" :loading="containerOptionsLoading || containerPreviewLoading" :confirm-loading="actionLoading" :confirm-disabled="containerConfirmDisabled" @confirm="confirmContainerInboundPlans">
+  <AppDialog class="admin-density-dialog" v-model="containerConvertOpen" title="按柜生成入库计划预览" width="min(1240px, calc(100vw - 80px))" :confirm-text="containerConfirmText" :loading="containerOptionsLoading || containerPreviewLoading" :confirm-loading="actionLoading" :confirm-disabled="containerConfirmDisabled" @confirm="confirmContainerInboundPlans">
    <p class="container-convert-hint">先读取服务端全柜预览，确认分组、托数和阻断原因；确认后整柜只提交一次生成命令。</p>
    <LoadErrorState v-if="containerLoadError" title="待分配柜加载失败" :message="containerLoadError.message" compact @retry="loadContainerOptions()">
      <template #details><ApiErrorMeta :details="containerLoadError" /></template>
@@ -1116,19 +1128,24 @@ onMounted(() => { void load() })
    <el-alert v-if="containerPreviewError" class="container-convert-alert" type="error" :closable="false" show-icon :title="containerPreviewError" />
    <div v-if="containerPreview" class="container-preview">
      <div class="container-preview__context">
-        <div class="container-preview__identity text-ellipsis" :title="containerPreview.containerNo || containerPreview.sourceContainerBookingId">{{ containerPreview.containerNo || '未录入货柜号' }}</div>
+        <div class="container-preview__identity text-ellipsis" :title="containerPreview.containerNo || '未录入货柜号'">{{ containerPreview.containerNo || '未录入货柜号' }}</div>
        <div class="container-preview__warehouse text-ellipsis" :title="[containerPreview.overseasWarehouseCode, containerPreview.overseasWarehouseName].filter(Boolean).join(' / ') || '未关联海外仓'">{{ [containerPreview.overseasWarehouseCode, containerPreview.overseasWarehouseName].filter(Boolean).join(' / ') || '未关联海外仓' }}</div>
      </div>
-      <div class="container-preview__metrics">
+      <div v-if="!containerIsResourceRecovery" class="container-preview__metrics">
        <div class="container-preview__metric"><span>头程已有托盘码</span><strong>{{ containerPreview.sourcePalletCount }}</strong></div>
        <div class="container-preview__metric container-preview__metric--primary"><span>海外仓补充托盘码</span><strong>{{ containerPreview.supplementPalletCount }}</strong></div>
        <div class="container-preview__metric"><span>最终生成托盘</span><strong>{{ containerPreview.pendingPalletCount }}</strong></div>
        <div class="container-preview__metric"><span>本次处理订单</span><strong>{{ containerPreview.pendingOrderCount }}</strong></div>
      </div>
+      <div v-else class="container-preview__metrics">
+        <div class="container-preview__metric"><span>已保存计划托盘</span><strong>{{ containerPreview.totalPlannedPalletCount }}</strong></div>
+        <div class="container-preview__metric container-preview__metric--primary"><span>资源确认</span><strong>{{ containerConversionResult?.resourceRecovered ? '已确认' : '待确认' }}</strong></div>
+      </div>
      <el-alert v-if="containerPreview.blockedOrderCount > 0" class="container-convert-alert" type="error" :closable="false" show-icon title="存在阻断订单，暂不可确认生成；请按下方原因处理后重新预览。" />
+      <el-alert v-else-if="containerPreview.resourceRetry && !containerConversionResult" class="container-convert-alert" type="warning" :closable="false" show-icon title="本柜计划和托盘已保存，资源仍待确认。请重试原操作完成资源确认。" />
      <el-alert v-else-if="!containerConversionResult" class="container-convert-alert" type="success" :closable="false" show-icon :title="`预览已就绪：头程已有 ${containerPreview.sourcePalletCount} 个托盘码，海外仓补充 ${containerPreview.supplementPalletCount} 个，最终生成 ${containerPreview.pendingPalletCount} 个托盘。`" />
      <section v-if="containerConversionResult" class="container-conversion-result">
-        <header><strong>生成完成</strong><span>新建 {{ containerConversionResult.newPlanCount }} 个 / 已有 {{ containerConversionResult.existingPlanCount }} 个</span></header>
+        <header><strong>{{ containerConversionResult.resourceRecovered ? '资源确认完成' : '生成完成' }}</strong><span v-if="containerConversionResult.resourceRecovered">已确认 {{ containerConversionResult.plans.length }} 个已有计划</span><span v-else>新建 {{ containerConversionResult.newPlanCount }} 个 / 已有 {{ containerConversionResult.existingPlanCount }} 个</span></header>
        <div class="container-conversion-result__plans">
          <article v-for="plan in containerConversionResult.plans" :key="plan.planNo" class="container-conversion-result__plan">
            <div><strong class="text-ellipsis" :title="plan.planNo">{{ plan.planNo }}</strong><el-tag size="small" :type="containerConversionResult.existingPlanNos.has(plan.planNo) ? 'info' : 'success'">{{ containerConversionResult.existingPlanNos.has(plan.planNo) ? '已有计划' : '本次新建' }}</el-tag></div>
@@ -1140,8 +1157,9 @@ onMounted(() => { void load() })
      <div class="container-preview__scroll">
        <section v-for="group in containerPreview.groups" :key="`${group.destinationType}-${group.destinationWarehouseId || group.destinationWarehouseCode || 'default'}`" class="container-preview__group">
          <header class="container-preview__group-header">
-            <strong class="text-ellipsis" :title="previewGroupTitle(group)">{{ previewGroupTitle(group) }}：最终 {{ group.pendingPalletCount }} 托</strong>
-            <span>头程已有 {{ group.sourcePalletCount }} 托 / 海外仓补充 {{ group.supplementPalletCount }} 托 / 本次处理 {{ group.pendingOrderCount }} 票</span>
+            <strong class="text-ellipsis" :title="previewGroupTitle(group)">{{ previewGroupTitle(group) }}：{{ containerIsResourceRecovery ? `已有 ${group.plannedPalletCount} 托` : `最终 ${group.pendingPalletCount} 托` }}</strong>
+            <span v-if="containerIsResourceRecovery">已保存计划托数 {{ group.plannedPalletCount }}</span>
+            <span v-else>头程已有 {{ group.sourcePalletCount }} 托 / 海外仓补充 {{ group.supplementPalletCount }} 托 / 本次处理 {{ group.pendingOrderCount }} 票</span>
          </header>
          <el-table :data="group.orders" size="small" border>
            <el-table-column label="入仓码" min-width="148" show-overflow-tooltip><template #default="{ row }">{{ row.inboundCode || '—' }}</template></el-table-column>