优化

scripts/admin-test-env-modules/phase3-loading.mjs

@@ -211,9 +211,11 @@ export async function run(context) {
   }, { 'Idempotency-Key': `${context.marker}-p3-smart`.slice(0, 128) })
   const smartData = context.apiSuccess(MODULE, '智能分柜并生成预装清单', smart, `inboundId=${inboundId}`, OPTIONS)
   const planId = id(smartData?.preloadPlan?.id)
+  const smartPreloadVersion = Number(smartData?.preloadPlan?.version)
   context.assert(MODULE, '智能分柜预装计划 PENDING、版本和明细正确', smart,
     smartData?.mainStatus === 'WAIT_SPLIT' && Boolean(planId) && smartData?.preloadPlan?.status === 'PENDING'
-      && Number(smartData?.preloadPlan?.version) === 0 && smartData?.preloadPlan?.items?.length === 1,
+      && Number.isInteger(smartPreloadVersion) && smartPreloadVersion >= 0
+      && smartData?.preloadPlan?.items?.length === 1,
     `mainStatus=${smartData?.mainStatus || 'missing'}, planId=${planId || 'missing'}, status=${smartData?.preloadPlan?.status || 'missing'}`, OPTIONS)
   if (!planId) return
 
@@ -225,16 +227,19 @@ export async function run(context) {
       && replay.body?.data?.preloadPlan?.items?.length === 1,
     `HTTP=${replay.http}, code=${codeOf(replay)}, planId=${id(replay.body?.data?.preloadPlan?.id) || 'missing'}`, OPTIONS)
 
+  const bindVersions = Object.freeze({
+    expectedPreloadVersion: smartPreloadVersion,
+    expectedLoadingPlanVersion: Number(assignedLoadingPlan.version),
+  })
   const bindResponse = await request(context, 'POST',
-    `${base}/preload/loading-plans/${loadingPlanId}?tenantId=${encodeURIComponent(tenantId)}`, {
-      expectedPreloadVersion: Number(smartData.preloadPlan.version),
-      expectedLoadingPlanVersion: Number(assignedLoadingPlan.version),
-    }, { 'Idempotency-Key': `${context.marker}-bridge-bind`.slice(0, 128) })
+    `${base}/preload/loading-plans/${loadingPlanId}?tenantId=${encodeURIComponent(tenantId)}`,
+    bindVersions, { 'Idempotency-Key': `${context.marker}-bridge-bind`.slice(0, 128) })
   const link = context.apiSuccess(MODULE, '原子关联入库预装与柜次装柜计划', bindResponse, '', OPTIONS)
   context.assert(MODULE, '桥接双版本递增且关联归属唯一', bindResponse,
     id(link?.inboundId) === inboundId && id(link?.loadingPlanId) === loadingPlanId
       && id(link?.preloadPlanId) === planId && Number(link?.allocatedPackageCount) === 1
-      && Number(link?.preloadVersion) === 1 && Number(link?.loadingPlanVersion) === 2,
+      && Number(link?.preloadVersion) > bindVersions.expectedPreloadVersion
+      && Number(link?.loadingPlanVersion) > bindVersions.expectedLoadingPlanVersion,
     `linkId=${id(link?.id) || 'missing'}, preloadVersion=${link?.preloadVersion ?? 'missing'}, loadingVersion=${link?.loadingPlanVersion ?? 'missing'}`, OPTIONS)
   if (!link?.id) return
 
@@ -606,7 +611,8 @@ export async function run(context) {
     { expectedVersion: Number(link.preloadVersion) }, { 'Idempotency-Key': `${context.marker}-p3-confirming`.slice(0, 128) })
   const confirmingData = context.apiSuccess(MODULE, '提交预装清单确认', confirming, '', OPTIONS)
   context.assert(MODULE, '预装清单进入 CONFIRMING 且版本递增', confirming,
-    confirmingData?.preloadPlan?.status === 'CONFIRMING' && Number(confirmingData?.preloadPlan?.version) === 2,
+    confirmingData?.preloadPlan?.status === 'CONFIRMING'
+      && Number(confirmingData?.preloadPlan?.version) > Number(link.preloadVersion),
     `status=${confirmingData?.preloadPlan?.status || 'missing'}, version=${confirmingData?.preloadPlan?.version ?? 'missing'}`, OPTIONS)
   if (confirmingData?.preloadPlan?.status !== 'CONFIRMING') return
 
@@ -618,9 +624,9 @@ export async function run(context) {
     : '预装确认推进主状态 LOADING 和计划 CONFIRMED', confirm,
     directPdaCompletion
       ? confirmed?.mainStatus === 'LOADING' && confirmed?.preloadPlan?.status === 'CONFIRMING'
-        && Number(confirmed?.preloadPlan?.version) === 2
+        && Number(confirmed?.preloadPlan?.version) === Number(confirmingData.preloadPlan.version)
       : confirmed?.mainStatus === 'LOADING' && confirmed?.preloadPlan?.status === 'CONFIRMED'
-        && Number(confirmed?.preloadPlan?.version) === 3,
+        && Number(confirmed?.preloadPlan?.version) > Number(confirmingData.preloadPlan.version),
     `mainStatus=${confirmed?.mainStatus || 'missing'}, planStatus=${confirmed?.preloadPlan?.status || 'missing'}, version=${confirmed?.preloadPlan?.version ?? 'missing'}`, OPTIONS)
   if (confirmed?.mainStatus !== 'LOADING') return