优化

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

@@ -63,7 +63,7 @@ const selectedContainer = computed(() => containers.value.find((item) => item.id
 const channelTabs = computed(() => {
   const channels = new Map<string, { code: string; name: string }>()
   for (const item of containers.value) {
-    if (!['WAIT_LOADING', 'EDITING'].includes(item.planStatus) || !item.channelCode) continue
+    if (!['WAIT_LOADING', 'EDITING', 'LOADING'].includes(item.planStatus) || !item.channelCode) continue
     if (!channels.has(item.channelCode)) channels.set(item.channelCode, {
       code: item.channelCode,
       name: item.channelName || item.channelCode,
@@ -72,7 +72,8 @@ const channelTabs = computed(() => {
   return [...channels.values()]
 })
 const activeChannel = computed(() => channelTabs.value.find((item) => item.code === activeChannelCode.value) || null)
-const editable = computed(() => plan.value?.status === 'EDITING')
+const editable = computed(() => plan.value?.canEdit === true)
+const assignable = computed(() => plan.value?.canAssign === true)
 const selectedPlanStatus = computed(() => selectedContainer.value?.planStatus || null)
 const assignedDetailIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundDetailId)))
 const totalPackages = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.packageCount || 0), 0))
@@ -90,7 +91,7 @@ const queryFields = computed<QueryField[]>(() => [
 ])
 
 const filteredContainers = computed(() => containers.value.filter((item) => (
-  ['WAIT_LOADING', 'EDITING'].includes(item.planStatus)
+  ['WAIT_LOADING', 'EDITING', 'LOADING'].includes(item.planStatus)
   && Boolean(activeChannelCode.value)
   && item.channelCode === activeChannelCode.value
 )))
@@ -106,6 +107,7 @@ const filteredCandidates = computed(() => {
 function preferredContainerId() {
   const visible = filteredContainers.value
   return visible.find((item) => item.planStatus === 'EDITING')?.id
+    || visible.find((item) => item.planStatus === 'LOADING')?.id
     || visible.find((item) => item.planStatus === 'WAIT_LOADING')?.id || visible[0]?.id || ''
 }
 
@@ -136,7 +138,7 @@ function itemRow(source: object) { return source as SmartLoadingItem }
 function adjustmentMax(source: object) {
   const item = itemRow(source)
   const remaining = candidates.value.find((candidate) => candidate.inboundDetailId === item.inboundDetailId)?.availablePackageCount || 0
-  return Math.max(1, item.packageCount + remaining)
+  return Math.max(item.minPackageCount, item.packageCount + remaining)
 }
 function displayCabinetNo(container: ContainerBookingResource | null | undefined) {
   if (!container) return '待生成'
@@ -300,7 +302,10 @@ async function adjust(source: object) {
   const item = itemRow(source)
   if (!plan.value) return
   const count = Number(quantityDrafts[item.id])
-  if (!Number.isInteger(count) || count < 1) { ElMessage.warning('分配箱数必须为正整数'); return }
+  if (!Number.isInteger(count) || count < item.minPackageCount) {
+    ElMessage.warning(`分配箱数不能低于已拣下限 ${item.minPackageCount} 箱`)
+    return
+  }
   const max = adjustmentMax(item)
   if (count > max) { ElMessage.warning(`该货物最多可分配 ${max} 箱`); return }
   await mutate(async () => {
@@ -311,7 +316,7 @@ async function adjust(source: object) {
 }
 async function remove(source: object) {
   const item = itemRow(source)
-  if (!plan.value) return
+  if (!plan.value || !item.canRemove) return
   const confirmed = await ElMessageBox.confirm(`确认从当前柜次移除“${item.productNameZh || item.inboundCode || '该货物'}”吗？`, '移除装柜明细', {
     type: 'warning', confirmButtonText: '移除', cancelButtonText: '取消',
   }).catch(() => false)
@@ -323,22 +328,23 @@ async function remove(source: object) {
   }, '移除装柜明细失败', { pickingConflict: true })
 }
 async function removeAll() {
-  if (!plan.value?.items.length) return
-  const itemCount = plan.value.items.length
-  const confirmed = await ElMessageBox.confirm(`确认移除当前方案的全部 ${itemCount} 条装柜明细吗？`, '全部移除', {
-    type: 'warning', confirmButtonText: '全部移除', cancelButtonText: '取消',
+  const removableItems = plan.value?.items.filter((item) => item.canRemove) || []
+  if (!removableItems.length) return
+  const itemCount = removableItems.length
+  const confirmed = await ElMessageBox.confirm(`确认移除当前方案的 ${itemCount} 条未拣明细吗？已拣明细会保留。`, '移除未拣明细', {
+    type: 'warning', confirmButtonText: '确认移除', cancelButtonText: '取消',
   }).catch(() => false)
   if (!confirmed || !plan.value) return
   await mutate(async () => {
     let current = plan.value!
-    for (const original of [...current.items]) {
+    for (const original of removableItems) {
       const item = current.items.find((value) => value.id === original.id)
       if (!item) continue
       current = await removeSmartLoadingItem(current.id, item.id, current.version, item.version)
       acceptPlan(current)
     }
     await loadSelectedData()
-    ElMessage.success(`已移除全部 ${itemCount} 条装柜明细`)
+    ElMessage.success(`已移除 ${itemCount} 条未拣明细`)
   }, '全部移除失败', { pickingConflict: true })
 }
 async function pushPreload() {
@@ -368,7 +374,7 @@ async function mutate(
       const pickingMessage = recovery.pickingConflict && details.message.includes('拣货')
         ? '该订单在拣货中不许删除'
         : null
-      const message = pickingMessage || '方案已被其他人修改，已刷新最新版本，请重新确认后提交'
+      const message = pickingMessage || '计划或 PDA 明细已变化，已刷新最新版本并保留筛选条件，请重新操作'
       if (recovery.preserveAssign) assignOpen.value = true
       if (pickingMessage) ElMessage.error(pickingMessage)
       else ElMessage.warning(message)
@@ -392,7 +398,7 @@ onMounted(() => { void load(); void loadCustomers() })
         </el-tabs>
         <dl class="compact-summary" aria-label="当前渠道装柜统计">
           <div><dt>候选货物</dt><dd><strong>{{ filteredCandidates.length }}</strong> 条</dd></div>
-          <div><dt>空柜</dt><dd><strong>{{ filteredContainers.length }}</strong> 个</dd></div>
+          <div><dt>柜次</dt><dd><strong>{{ filteredContainers.length }}</strong> 个</dd></div>
           <div><dt>已装</dt><dd><strong>{{ totalPackages }}</strong> 箱</dd></div>
           <div><dt>总重量</dt><dd><strong>{{ formatNumber(totalWeight, 1) }}</strong> kg</dd></div>
           <div><dt>总体积</dt><dd><strong>{{ formatNumber(totalVolume) }}</strong> m³</dd></div>
@@ -426,7 +432,7 @@ onMounted(() => { void load(); void loadCustomers() })
             >
               <template #actions="{ row }">
                 <el-button
-                  v-if="canAssign && editable"
+                  v-if="canAssign && assignable"
                   size="small"
                   type="primary"
                   plain
@@ -441,7 +447,7 @@ onMounted(() => { void load(); void loadCustomers() })
           </section>
 
           <aside class="dispatch-pane container-pane" aria-label="货柜列表">
-            <header class="pane-header"><div><strong>当前渠道空柜</strong><small>仅显示待装柜和预装编辑中的柜次</small></div></header>
+            <header class="pane-header"><div><strong>当前渠道柜次</strong><small>显示待装柜、预装编辑和尚未最终完成的 PDA 柜次</small></div></header>
             <div v-loading="loading" class="container-list">
               <el-empty v-if="!filteredContainers.length" description="暂无符合条件的货柜" :image-size="72" />
               <button
@@ -472,8 +478,8 @@ onMounted(() => { void load(); void loadCustomers() })
               <div><strong>{{ hasRealContainerNo(selectedContainer) ? displayActualContainerNo(selectedContainer) : displayCabinetNo(selectedContainer) }} 装柜方案</strong><small>{{ selectedContainer ? `柜次号：${displayCabinetNo(selectedContainer)} · 集装箱号：${displayActualContainerNo(selectedContainer)}` : '尚未选择柜次' }}</small></div>
               <div class="plan-actions">
                 <el-tooltip content="刷新当前柜次" placement="top"><el-button aria-label="刷新当前柜次" :loading="selectionLoading" @click="loadSelectedData()"><RefreshCw :size="16" /></el-button></el-tooltip>
-                <el-button v-if="canAssign && editable" type="primary" plain :loading="mutating" @click="recommend"><Sparkles :size="16" />智能推荐</el-button>
-                <el-button v-if="canDelete && editable && plan?.items.length" type="danger" plain :loading="mutating" @click="removeAll"><Trash2 :size="16" />全部移除</el-button>
+                <el-button v-if="canAssign && assignable && plan?.status === 'EDITING'" type="primary" plain :loading="mutating" @click="recommend"><Sparkles :size="16" />智能推荐</el-button>
+                <el-button v-if="canDelete && editable && plan?.items.some((item) => item.canRemove)" type="danger" plain :loading="mutating" @click="removeAll"><Trash2 :size="16" />移除未拣</el-button>
                 <el-button v-if="canPush && plan?.status === 'EDITING'" type="primary" :disabled="!plan.items.length" :loading="mutating" @click="pushPreload"><Upload :size="16" />推送预装</el-button>
               </div>
             </header>
@@ -492,6 +498,24 @@ onMounted(() => { void load(); void loadCustomers() })
               <el-button v-if="canCreate" type="primary" :loading="mutating" @click="createPlan"><Plus :size="16" />创建装柜方案</el-button>
             </el-empty>
             <template v-else-if="plan">
+              <el-alert
+                v-if="plan.status === 'LOADING' && plan.canEdit"
+                class="preload-readiness-alert"
+                type="warning"
+                :closable="false"
+                show-icon
+                title="已下发 PDA，仍可维护未完成的装柜明细"
+                description="新增、增加或移除未拣明细会刷新 PDA 明细与版本；PDA 端需要刷新后继续操作。"
+              />
+              <el-alert
+                v-else-if="!plan.canEdit"
+                class="preload-readiness-alert"
+                :type="plan.finalCompletionStatus === 'COMPLETED' ? 'success' : 'info'"
+                :closable="false"
+                show-icon
+                :title="plan.finalCompletionStatus === 'IN_PROGRESS' ? '正在最终确认，装柜方案暂时只读' : plan.finalCompletionStatus === 'COMPLETED' ? '装柜已完成，方案永久只读' : '当前装柜方案只读'"
+                :description="plan.blockedReason || '请刷新计划获取最新作业状态。'"
+              />
               <el-alert
                 class="preload-readiness-alert"
                 type="info"
@@ -505,10 +529,10 @@ onMounted(() => { void load(); void loadCustomers() })
                 <div><div class="meter-title"><span>重量</span><strong>{{ formatNumber(totalWeight, 1) }} / {{ formatNumber(weightLimit, 1) }} kg</strong></div><el-progress :percentage="Math.min(displayedWeightPercent, 100)" :status="weightPercent > 100 ? 'exception' : undefined" /></div>
               </div>
               <DataTable :data="plan.items" :columns="itemColumns" :loading="selectionLoading || mutating" stripe preference-key="global-smart-loading-items" column-settings-mode="hide" empty-text="当前柜次暂无已装货物">
-                <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 #actions="{ row }"><div class="row-actions"><el-button v-if="canAssign && editable && row.canAdjust" 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 && row.canRemove" size="small" type="danger" plain @click="remove(row)"><Trash2 :size="15" />移除</el-button><small v-if="row.pickedPackageCount > 0">已拣 {{ row.pickedPackageCount }} 箱</small></div></template>
                 <template #order="{ row }"><strong>{{ row.inboundCode || '—' }}</strong></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" :max="adjustmentMax(row)" :step="1" :disabled="!canAssign || !editable" controls-position="right" /></template>
+                <template #packageCount="{ row }"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :disabled="!canAssign || !editable || !row.canAdjust" 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>
               </DataTable>