1

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

@@ -12,7 +12,7 @@ test('maps the first-leg aggregate list fields without loading detail rows', ()
   assert.match(apiSource, /cargoes\?: Array<\{ skuNo\?: string \| null \}>/)
   assert.match(apiSource, /apiRequest<PageResult<MerchantFirstLegOrderRow>>/)
   assert.match(storeSource, /function mapFirstLegOrderRow/)
-  for (const field of ['inboundId', 'inboundCode', 'channelName', 'destinationWarehouseName', 'pickupMethod', 'packageCount', 'expressCompany', 'trackingNo', 'totalGrossWeightKg', 'totalNetWeightKg', 'totalVolumeCbm', 'totalQuantity', 'remark', 'shipmentId', 'referenceId', 'createdAt']) {
+  for (const field of ['inboundId', 'inboundCode', 'channelName', 'destinationWarehouseName', 'pickupMethod', 'packageCount', 'expressCompany', 'trackingNo', 'totalGrossWeightKg', 'totalNetWeightKg', 'totalVolumeCbm', 'totalQuantity', 'remark', 'shipmentId', 'fulfillmentType', 'lxCode', 'referenceId', 'createdAt']) {
     assert.match(storeSource, new RegExp(`row\\.${field}`))
   }
   assert.match(storeSource, /row\.skuNos/)
@@ -102,7 +102,9 @@ test('keeps unified order pagination valid when the store omits page and size',
 
 test('keeps drafts on the legacy read path without assigning a unified main status', () => {
   assert.match(storeSource, /getMerchantFirstLegOrders\(legacyQuery\(query, 'DRAFT'\)\)/)
-  assert.match(storeSource, /getById\(id\)\?\.status === 'DRAFT' \? loadLegacyDetail\(id\) : loadUnifiedDetail\(id\)/)
+  assert.match(storeSource, /const listOrder = getById\(id\)/)
+  assert.match(storeSource, /listOrder\?\.status === 'DRAFT' \? loadLegacyDetail\(id, listOrder\) : loadUnifiedDetail\(id\)/)
+  assert.match(storeSource, /detail\.order\.lxCode == null && listOrder\?\.lxCode/)
   assert.match(storeSource, /return loadLegacyDetail\(String\(createdId\)\)/)
   assert.match(storeSource, /draftLoadError/)
 })

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

@@ -359,7 +359,7 @@ function mapFirstLegOrderRow(row: MerchantFirstLegOrderRow): FirstLegOrder {
   const uniqueSkuNos = [...new Set(resolvedSkuNos)]
   return {
     id: String(row.orderId), orderNo: row.orderNo, referenceNo: row.referenceId ?? '', transportMode: null,
-    businessType: 'EXPORT', origin: '', destination: row.destinationWarehouseName ?? '', receivingWarehouseId: '',
+    businessType: 'EXPORT', fulfillmentType: row.fulfillmentType ?? 'STANDARD', lxCode: row.lxCode ?? '', origin: '', destination: row.destinationWarehouseName ?? '', receivingWarehouseId: '',
     receivingWarehouseName: '', receivingWarehouseSnapshot: null, expectedDepartureDate: '', etd: '', eta: '',
     shipperPartyId: '', shipperPartySnapshot: null, shipper: '', consigneePartyId: '', consigneePartySnapshot: null,
     consignee: row.receivingCompanyName ?? '', expressCompanyName: row.expressCompany ?? '', trackingNumber: row.trackingNo ?? '',
@@ -542,9 +542,19 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
     return mapped
   }
 
-  async function loadLegacyDetail(id: string) {
+  async function loadLegacyDetail(id: string, listOrder?: FirstLegOrder) {
     const detail = await getMerchantFirstLegOrder(id)
-    return upsertOrder(mapOrder(detail.order, warehouses.value, detail))
+    const mapped = mapOrder(detail.order, warehouses.value, detail)
+    // Older detail responses may omit newly added dropship fields. Keep the
+    // values already returned by the list row so editing a draft does not
+    // clear the persisted LX code in the form.
+    if (detail.order.fulfillmentType == null && listOrder?.fulfillmentType) {
+      mapped.fulfillmentType = listOrder.fulfillmentType
+    }
+    if (detail.order.lxCode == null && listOrder?.lxCode) {
+      mapped.lxCode = listOrder.lxCode
+    }
+    return upsertOrder(mapped)
   }
 
   async function loadUnifiedDetail(id: string) {
@@ -558,7 +568,8 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
   }
 
   async function loadDetail(id: string) {
-    return getById(id)?.status === 'DRAFT' ? loadLegacyDetail(id) : loadUnifiedDetail(id)
+    const listOrder = getById(id)
+    return listOrder?.status === 'DRAFT' ? loadLegacyDetail(id, listOrder) : loadUnifiedDetail(id)
   }
 
   async function loadWarehouseDetail(id: string) {
@@ -616,7 +627,7 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
   }
 
   async function loadDraftDetail(id: string) {
-    return loadLegacyDetail(id)
+    return loadLegacyDetail(id, getById(id))
   }
 
   return { orders, warehouses, loading, loadedFromApi, loadError, warehouseLoadError, draftLoadError, activeCount, pendingCount, getById, load, loadDetail, loadDraftDetail, loadWarehouseDetail, loadWarehouseType, saveDraft, saveDraftBatch, submitSaved, submit }