优化

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

@@ -78,7 +78,7 @@ const activeChannel = computed(() => channelTabs.value.find((item) => item.code
 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 assignedInboundIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundId)))
 const totalPackages = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.packageCount || 0), 0))
 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))
@@ -118,10 +118,12 @@ function preferredContainerId() {
 
 const candidateColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 92, fixed: 'left', slotName: 'actions' },
+  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 190, fixed: 'left', showOverflowTooltip: true },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 140 },
   { key: 'availablePackageCount', prop: 'availablePackageCount', label: '可用箱数', width: 100 },
+  { key: 'cartonIdentityStatus', label: '箱号归属', width: 105, slotName: 'cartonIdentityStatus' },
   { key: 'unitGrossWeightKg', label: '平均单箱毛重', width: 135, slotName: 'unitGrossWeight' },
-  { key: 'unitVolumeCbm', label: '单箱体积', width: 105, slotName: 'unitVolume' },
+  { key: 'averageUnitVolumeCbm', label: '平均单箱体积', width: 145, slotName: 'averageUnitVolume' },
 ]
 const itemColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 170, fixed: 'left', slotName: 'actions' },
@@ -139,7 +141,7 @@ function candidateRow(source: object) { return source as SmartLoadingCandidate }
 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
+  const remaining = candidates.value.find((candidate) => candidate.inboundId === item.inboundId)?.availablePackageCount || 0
   return Math.max(item.minPackageCount, item.packageCount + remaining)
 }
 function displayCabinetNo(container: ContainerBookingResource | null | undefined) {
@@ -283,7 +285,6 @@ async function assign() {
   await mutate(async () => {
     acceptPlan(await assignSmartLoadingItem(plan.value!.id, {
       inboundId: selectedCandidate.value!.inboundId,
-      inboundDetailId: selectedCandidate.value!.inboundDetailId,
       packageCount: assignForm.packageCount,
       expectedVersion: plan.value!.version,
     }))
@@ -439,12 +440,13 @@ onMounted(() => { void load(); void loadCustomers() })
                   size="small"
                   type="primary"
                   plain
-                  :disabled="assignedDetailIds.has(row.inboundDetailId) || row.availablePackageCount < 1"
+                  :disabled="assignedInboundIds.has(row.inboundId) || row.availablePackageCount < 1"
                   @click="openAssign(row)"
                 ><Plus :size="15" />加入</el-button>
               </template>
               <template #unitGrossWeight="{ row }">{{ formatNumber(Number(row.unitGrossWeightKg || 0), 1) }} kg</template>
-              <template #unitVolume="{ row }">{{ formatNumber(Number(row.unitVolumeCbm || 0)) }} m³</template>
+              <template #averageUnitVolume="{ row }">{{ formatNumber(Number(row.averageUnitVolumeCbm || 0)) }} m³</template>
+              <template #cartonIdentityStatus><el-tag size="small" type="info" effect="plain">未核验</el-tag></template>
             </DataTable>
           </section>
 
@@ -531,7 +533,8 @@ onMounted(() => { void load(); void loadCustomers() })
         <AppDialog v-model="assignOpen" title="加入当前柜次" :confirm-loading="mutating" confirm-text="确认加入" @confirm="assign">
           <div v-if="selectedCandidate" class="assign-dialog">
             <p><strong>{{ selectedCandidate.customerName || '客户待补充' }}</strong></p>
-            <p>可用 {{ selectedCandidate.availablePackageCount }} 箱 · 平均单箱毛重 {{ formatNumber(Number(selectedCandidate.unitGrossWeightKg || 0), 1) }} kg · 单箱体积 {{ formatNumber(Number(selectedCandidate.unitVolumeCbm || 0)) }} m³</p>
+            <p>入仓码 {{ selectedCandidate.inboundCode || '—' }} · 可用 {{ selectedCandidate.availablePackageCount }} 箱 · 平均单箱毛重 {{ formatNumber(Number(selectedCandidate.unitGrossWeightKg || 0), 1) }} kg · 平均单箱体积 {{ formatNumber(Number(selectedCandidate.averageUnitVolumeCbm || 0)) }} m³</p>
+            <small>本次只记录该入仓码的计划装柜箱数，具体箱号归属为未核验。</small>
             <el-form label-position="top"><el-form-item label="本次分配箱数" required><el-input-number v-model="assignForm.packageCount" :min="1" :max="selectedCandidate.availablePackageCount" :step="1" controls-position="right" /></el-form-item></el-form>
           </div>
         </AppDialog>