diff --git a/src/api/inbound.js b/src/api/inbound.js
index 1a62731..dd81d94 100644
--- a/src/api/inbound.js
+++ b/src/api/inbound.js
@@ -23,7 +23,10 @@ export const downloadCurrentDomesticLoadingPhoto = (downloadPath) => overseasDow
export const signCurrentReceiving = async (request) => normalizeReceivingSession(await overseasRequest('POST', current('/sign'), request))
export const getCurrentReceiving = async () => normalizeReceivingSession(await overseasRequest('GET', current()))
export const resolveCurrentCarton = async (cartonMark) => normalizeReceivingInbound(await overseasRequest('POST', current('/cartons/resolve'), { cartonMark }))
-export const resolveCurrentPallet = (palletCode, inboundCode) => overseasRequest('POST', current('/pallets/resolve'), { palletCode, inboundCode })
+export const resolveCurrentPallet = async (palletCode, inboundCode) => {
+ const value = await overseasRequest('POST', current('/pallets/resolve'), { palletCode, inboundCode })
+ return { ...value, palletCode: String(value?.palletCode || palletCode || ''), locationCode: String(value?.locationCode || value?.warehouseLocationCode || ''), locationType: String(value?.locationType || value?.warehouseLocationType || ''), locationStatus: String(value?.locationStatus || value?.warehouseLocationStatus || '') }
+}
export const receiveCurrentBulk = async (request) => normalizeReceivingAssignment(await overseasRequest('POST', current('/receipts/bulk'), request))
export const receiveCurrentCarton = async (request) => normalizeReceivingAssignment(await overseasRequest('POST', current('/receipts/carton'), request))
export const receiveCurrentWholePallet = async (request) => normalizeReceivingAssignment(await overseasRequest('POST', current('/receipts/pallet'), request))
diff --git a/src/pages/operation/operation.vue b/src/pages/operation/operation.vue
index fda78eb..8ad6521 100644
--- a/src/pages/operation/operation.vue
+++ b/src/pages/operation/operation.vue
@@ -102,7 +102,7 @@
扫码确认服务端已预留的托盘及库位;合托提示不改变当前分配。
- {{ resolvedPallet.palletCode }}{{ resolvedPallet.compatible ? '预留托盘校验通过,可收货' : '托盘不匹配' }}
+ {{ resolvedPallet.palletCode }}{{ resolvedPallet.compatible ? '预留托盘校验通过,可收货' : '托盘不匹配' }}库位:{{ resolvedPallet.locationCode }}{{ resolvedPallet.locationType === 'SHARED_OVERFLOW' ? '(A0共享溢出位)' : '' }}库位:待现场确认
3. 输入该托累计箱数