Merge origin/dev into release/test preserving current workflows

2026-09-14 11:05:49 +08:00
parent 171c484f96 1c01352a39
commit b9c327e973
6 changed files with 89 additions and 16 deletions
@@ -63,7 +63,10 @@ test('login has no committed demo credentials and inbound operation implements t
 	assert.doesNotMatch(operation, /\.split\([^\n]*['"]#['"]/, '前端必须原样提交完整箱码，禁止按 # 猜测入仓码或箱序号')
 	assert.match(operation, /const payload = isFba \? \{ inboundCode: this\.activeInbound\.inboundCode, palletCode: this\.resolvedPallet\.palletCode, packageCount: Number\(this\.packageCount\), expectedPalletVersion: this\.resolvedPallet\.version \}/)
 	assert.doesNotMatch(operation, /skuCode/)
-	assert.match(operation, /clearReceiptContext\(\)[\s\S]*activeScanTarget = 'carton'/)
+	assert.match(operation, /resolveCurrentCarton\(cartonMark\)[\s\S]*value\.operationMode !== 'DROPSHIP_PALLET'/)
+	assert.match(operation, /name="carton"[\s\S]*@submit="resolveCarton"/)
+	assert.match(operation, /sourcePalletNo: value\.sourcePalletNo \|\| cartonMark[\s\S]*receiveCurrentWholePallet/)
+	assert.match(operation, /clearReceiptContext\(\)[\s\S]*activeScanTarget = 'carton'[\s\S]*drainScanQueue/)
 	assert.match(operation, /name="pallet"[\s\S]*@activate="activeTarget = 'pallet'"/)
 	assert.match(operation, /receiving\.activeScanTarget = 'pallet'/, '普通FBA或中转解析后直接进入托盘扫码以减少操作')
 	assert.match(operation, /\[Overseas PDA scan\] dispatch/)