优化

2026-08-26 17:09:02 +08:00
parent 6c4543c18c
commit 795e852944
16 changed files with 201 additions and 155 deletions
@@ -79,7 +79,7 @@ export async function run(context) {
    beforeContainerVersion: Number(container?.version), beforeItems,
    expectedAssignments: source.expectedAssignments || [],
    instructions: [
-      '在订舱页面创建与本清单客户、起运仓、渠道和柜型一致的 DRAFT 订舱，并填写完整运输资料。',
+      '在订舱页面创建与本清单客户、起运仓、渠道和柜型一致的 DRAFT 订舱，并填写承运船司代码 carrierCode 及完整运输资料。',
      '确认放舱，使订舱进入 RELEASED；放舱本身不得创建货柜。',
      '在原 containerBookingId 上选择该订舱未占用的柜型需求，录入唯一真实 containerNo 完成关联。',
      '回到预装详情，确认 canConfirm=true 后执行整份计划确认；不要领取 PDA 任务。',
@@ -137,7 +137,7 @@ async function createConfirmedContainer(context, source, label) {
    customerId: source.tenantId, customerName: summary.customerName || 'IT 测试客户',
    channelCode: summary.channelCode, warehouseId: source.warehouseId,
    billOfLadingNo: `BL-${value}`.slice(0, 128),
-    shippingCompanyId: id(agent.id), shippingCompanyName: agent.name,
+    shippingCompanyId: id(agent.id), shippingCompanyName: agent.name, carrierCode: 'OTHER',
    bookingAgentId: id(agent.id), bookingAgentName: agent.name, departurePortCode: 'CNSZX',
    vesselName: `人工船-${value}`.slice(0, 128), voyageNo: `V-${value}`.slice(0, 64),
    departurePortName: '深圳', destinationPortCode: 'USLAX', destinationPortName: '洛杉矶',
@@ -39,6 +39,9 @@ test('批量待分柜参数固定同一客户并限制为订单测量链', () =>
  assert.match(acceptance, /wait-split-count必须是1-100的整数/)
  assert.match(acceptance, /批量WAIT_SPLIT只允许执行merchant-qualification-fixture、orders、inbound-measurement/)
  assert.match(acceptance, /createAdditionalWaitSplitFixtures/)
+  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\.finalStatus === 'APPROVED'/)
  assert.match(acceptance, /waitSplitVariant\(sequence\)/)
@@ -28,6 +28,7 @@ test('shared DRAFT uses requirements and never registers a real container number
  assert.equal(JSON.stringify(draft).includes('containerNo'), false)
  assert.equal(draft.serviceTerm, 'CY-CY')
  assert.equal(draft.freightTerm, 'NINGBO')
+  assert.equal(draft.carrierCode, 'OTHER')
  for (const field of ['billOfLadingNo', 'vesselName', 'voyageNo', 'estimatedSailingAt', 'estimatedArrivalAt']) assert.ok(draft[field])
 })

@@ -61,6 +61,7 @@ export function oceanBookingDraft(context, suffix, master, labels = {}) {
  return {
    ...writableMaster,
    billOfLadingNo: labels.billOfLadingNo || `BL-${suffix}`,
+    carrierCode: labels.carrierCode || 'OTHER',
    shippingCompanyId: labels.shippingCompanyId ?? null,
    shippingCompanyName: labels.shippingCompanyId ? labels.shippingCompanyName ?? null : null,
    bookingAgentId: labels.bookingAgentId ?? null,
@@ -159,7 +159,7 @@ export async function run(context) {
    customerId: tenantId, customerName: inbound?.summary?.customerName || `验收客户-${tenantId}`,
    channelCode, warehouseId,
    billOfLadingNo: `BL-${suffix}`.slice(0, 128),
-    shippingCompanyId: id(bookingAgent.id), shippingCompanyName: bookingAgent.name,
+    shippingCompanyId: id(bookingAgent.id), shippingCompanyName: bookingAgent.name, carrierCode: 'OTHER',
    bookingAgentId: id(bookingAgent.id), bookingAgentName: bookingAgent.name,
    vesselName: `验收船-${suffix}`.slice(0, 128), voyageNo: `V-${suffix}`.slice(0, 64),
    departurePortCode: 'CNSZX', departurePortName: '深圳',
@@ -175,7 +175,7 @@ export async function run(context) {
    warehouseId,
    channelCode: initial?.summary?.channelCode,
    billOfLadingNo: `P3BL-${suffix}`.slice(0, 128),
-    shippingCompanyId: id(shippingCarrier.id), shippingCompanyName: shippingCarrier.name,
+    shippingCompanyId: id(shippingCarrier.id), shippingCompanyName: shippingCarrier.name, carrierCode: 'OTHER',
    bookingAgentId: id(supplier.id), bookingAgentName: supplier.name,
    vesselName: `P3VESSEL-${suffix}`.slice(0, 128), voyageNo: `P3V-${suffix}`.slice(0, 64),
    departurePortCode: 'CNSZX', departurePortName: '深圳', destinationPortCode: 'USLAX',
@@ -263,7 +263,7 @@ node scripts/admin-test-env-acceptance.mjs `

 严格按以下顺序操作：

-1. 创建与准备清单客户、起运仓、渠道、柜型一致的海运订舱 DRAFT，并补齐提单号、船名、航次、ETD、ETA、参与方和柜型需求。
+1. 创建与准备清单客户、起运仓、渠道、柜型一致的海运订舱 DRAFT，并补齐承运船司代码 `carrierCode`、提单号、船名、航次、ETD、ETA、参与方和柜型需求。
 2. 点击放舱，使订舱进入 `RELEASED`。此时不应自动生成真实柜次或 PDA 任务。
 3. 在原内部柜次上选择该订舱未占用的柜型需求，录入唯一真实 `containerNo` 完成关联；不得新建替代柜次。
 4. 回到预装详情，确认门禁变为 `canConfirm=true`，再执行整份预装计划确认。