From f5a6c7fd8869a7cfbacdb3533cf41948575d3437 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Wed, 14 Oct 2026 12:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overseas-warehouse/views/ReturnOrdersView.vue        | 9 +--------
 .../overseas-warehouse/views/WarehouseServiceView.vue    | 6 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
index 12066c6..8a746a0 100644
--- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
+++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
@@ -387,6 +387,7 @@ onBeforeUnmount(clearPhotoUrls)
         <section v-if="selected.packingDetails?.length" class="return-detail-section">
           <h3>合箱明细</h3>
           <el-table class="return-aligned-table" :data="selected.packingDetails" size="small">
+            <el-table-column prop="planNo" label="合箱计划" width="240" />
             <el-table-column prop="sourceCartonMark" label="来源箱唛" width="300" />
             <el-table-column prop="targetCartonMark" label="目标箱唛" width="300" />
             <el-table-column prop="skuCode" label="SKU" width="200" />
@@ -443,14 +444,6 @@ onBeforeUnmount(clearPhotoUrls)
           </el-dialog>
         </section>
         <section class="return-detail-section">
-          <h3>合箱记录</h3>
-          <el-table :data="selected.packingDetails || []" border empty-text="暂无合箱记录">
-            <el-table-column prop="planNo" label="合箱计划" min-width="200" />
-            <el-table-column prop="sourceCartonMark" label="来源箱唛" min-width="210" />
-            <el-table-column prop="targetCartonMark" label="目标箱唛" min-width="210" />
-            <el-table-column prop="skuCode" label="SKU" min-width="180" />
-            <el-table-column prop="quantity" label="本单合入数量" width="130" />
-          </el-table>
           <h3>当前关联实物箱</h3>
           <el-collapse v-if="selected.currentCartons?.length">
             <el-collapse-item v-for="current in selected.currentCartons" :key="current.carton.cartonMark" :name="current.carton.cartonMark">
diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue
index 53b9021..6fcf1eb 100644
--- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue
+++ b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue
@@ -252,7 +252,7 @@ const relabelInboundOptions = computed(() => {
       if (current) {
         current.hasOutbound ||= candidate.hasOutbound === true || candidate.inventoryStatus === 'OUTBOUNDED'
         current.availablePackages += inventoryQuantity(candidate.availablePackages)
-        current.units += candidate.returnCartonId && candidate.stockQuantity === 0 ? 0 : 1
+        current.units += candidate.returnCartonId && Number(candidate.stockQuantity) === 0 ? 0 : 1
         current.stockQuantity = current.stockQuantity == null || candidate.stockQuantity == null ? null : current.stockQuantity + inventoryQuantity(candidate.stockQuantity)
         if (candidate.returnCartonId) current.reasons.push(returnInventoryState(candidate))
       }
@@ -261,7 +261,7 @@ const relabelInboundOptions = computed(() => {
         inboundCode: candidate.returnCartonId ? '已签收退货库存（含合箱）' : (candidate.inboundCode || '—'),
         availablePackages: inventoryQuantity(candidate.availablePackages),
         quantityUnit: candidate.returnCartonId ? '件' : '箱',
-        stockQuantity: candidate.stockQuantity == null ? null : inventoryQuantity(candidate.stockQuantity), units: candidate.returnCartonId && candidate.stockQuantity === 0 ? 0 : 1, hasOutbound: candidate.hasOutbound === true || candidate.inventoryStatus === 'OUTBOUNDED', reasons: candidate.returnCartonId ? [returnInventoryState(candidate)] : [],
+        stockQuantity: candidate.stockQuantity == null ? null : inventoryQuantity(candidate.stockQuantity), units: candidate.returnCartonId && Number(candidate.stockQuantity) === 0 ? 0 : 1, hasOutbound: candidate.hasOutbound === true || candidate.inventoryStatus === 'OUTBOUNDED', reasons: candidate.returnCartonId ? [returnInventoryState(candidate)] : [],
       })
     }
   }
@@ -270,7 +270,7 @@ const relabelInboundOptions = computed(() => {
 const visibleRelabelInboundOptions = computed(() => relabelInboundOptions.value.filter(option => option.availablePackages > 0))
 function relabelOptionLabel(option: typeof relabelInboundOptions.value[number]) {
   if (option.quantityUnit === '箱') return option.inboundOrderNo + '｜' + option.inboundCode + '｜可选 ' + option.availablePackages + ' 箱'
-  return option.inboundOrderNo + '｜在仓 ' + option.units + ' 包裹/箱 · ' + (option.stockQuantity ?? '待查询') + ' 件' + (option.hasOutbound && Number(option.stockQuantity) > 0 ? '｜部分出库' : '')
+  return option.inboundOrderNo + '｜在仓 ' + option.units + ' 包裹/箱 · ' + (option.stockQuantity ?? '待查询') + ' 件' + (option.reasons.some(reason => reason.includes('跨来源单')) ? '（关联整箱数量，含其他来源）' : '') + (option.hasOutbound && Number(option.stockQuantity) > 0 ? '｜部分出库' : '')
 }
 const loading = ref(false)
 const saving = ref(false)