java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into dev

Browse Source 
# Conflicts:
#	scripts/admin-test-env-modules/phase4-overseas-pda.mjs
This commit is contained in:
ouyangxq
2026-09-02 15:43:00 +08:00
parent e946d99ea3 2902ab6077
commit 137e4e7c60
9 changed files with 66 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
+2
View File
@@ -98,6 +98,8 @@ test('PDA module covers the container-number receiving contract and excludes out
assert.match(source, /item\?\.shippingReady === false/)
assert.match(source, /!expectedSet\.has\(id\(item\?\.containerNo\)\)/)
assert.match(source, /unexpectedAwaiting=/)
assert.match(source, /candidatesByContainer\.get\(containerNo\)\?\.operable === true/)
assert.match(source, /candidatesByContainer\.get\(containerNo\)\?\.operable !== true/)
assert.match(source, /missingPickupReady\.length === 0 && unexpectedAwaiting\.length === 0/)
assert.doesNotMatch(source, /shippingReady == null|shippingReady !== true/)
assert.match(source, /nonBlank\(item\?\.resourceKey\)/)
scripts/admin-test-env-modules/phase4-overseas-pda.mjs
+10 -9
View File
@@ -350,22 +350,23 @@ async function awaitPickupReadyCandidates(context, token, producers, allProducer
const known = new Set(allProducers.map((item) => id(item?.containerNo)).filter(nonBlank))
if (!expected.length) return false
let response = null
let seen = new Set()
let candidatesByContainer = new Map()
for (let attempt = 1; attempt <= 30; attempt += 1) {
response = await context.requestOverseas('GET',
'/api/pda/v1/last-leg/receiving-containers/candidates', undefined, {}, token)
const candidateRows = success(response) && Array.isArray(response.body?.data) ? response.body.data : []
seen = new Set(candidateRows.map((item) => id(item?.containerNo)).filter(nonBlank))
if (expected.every((containerNo) => seen.has(containerNo))
&& awaiting.every((containerNo) => !seen.has(containerNo))) break
candidatesByContainer = new Map(candidateRows
.map((item) => [id(item?.containerNo), item]).filter(([containerNo]) => nonBlank(containerNo)))
if (expected.every((containerNo) => candidatesByContainer.get(containerNo)?.operable === true)
&& awaiting.every((containerNo) => candidatesByContainer.get(containerNo)?.operable !== true)) break
await new Promise((resolve) => setTimeout(resolve, 1000))
}
const seenExpected = expected.filter((containerNo) => seen.has(containerNo))
const missingPickupReady = expected.filter((containerNo) => !seen.has(containerNo))
const unexpectedAwaiting = awaiting.filter((containerNo) => seen.has(containerNo))
const unexpectedHistorical = [...seen].filter((containerNo) => !known.has(containerNo))
const seenExpected = expected.filter((containerNo) => candidatesByContainer.has(containerNo))
const missingPickupReady = expected.filter((containerNo) => candidatesByContainer.get(containerNo)?.operable !== true)
const unexpectedAwaiting = awaiting.filter((containerNo) => candidatesByContainer.get(containerNo)?.operable === true)
const unexpectedHistorical = [...candidatesByContainer.keys()].filter((containerNo) => !known.has(containerNo))
const targetCorrelated = producers.every((item) => nonBlank(item?.resourceKey)
&& item?.shippingReady !== false && seen.has(id(item?.containerNo)))
&& item?.shippingReady !== false && candidatesByContainer.get(id(item?.containerNo))?.operable === true)
const ready = missingPickupReady.length === 0 && unexpectedAwaiting.length === 0 && targetCorrelated
context.addStep(MODULE, '实际处理柜全部达到PICKUP_READY并进入PDA候选', response, ready,
`targetCorrelated=${targetCorrelated}, expected=${expected.join('|')}, awaiting=${awaiting.join('|') || 'none'}, seenExpected=${seenExpected.join('|') || 'none'}, missingPickupReady=${missingPickupReady.join('|') || 'none'}, unexpectedAwaiting=${unexpectedAwaiting.join('|') || 'none'}, unexpectedHistorical=${unexpectedHistorical.join('|') || 'none'}; ${trace(response)}`, OPTIONS)