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
@@ -50,7 +50,8 @@ test('批量待分柜参数固定同一客户并限制为订单测量链', () =>
  assert.match(acceptance, /orderBlockingFailure[\s\S]*step\.deploymentBlocker/)
  assert.match(acceptance, /measurementBlockingFailure[\s\S]*step\.deploymentBlocker/)
  assert.doesNotMatch(acceptance, /this\.modules\.at\(-1\)\?\.success !== true/)
-  assert.match(acceptance, /measurement\.processStatus === 'WAIT_SPLIT'/)
+  assert.match(acceptance, /measurement\.processStatus === expectedProcessStatus/)
+  assert.match(acceptance, /prepareDropshipManualCount \? 'WAIT_PALLETIZE' : 'WAIT_SPLIT'/)
  assert.match(acceptance, /measurement\.finalStatus === 'APPROVED'/)
  assert.match(acceptance, /waitSplitVariant\(sequence\)/)
  assert.match(acceptance, /packageCountPerSku/)