1

src/modules/first-leg/api/unifiedOrders.ts

@@ -131,6 +131,7 @@ export interface MerchantUnifiedOrderQuery {
   keyword?: string
   fbaCode?: string
   orderNo?: string
+  inboundCode?: string
   mainStatus?: ApiUnifiedOrderMainStatus
   receivingWarehouseId?: number | string
   destinationWarehouseId?: number | string

src/modules/first-leg/store/firstLegOrders.test.mjs

@@ -100,6 +100,7 @@ test('routes supported filters to C02 without sending DRAFT as a main status', (
   assert.match(storeSource, /interface ClientOrderReadQuery extends MerchantUnifiedOrderQuery/)
   assert.match(storeSource, /if \(query\.draftOnly\)/)
   assert.match(storeSource, /const unifiedQuery: MerchantUnifiedOrderQuery/)
+  assert.match(storeSource, /inboundCode: query\.inboundCode/)
   assert.match(storeSource, /getMerchantUnifiedOrders\(unifiedQuery\)/)
 })
 

src/modules/first-leg/store/firstLegOrders.ts

@@ -461,6 +461,7 @@ async function getOrdersForClient(query: ClientOrderReadQuery = {}): Promise<Ord
     mainStatus: query.mainStatus,
     receivingWarehouseId: query.receivingWarehouseId,
     destinationWarehouseId: query.destinationWarehouseId,
+    inboundCode: query.inboundCode,
     createdFrom: query.createdFrom,
     createdTo: query.createdTo,
     fbaCode: query.fbaCode,

src/modules/first-leg/utils/firstLegOrder.test.mjs

@@ -122,8 +122,8 @@ test('requires FBA warehouse and cargo-level shipment, reference, SKU and UPC fi
   assert.ok(errors.includes('FBA 订单请填写 Amazon 仓库编码'))
   assert.ok(errors.includes('第 1 条货物缺少客户 SKU'))
   assert.ok(errors.includes('第 1 条货物缺少 UPC'))
-  assert.ok(errors.includes('第 1 条货物缺少 Shipment ID'))
-  assert.ok(errors.includes('第 1 条货物缺少 Reference ID'))
+  assert.ok(errors.includes('第 1 条货物缺少货件编号'))
+  assert.ok(errors.includes('第 1 条货物缺少跟踪编号'))
 })
 
 test('requires public destination ids while keeping private addresses detached from public warehouses', () => {

src/modules/first-leg/utils/firstLegOrder.ts

@@ -123,8 +123,8 @@ export function validateFirstLegOrderDraft(draft: FirstLegOrderDraft) {
     if (!item.packageType.trim()) errors.push(`${line}缺少包装类型`)
     if (draft.destinationType === 'FBA' && !item.sku.trim()) errors.push(`${line}缺少客户 SKU`)
     if (draft.destinationType === 'FBA' && !item.upc.trim()) errors.push(`${line}缺少 UPC`)
-    if (draft.destinationType === 'FBA' && !item.shipmentId.trim()) errors.push(`${line}缺少 Shipment ID`)
-    if (draft.destinationType === 'FBA' && !item.referenceId.trim()) errors.push(`${line}缺少 Reference ID`)
+    if (draft.destinationType === 'FBA' && !item.shipmentId.trim()) errors.push(`${line}缺少货件编号`)
+    if (draft.destinationType === 'FBA' && !item.referenceId.trim()) errors.push(`${line}缺少跟踪编号`)
     if (!Number.isInteger(item.pieces) || item.pieces <= 0) errors.push(`${line}件数必须为正整数`)
     if (!Number.isInteger(item.packageCount) || item.packageCount <= 0) errors.push(`${line}箱数必须为正整数`)
     if (!Number.isInteger(item.unitsPerPackage) || item.unitsPerPackage <= 0) errors.push(`${line}每箱数量必须为正整数`)

src/modules/first-leg/views/FirstLegOrdersView.vue

@@ -1544,7 +1544,8 @@ async function searchOrders(model: QueryModel) {
     const cargoKeyword = typeof model.cargoKeyword === 'string' ? model.cargoKeyword.trim() : ''
     const range = Array.isArray(createdRange) ? createdRange.filter((value): value is string => typeof value === 'string') : []
     const query = {
-      keyword: cargoKeyword || undefined,
+      keyword: undefined,
+      inboundCode: cargoKeyword || undefined,
       orderNo: orderNo || undefined,
       receivingWarehouseId: typeof model.receivingWarehouseId === 'string' && model.receivingWarehouseId ? model.receivingWarehouseId : undefined,
       mainStatus: statusValue && statusValue !== 'DRAFT' ? statusValue : undefined,
@@ -1554,9 +1555,9 @@ async function searchOrders(model: QueryModel) {
       createdTo: range[1] ? `${range[1]}T23:59:59` : undefined,
     }
     await store.load(query)
-    const cargoMatched = cargoKeyword && store.orders.some((order) => orderMatchesCargoKeyword(order, cargoKeyword))
+    const cargoMatched = cargoKeyword && store.orders.some((order) => order.status !== 'DRAFT' && orderMatchesCargoKeyword(order, cargoKeyword))
     if (cargoKeyword && !cargoMatched && statusValue !== 'DRAFT') {
-      await store.load({ ...query, keyword: undefined, fbaCode: cargoKeyword })
+      await store.load({ ...query, keyword: undefined, inboundCode: undefined, fbaCode: cargoKeyword })
     }
     selectedOrders.value = []
     orderTableVersion.value += 1