merge: sync test and stabilize full acceptance

2026-09-09 21:14:25 +08:00
parent eac6875877 6737c4c327
commit c8ab4d3de5
40 changed files with 595 additions and 134 deletions
@@ -183,7 +183,9 @@ async function verifyDestinationMergeFeeAndExport(context, details, producer) {
  const groupRead = await detail(context, representative, '回查批量合托关系')
  context.assert(MODULE, '批量合托关系包含本轮订单', groupRead.response,
    groupRead.data?.order?.palletMergeFlag === 'REQUIRED'
-      && nonBlank(groupRead.data?.order?.palletMergeBatchId), trace(groupRead.response), OPTIONS)
+      && (allIds.length === 1 || nonBlank(groupRead.data?.order?.palletMergeBatchId)),
+    `orders=${allIds.length}, batchId=${groupRead.data?.order?.palletMergeBatchId || 'single-order'}; ${trace(groupRead.response)}`,
+    OPTIONS)
  const batchCleared = await api(context, 'PUT', '批量取消PDA合托分组', batchMergePath,
    { orderIds: allIds, palletMergeRequired: false })
  context.assert(MODULE, '批量合托分组取消成功', batchCleared.response, batchCleared.data == null, trace(batchCleared.response), OPTIONS)