html/admin-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.buggoglobal.com/html/admin-web into release/test

Browse Source
This commit is contained in:
ouyangxq
2026-09-10 20:26:57 +08:00
parent b57ea2d628 19fed894d9
commit 5a165add2c
58 changed files with 865 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/loading-lists/api/platformLoadingLists.test.ts
+2 -2
View File
@@ -51,7 +51,7 @@ const detail = {
items: [{
itemId: 11, itemVersion: 4, accountId: 12, orderId: 15, orderNo: 'ORD-001', inboundId: 13, inboundDetailId: 14, containerNo: 'MSCU1234567', productQuantity: 20,
customerName: '测试客户', customsTaxMode: 'TAX_REFUND', taxRefundFlag: true, inboundCode: 'RK001', skuCode: 'SKU001', destinationWarehouse: 'ONT8', chineseName: '产品', englishName: null,
goodsImageUrl: null, packageCount: 2, palletCount: 1, grossWeightKg: 10, netWeightKg: 9, volumeCbm: 1,
goodsImageUrl: null, unitType: 'SEALED_PALLET', palletId: 9007199254740993n, palletNo: 'PLT-001', indivisible: true, packageCount: 2, palletCount: 1, grossWeightKg: 10, netWeightKg: 9, volumeCbm: 1,
dimensionalWeightKg: 2, unitsPerPackage: 10, fbaTrackingNo: null, shipmentNo: null, shippingMark: null,
internalRemark: null, customerRemark: null, warehouseRemark: null, loadSequence: 1, frozenAt: null,
}],
@@ -77,7 +77,7 @@ describe('platform loading lists API', () => {
vi.spyOn(http, 'get').mockResolvedValue({ code: '200', message: 'ok', data: detail })
const result = await getPreloadPlan('100', '300')
expect(result.items[0]).toMatchObject({ itemId: '11', itemVersion: 4, accountId: '12', orderId: '15', orderNo: 'ORD-001', inboundId: '13', inboundDetailId: '14', containerNo: 'MSCU1234567', productQuantity: '20', customsTaxMode: 'TAX_REFUND', taxRefundFlag: true })
expect(result.items[0]).toMatchObject({ itemId: '11', itemVersion: 4, accountId: '12', orderId: '15', orderNo: 'ORD-001', inboundId: '13', inboundDetailId: '14', unitType: 'SEALED_PALLET', palletId: '9007199254740993', palletNo: 'PLT-001', indivisible: true, containerNo: 'MSCU1234567', productQuantity: '20', customsTaxMode: 'TAX_REFUND', taxRefundFlag: true })
expect(result.summary.containerBookingId).toBe('1900000000000000004')
expect(result.histories[0]).toMatchObject({ historyId: '21', itemId: '11', operationId: 'transport-21', operatorId: '22' })
})
src/modules/loading-lists/api/platformLoadingLists.ts
+7
View File
@@ -93,6 +93,10 @@ export interface LoadingItem {
chineseName: string | null
englishName: string | null
goodsImageUrl: string | null
unitType: 'PACKAGE' | 'SEALED_PALLET'
palletId: string | null
palletNo: string | null
indivisible: boolean
packageCount: number
palletCount: number
grossWeightKg: number
@@ -242,6 +246,9 @@ function normalizeItem(raw: LoadingItem): LoadingItem {
orderId: requiredId(raw.orderId),
inboundId: requiredId(raw.inboundId),
inboundDetailId: requiredId(raw.inboundDetailId),
palletId: optionalId(raw.palletId),
palletNo: raw.palletNo || null,
indivisible: Boolean(raw.indivisible),
productQuantity: String(raw.productQuantity ?? '0'),
}
}