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

fix(admin): align loading history and pallet lookup

Browse Source
This commit is contained in:
ouyangxq
2026-09-01 11:10:22 +08:00
parent 4711bcc4e6
commit e3ecba7133
8 changed files with 136 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/inbounds/weight/api/weightOcr.test.ts
+5 -5
View File
@@ -93,26 +93,26 @@ describe('inbound weight OCR API', () => {
data: { records, page: '1', size: '20', total: '2', pages: '1' },
})
await expect(getWeightPalletOptions('10001', '20001')).resolves.toEqual({
await expect(getWeightPalletOptions('10001', '20001', { page: 1, size: 50 })).resolves.toEqual({
records, page: 1, size: 20, total: 2, pages: 1,
})
expect(http.get).toHaveBeenCalledWith(
'/platform/v1/first-leg/inbounds/20001/weight-pallet-options',
{ params: { tenantId: '10001' } },
{ params: { tenantId: '10001', page: 1, size: 50, keyword: undefined } },
)
})
it('passes an abort signal without changing the frozen pallet endpoint parameters', async () => {
it('passes remote page, keyword and abort signal through the frozen pallet endpoint', async () => {
vi.mocked(http.get).mockResolvedValue({
code: '200', message: 'success', data: { records: [], page: '1', size: '20', total: '0', pages: '0' },
})
const controller = new AbortController()
await getWeightPalletOptions('10001', '20001', controller.signal)
await getWeightPalletOptions('10001', '20001', { page: 2, size: 50, keyword: ' 木托盘 ', signal: controller.signal })
expect(http.get).toHaveBeenCalledWith(
'/platform/v1/first-leg/inbounds/20001/weight-pallet-options',
{ params: { tenantId: '10001' }, signal: controller.signal },
{ params: { tenantId: '10001', page: 2, size: 50, keyword: '木托盘' }, signal: controller.signal },
)
})
src/modules/inbounds/weight/api/weightOcr.ts
+11 -2
View File
@@ -74,10 +74,19 @@ export async function getWeightWorkspace(tenantId: string, inboundId: string) {
return unwrapApiResponse(response)
}
export async function getWeightPalletOptions(tenantId: string, inboundId: string, signal?: AbortSignal) {
export async function getWeightPalletOptions(tenantId: string, inboundId: string, query: {
page?: number
size?: number
keyword?: string
signal?: AbortSignal
} = {}) {
const keyword = query.keyword?.trim()
const response = await http.get<ApiEnvelope<WeightPalletOptionPageResponse>, ApiEnvelope<WeightPalletOptionPageResponse>>(
`${measurementBasePath}/${segment(inboundId)}/weight-pallet-options`,
{ params: { tenantId }, ...(signal ? { signal } : {}) },
{
params: { tenantId, page: query.page ?? 1, size: query.size ?? 50, keyword: keyword || undefined },
...(query.signal ? { signal: query.signal } : {}),
},
)
const page = unwrapApiResponse(response)
return {