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

fix(acceptance): reuse approved carton mark during relabel rework

Browse Source
This commit is contained in:
ouyangxq
2026-09-20 20:20:49 +08:00
parent bd03ed5671
commit 088c219c20
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/admin-test-env-modules/phase4-overseas-pda-operations-contract.test.mjs
+1
View File
@@ -106,6 +106,7 @@ test('P5 follows warehouse review, customer confirmation and fulfillment complet
assert.match(source, /manualCompletion: true/) assert.match(source, /manualCompletion: true/)
assert.match(source, /P5返工重新确认箱标阶段/) assert.match(source, /P5返工重新确认箱标阶段/)
assert.match(source, /P5返工重新完成SKU阶段/) assert.match(source, /P5返工重新完成SKU阶段/)
assert.match(source, /newLabel: redoItem\.fbaCartonMark \|\| redoItem\.newSkuCode/)
assert.ok(source.indexOf('P5换标箱${index + 1}拆托') < source.indexOf('P5返工组托后提交完工等待客户确认')) assert.ok(source.indexOf('P5换标箱${index + 1}拆托') < source.indexOf('P5返工组托后提交完工等待客户确认'))
assert.ok(source.indexOf('P5返工组托后提交完工等待客户确认') < source.indexOf('const confirmBody')) assert.ok(source.indexOf('P5返工组托后提交完工等待客户确认') < source.indexOf('const confirmBody'))
assert.match(source, /applicationStatus === 'CUSTOMER_CONFIRM_PENDING'/) assert.match(source, /applicationStatus === 'CUSTOMER_CONFIRM_PENDING'/)
scripts/admin-test-env-modules/phase4-overseas-pda-operations.mjs
+2 -1
View File
@@ -557,7 +557,8 @@ async function verifyRelabel(context, token, merchantToken, fixture) {
detail = carton.data detail = carton.data
} }
const redo = await request(context, token, 'POST', 'P5返工重新完成SKU阶段', unitPath, { const redo = await request(context, token, 'POST', 'P5返工重新完成SKU阶段', unitPath, {
itemId: id(redoItem.itemId), oldLabel: redoItem.cartonMark, newLabel: redoItem.newSkuCode, itemId: id(redoItem.itemId), oldLabel: redoItem.cartonMark,
newLabel: redoItem.fbaCartonMark || redoItem.newSkuCode,
skuVerifications: (redoItem.skuItems || []).map(sku => ({ skuVerifications: (redoItem.skuItems || []).map(sku => ({
skuCode: sku.skuCode, newSkuCode: sku.newSkuCode, quantity: Number(sku.quantity), skuCode: sku.skuCode, newSkuCode: sku.newSkuCode, quantity: Number(sku.quantity),
})), })),