Merge origin/dev into test preserving warehouse and PDA workflows

2026-09-14 11:03:47 +08:00
parent cc2aed72d9 8cf7c4b9c9
commit d4fec8294d
103 changed files with 3033 additions and 225 deletions
@@ -49,3 +49,19 @@ test('module records the marker-owned dispatch without attempting excluded clean
  assert.match(source, /finalStatus = arranged\.data\?\.status/)
  assert.match(source, /PENDING_DEPARTURE dispatch is retained as marker-owned acceptance evidence/)
 })
+
+test('module prefers marker-owned relabel pallets and proves only new FBA carton marks are frozen', () => {
+  assert.match(source, /phase4OverseasRelabel/)
+  assert.match(source, /sourceStage === 'RELABEL'/)
+  assert.match(source, /relabel\.targetPalletIds\.includes/)
+  assert.match(source, /relabelCartonMarks/)
+  assert.match(source, /!String\(value\?\.cartonMarks \|\| ''\)\.trim\(\)/)
+  assert.match(source, /relabelNo: relabel\.relabelNo/)
+})
+
+ test('relabel settlement follows pre-arrange and does not replace the ordinary dispatch lifecycle', () => {
+  assert.match(source, /await runRelabelDispatch\(context, relabel\)[\s\S]*if \(relabel.dispatchNo\) await settleRelabelFulfillment\(context, relabel\)/)
+  const branch = source.slice(source.indexOf('const relabel = context.createdResources'), source.indexOf('const fixture = markerFixture(context)', source.indexOf('const relabel = context.createdResources')))
+  assert.doesNotMatch(branch, /\breturn\b/)
+  assert.match(source, /Object.assign\(relabel, \{/)
+})