diff --git a/packing-acceptance.local.html b/packing-acceptance.local.html deleted file mode 100644 index cbb4fece..00000000 --- a/packing-acceptance.local.html +++ /dev/null @@ -1,16 +0,0 @@ -
复用当前平台会话,只调用正式业务接口。
- - - diff --git a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue index 1b9e77db..9a2fc900 100644 --- a/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue +++ b/src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue @@ -182,9 +182,11 @@ const planCartonItemRows = computed(() => (planDetail.value?.completionCartons | )); const planSourceRows = computed(() => (planDetail.value?.sources || []).flatMap(source => { const original = source.originalItems?.length ? source.originalItems : source.items; + const existingTarget = planDetail.value?.status === 'COMPLETED' && planDetail.value.completionCartons?.some(carton => carton.cartonMark === source.cartonMark); return original.map(item => { - const take = source.items.find(line => line.skuCode === item.skuCode)?.quantity || 0; + const take = existingTarget ? 0 : source.items.find(line => line.skuCode === item.skuCode)?.quantity || 0; return { cartonMark: source.cartonMark, sourceReturnNo: source.sourceReturnNo, participation: source.participation, + role: existingTarget ? '目标原箱(保留)' : '取出来源', skuCode: item.skuCode, originalQuantity: source.originalItems?.length ? item.quantity : null, take, remaining: source.originalItems?.length ? item.quantity - take : null }; }); @@ -872,6 +874,7 @@ const tableColumns = computed(() =>