优化

src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue

@@ -39,7 +39,7 @@ const canAssign = computed(() => access.can('platform:firstleg:smart-loading:ass
 const canDelete = computed(() => access.can('platform:firstleg:smart-loading:delete'))
 const canPush = computed(() => access.can('platform:firstleg:smart-loading:push'))
 const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-list:list'))
-const editable = computed(() => plan.value?.status === 'EDITING' || plan.value?.status === 'LOADING')
+const editable = computed(() => plan.value?.status === 'EDITING')
 const assignedDetailIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundDetailId)))
 const totalVolume = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.volumeCbm || 0), 0))
 const totalWeight = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.grossWeightKg || 0), 0))
@@ -59,7 +59,6 @@ const itemColumns: DataTableColumn[] = [
   { key: 'packageCount', label: '分配箱数', width: 150, slotName: 'packageCount' },
   { key: 'volumeCbm', label: '体积', width: 120, slotName: 'volume' },
   { key: 'grossWeightKg', label: '毛重', width: 130, slotName: 'weight' },
-  { key: 'destination', label: '目的仓', minWidth: 160, slotName: 'destination' },
 ]
 const candidateColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
@@ -69,27 +68,26 @@ const candidateColumns: DataTableColumn[] = [
   { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 110 },
   { key: 'unitVolumeCbm', label: '单箱体积', width: 120, slotName: 'unitVolume' },
   { key: 'unitWeightKg', label: '单箱重量', width: 120, slotName: 'unitWeight' },
-  { key: 'route', label: '目的仓匹配', minWidth: 170, slotName: 'route' },
 ]
 
 function formatNumber(value: number, digits = 3) { return Number.isFinite(value) ? value.toLocaleString('zh-CN', { maximumFractionDigits: digits }) : '0' }
 function percentage(value: number) { return Number.isFinite(value) ? Number(Math.max(value, 0).toFixed(2)) : 0 }
 function candidateRow(source: object) { return source as SmartLoadingCandidate }
 function itemRow(source: object) { return source as SmartLoadingItem }
-function routeMatches(source: object) {
-  const candidate = candidateRow(source)
-  const target = container.value?.destinationWarehouseCode
-  return !target || target === candidate.destinationWarehouseCode
-}
 function explainCandidate(source: object) {
   const candidate = candidateRow(source)
-  if (!routeMatches(candidate)) return `目的仓不一致（候选：${candidate.destinationWarehouseCode || '未设置'}）`
   const volume = Number(candidate.unitVolumeCbm || 0)
   const weight = Number(candidate.unitWeightKg || 0)
   const volumeRoom = volumeLimit.value ? Math.floor(Math.max(volumeLimit.value - totalVolume.value, 0) / Math.max(volume, 0.000001)) : candidate.availablePackageCount
   const weightRoom = weightLimit.value ? Math.floor(Math.max(weightLimit.value - totalWeight.value, 0) / Math.max(weight, 0.000001)) : candidate.availablePackageCount
   return `按 110% 上限，当前最多可装 ${Math.max(Math.min(candidate.availablePackageCount, volumeRoom, weightRoom), 0)} 箱`
 }
+function displayContainerNo(value: ContainerBookingResource | null | undefined) {
+  if (!value) return '柜号待生成'
+  const actual = String(value.containerNo || '').trim()
+  const internalReference = /^(?:MAN|SPLIT)-/i.test(actual)
+  return actual && !internalReference ? actual : String(value.cabinetNo || '').trim() || '柜号待生成'
+}
 function syncDrafts() { for (const item of plan.value?.items || []) quantityDrafts[item.id] = item.packageCount }
 function acceptPlan(next: SmartLoadingPlan) { plan.value = next; noDraft.value = false; syncDrafts() }
 
@@ -97,7 +95,7 @@ async function load() {
   loading.value = true; loadError.value = null; noDraft.value = false
   try {
     container.value = await getContainer(containerId.value)
-    if (container.value.planStatus === 'COMPLETED') {
+    if (['LOADING', 'COMPLETED'].includes(container.value.planStatus)) {
       plan.value = null
       candidates.value = []
       return
@@ -159,7 +157,7 @@ async function adjust(source: object) {
 async function remove(source: object) {
   const item = itemRow(source)
   if (!plan.value) return
-  await ElMessageBox.confirm(`确认从计划移除“${item.productNameZh || item.orderNo || item.id}”吗？`, '移除装柜明细', { type: 'warning', confirmButtonText: '移除', cancelButtonText: '取消' }).catch(() => false).then(async (confirmed) => {
+  await ElMessageBox.confirm(`确认从计划移除“${item.productNameZh || item.orderNo || '该货物'}”吗？`, '移除装柜明细', { type: 'warning', confirmButtonText: '移除', cancelButtonText: '取消' }).catch(() => false).then(async (confirmed) => {
     if (!confirmed || !plan.value) return
     mutating.value = true
     mutationError.value = null
@@ -202,9 +200,8 @@ onMounted(load)
   <section class="business-page workbench">
     <section class="surface-panel workbench-command-bar" aria-label="排柜作业摘要">
       <div class="workbench-identity">
-        <span>当前柜次</span>
-        <strong>{{ container?.cabinetNo || '正在加载' }}</strong>
-        <small>集装箱号 {{ container?.containerNo || '待录入' }}</small>
+        <span>当前柜号</span>
+        <strong>{{ loading ? '正在加载' : displayContainerNo(container) }}</strong>
       </div>
       <div class="header-actions">
         <el-button text aria-label="返回货柜列表" @click="router.back()"><ArrowLeft :size="18" />返回</el-button>
@@ -222,26 +219,29 @@ onMounted(load)
         <p>智能装柜方案已锁定，不能继续调整。请进入装柜清单查看完整记录。</p>
         <el-button v-if="canViewLoadingList" type="primary" @click="openOperationalList"><ListChecks :size="16" />查看装柜清单</el-button>
       </section>
+      <section v-else-if="container?.planStatus === 'LOADING'" class="readonly-status-card" aria-label="已进入拣货流程">
+        <strong>该柜号已进入拣货流程</strong>
+        <p>智能装柜仅处理待装柜和预装编辑中的空柜，请在预装清单继续查看。</p>
+        <el-button v-if="canViewLoadingList" type="primary" @click="openOperationalList"><ListChecks :size="16" />查看预装清单</el-button>
+      </section>
       <template v-else>
-      <section v-if="container" class="summary-band"><div><span>柜型</span><strong>{{ container.containerType }}</strong></div><div><span>装柜仓库</span><strong>{{ container.warehouseName || '—' }}</strong></div><div><span>目的仓</span><strong>{{ container.destinationWarehouseName || container.destinationWarehouseCode || '不限' }}</strong></div><div><span>计划状态</span><strong>{{ plan?.status === 'LOADING' ? '拣货中' : plan ? '预装柜中' : '待装柜' }}</strong></div></section>
+      <section v-if="container" class="summary-band"><div><span>柜型</span><strong>{{ container.containerType }}</strong></div><div><span>装柜仓库</span><strong>{{ container.warehouseName || '—' }}</strong></div></section>
       <section v-if="container" class="capacity-grid"><div><div class="meter-title"><span>体积占用（含 110% 上限）</span><strong>{{ formatNumber(totalVolume) }} / {{ formatNumber(volumeLimit) }} m³</strong></div><el-progress :percentage="Math.min(displayedVolumePercent,100)" :status="volumePercent > 100 ? 'exception' : undefined" /></div><div><div class="meter-title"><span>重量占用（含 110% 上限）</span><strong>{{ formatNumber(totalWeight,1) }} / {{ formatNumber(weightLimit,1) }} kg</strong></div><el-progress :percentage="Math.min(displayedWeightPercent,100)" :status="weightPercent > 100 ? 'exception' : undefined" /></div></section>
       <el-empty v-if="noDraft" description="该货柜尚未创建排柜计划"><el-button v-if="canCreate" type="primary" :loading="mutating" @click="createPlan"><Plus :size="16" />创建排柜计划</el-button></el-empty>
       <template v-else-if="plan">
         <DataTable :data="plan.items" :columns="itemColumns" :loading="loading || mutating" stripe preference-key="smart-loading-items" column-settings-mode="hide" empty-text="暂无已分配货物">
-          <template #toolbar-start><div><h2>装柜方案</h2><p>计划 {{ plan.planNo }} · 版本 {{ plan.version }}；智能建议必须经人工核对。</p></div></template>
+          <template #toolbar-start><div><h2>{{ displayContainerNo(container) }} 装柜方案</h2><p>智能建议必须经人工核对。</p></div></template>
           <template #actions="{ row }"><div class="row-actions"><el-button v-if="canAssign && editable" size="small" type="primary" plain :disabled="quantityDrafts[row.id] === row.packageCount" @click="adjust(row)"><Save :size="15" />保存箱数</el-button><el-button v-if="canDelete && editable" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />移除</el-button></div></template>
           <template #order="{ row }"><strong>{{ row.orderNo || '—' }}</strong><small>{{ row.inboundCode || '—' }}</small></template>
           <template #goods="{ row }"><strong>{{ row.productNameZh || '未命名货物' }}</strong><small>{{ row.skuCode || '无 SKU' }}</small></template>
           <template #packageCount="{ row }"><el-input-number v-model="quantityDrafts[row.id]" :min="1" :step="1" :disabled="!canAssign || !editable" controls-position="right" /></template>
           <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template><template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0),1) }} kg</template>
-          <template #destination="{ row }">{{ row.destinationWarehouseName || row.destinationWarehouseCode || '—' }}</template>
         </DataTable>
         <DataTable :data="candidates" :columns="candidateColumns" :loading="loading || mutating" stripe preference-key="smart-loading-candidates" column-settings-mode="hide" empty-text="当前仓库暂无可排柜货物">
-          <template #toolbar-start><div><h2>候选货物</h2><p>系统基于仓库、目的仓、可用箱数及 110% 容量上限校验。</p></div></template>
-          <template #actions="{ row }"><el-button v-if="canAssign && editable" size="small" type="primary" plain :disabled="!routeMatches(row) || assignedDetailIds.has(row.inboundDetailId) || row.availablePackageCount < 1" @click="openAssign(row)"><Plus :size="15" />分配</el-button></template>
+          <template #toolbar-start><div><h2>候选货物</h2><p>系统基于装柜仓库、物流渠道、可用箱数及 110% 容量上限校验。</p></div></template>
+          <template #actions="{ row }"><el-button v-if="canAssign && editable" size="small" type="primary" plain :disabled="assignedDetailIds.has(row.inboundDetailId) || row.availablePackageCount < 1" @click="openAssign(row)"><Plus :size="15" />分配</el-button></template>
           <template #order="{ row }"><strong>{{ row.orderNo || '—' }}</strong><small>{{ row.inboundCode || '—' }}</small></template>
           <template #unitVolume="{ row }">{{ formatNumber(Number(row.unitVolumeCbm || 0)) }} m³</template><template #unitWeight="{ row }">{{ formatNumber(Number(row.unitWeightKg || 0),1) }} kg</template>
-          <template #route="{ row }"><el-tag :type="routeMatches(row) ? 'success' : 'danger'">{{ routeMatches(row) ? '匹配' : '冲突' }}</el-tag><small>{{ explainCandidate(row) }}</small></template>
         </DataTable>
       </template>
       </template>