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

2026-09-20 20:20:49 +08:00
parent bd03ed5671
commit 088c219c20
2 changed files with 3 additions and 1 deletions
@@ -106,6 +106,7 @@ test('P5 follows warehouse review, customer confirmation and fulfillment complet
  assert.match(source, /manualCompletion: true/)
  assert.match(source, /P5返工重新确认箱标阶段/)
  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返工组托后提交完工等待客户确认') < source.indexOf('const confirmBody'))
  assert.match(source, /applicationStatus === 'CUSTOMER_CONFIRM_PENDING'/)
@@ -557,7 +557,8 @@ async function verifyRelabel(context, token, merchantToken, fixture) {
      detail = carton.data
    }
    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 => ({
        skuCode: sku.skuCode, newSkuCode: sku.newSkuCode, quantity: Number(sku.quantity),
      })),