Merge remote-tracking branch 'origin/release/test' into dev

# Conflicts:
#	src/modules/container-loading/pages/GlobalSmartLoadingView.vue
#	src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
#	src/modules/domestic-containers/pages/DomesticContainersView.vue

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

@@ -22,6 +22,7 @@ import {
   listSmartLoadingCandidates,
   listSmartLoadingWorkbenchContainers,
   recommendSmartLoading,
+  removeAllUnpickedSmartLoadingItems,
   removeSmartLoadingGroup,
   removeSmartLoadingItem,
 } from '../api/platformContainerLoading'
@@ -74,6 +75,11 @@ let containerRequest = 0
 const canAssign = computed(() => access.can('platform:firstleg:smart-loading:assign'))
 const canDelete = computed(() => access.can('platform:firstleg:smart-loading:delete'))
 const selectedContainer = computed(() => containers.value.find((item) => item.bookingId === selectedContainerId.value) || null)
+const crossChannelAssignment = computed(() => Boolean(
+  selectedCandidate.value?.channelCode
+  && selectedContainer.value?.channelCode
+  && selectedCandidate.value.channelCode !== selectedContainer.value.channelCode,
+))
 const orchestratableContainers = computed(() => containers.value)
 const completedContainerCount = computed(() => 0)
 const missingChannelContainerCount = computed(() => orchestratableContainers.value.filter((item) => !item.channelCode).length)
@@ -211,7 +217,7 @@ function preferredContainerId() {
 }
 
 const candidateColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 92, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
   { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
   { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
@@ -224,13 +230,13 @@ const candidateColumns: DataTableColumn[] = [
   { key: 'totalVolumeCbm', label: '体积', width: 90, slotName: 'candidateTotalVolume' },
 ]
 const itemColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 80, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
   { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true },
   { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' },
   { key: 'packageCount', label: '分配箱数', width: 100, slotName: 'packageCount' },
-  { key: 'grossWeightKg', label: '毛重', width: 80, slotName: 'weight' },
-  { key: 'volumeCbm', label: '体积', width: 80, slotName: 'volume' },
+  { key: 'grossWeightKg', label: '毛重', width: 90, slotName: 'weight' },
+  { key: 'volumeCbm', label: '体积', width: 90, slotName: 'volume' },
 ]
 
 function formatNumber(value: number, digits = 3) {
@@ -474,7 +480,7 @@ async function assign() {
     const selected = selectedCandidate.value!
     acceptPlan(selected.orderStatusSnapshot === 'PENDING_REVIEW'
       ? await assignPendingReviewSmartLoadingOrder(plan.value!.id, {
-        customerId: selected.customerId,
+        customerId: selected.accountId,
         orderId: selected.orderId,
         inboundCode: selected.inboundCode || '',
         packageCount: assignForm.packageCount,
@@ -495,7 +501,7 @@ async function assign() {
 function candidateBlocked(candidate: SmartLoadingCandidateRow) {
   if (candidate.orderStatusSnapshot === 'PENDING_REVIEW') {
     return Boolean(candidate.blockReason) || candidate.locked === true
-      || !candidate.inboundCode || candidate.availablePackageCount < 1
+      || !candidate.accountId || !candidate.inboundCode || candidate.availablePackageCount < 1
   }
   return Boolean(candidate.blockReason) || candidate.locked === true
     || !candidate.inboundId
@@ -521,8 +527,9 @@ async function recommend() {
 }
 async function adjust(source: object) {
   const item = itemRow(source)
-  if (!plan.value) return
+  if (!plan.value || mutating.value) return
   const count = Number(quantityDrafts[item.id])
+  if (count === item.packageCount) return
   if (!Number.isInteger(count) || count < item.minPackageCount) {
     ElMessage.warning(`分配箱数不能低于已拣下限 ${item.minPackageCount} 箱`)
     return
@@ -572,20 +579,7 @@ async function removeAll() {
   }).catch(() => false)
   if (!confirmed || !plan.value) return
   await mutate(async () => {
-    let current = plan.value!
-    for (const inboundItem of removableItems) {
-      if (inboundItem.coLoadGroup) {
-        current = await removeSmartLoadingGroup(current.id, inboundItem.coLoadGroup.groupId, current.version)
-        acceptPlan(current)
-        continue
-      }
-      for (const original of inboundItem.sourceItems) {
-        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)
-      }
-    }
+    acceptPlan(await removeAllUnpickedSmartLoadingItems(plan.value!.id, plan.value!.version))
     await loadCandidateData()
     ElMessage.success(`已移除 ${itemCount} 个未拣入仓码`)
   }, '全部移除失败', { pickingConflict: true })
@@ -595,6 +589,7 @@ async function mutate(
   fallback: string,
   recovery: { preserveDrafts?: Record<string, number>; preserveAssign?: boolean; pickingConflict?: boolean } = {},
 ) {
+  if (mutating.value) return
   mutating.value = true
   mutationError.value = null
   try {
@@ -685,9 +680,9 @@ onMounted(() => { void load(); void loadCustomers() })
                 <el-button
                   v-if="canAssign && assignable"
                   size="small"
-                  type="primary"
+                  type="text"
                   plain
-                  :disabled="candidateBlocked(row as SmartLoadingCandidateRow)"
+                  :disabled="mutating || candidateBlocked(row as SmartLoadingCandidateRow)"
                   @click="openAssign(row)"
                 ><Plus :size="15" />{{ row.coLoadGroupId ? '整组分配' : '加入' }}</el-button>
               </template>
@@ -763,10 +758,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="displayedPlanItems" :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="canDelete && editable && row.canRemove" 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="canDelete && editable && row.canRemove" size="small" type="danger" text :disabled="mutating" @click="remove(row)"><Trash2 :size="15" />删除</el-button></div></template>
                 <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
                 <template #coLoadGroup="{ row }"><div v-if="row.coLoadGroup" class="candidate-group"><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`固定 ${row.coLoadGroup.fullPackageCount} 箱 · ${row.coLoadGroup.lockedPlanId ? '已锁定' : '未锁定'}`" /></div><LineClampText v-else content="普通单票" /></template>
-                <template #packageCount="{ row }"><LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :disabled="mutating || !canAssign || !editable || !row.canAdjust" controls-position="right" @change="adjust(row)" placeholder="请输入调整箱数" /><LineClampText v-if="row.detailCount > 1 && editable" content="多规格，需删除后重加" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
+                <template #packageCount="{ row }"><LineClampText v-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :controls="false" :disabled="mutating || !canAssign || !editable || !row.canAdjust" placeholder="请输入调整箱数" @blur="adjust(row)" @keyup.enter="adjust(row)" /><LineClampText v-if="row.detailCount > 1 && editable" content="多规格，需删除后重加" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
                 <template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0), 1) }} kg</template>
                 <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template>
               </DataTable>
@@ -778,7 +773,9 @@ onMounted(() => { void load(); void loadCustomers() })
           <div v-if="selectedCandidate" class="assign-dialog">
             <p><strong>{{ selectedCandidate.groupNo || selectedCandidate.customerName || '客户待补充' }}</strong></p>
             <p>目标柜次：{{ displayCabinetNo(selectedContainer) }} · 集装箱号：{{ displayActualContainerNo(selectedContainer) }}</p>
-            <p>发货仓：{{ selectedContainer?.warehouseName || '—' }} · 渠道：{{ resolveSmartLoadingChannelGroup(selectedContainer?.channelCode, selectedContainer?.channelName)?.name || '—' }}</p>
+            <p>发货仓：{{ selectedContainer?.warehouseName || '—' }} · 柜次渠道：{{ selectedContainer?.channelName || '—' }}</p>
+            <p>订单渠道：{{ selectedCandidate.channelName || '—' }}</p>
+            <el-alert v-if="crossChannelAssignment" title="订单渠道与柜次渠道不同；这是人工排柜，确认后仍会加入。智能推荐不会跨渠道。" type="warning" :closable="false" />
             <template v-if="selectedCandidate.coLoadGroupId">
               <p>组内 {{ selectedCandidate.memberOrderCount }} 票、{{ selectedCandidate.inboundFragmentCount }} 个入仓片段，共 {{ selectedCandidate.groupTotalBoxes }} 箱</p>
               <p v-for="summary in selectedCandidate.memberOrderSummaries" :key="summary">{{ summary }}</p>