优化

scripts/admin-test-env-modules/master-data.mjs

@@ -159,6 +159,7 @@ export async function run(context) {
 
   const partnerPayload = {
     partnerCode: `PT${suffix}`, partnerName: `Admin验收船公司-${suffix}`, partnerType: 'CARRIER', types: ['CARRIER'],
+    carrierCode: 'MATSON',
     contactName: '往来单位验收员', contactPhone: '13800000002', contactEmail: `partner-${suffix}@example.com`,
     countryCode: 'CN', province: '广东省', city: '深圳市', district: '南山区', addressLine: 'Admin API 往来单位地址',
     postalCode: '518000', status: 'ACTIVE', remark: context.marker,

scripts/admin-test-env-modules/order-inbound-status-fixtures.mjs

@@ -102,7 +102,7 @@ function orderPayload(context, fixture, target) {
     cargoes: [{ cargoName: `${target} 状态样本货物`, cargoNameEn: `${target} fixture cargo`, hsCode: '8518210000',
       customsHsCode: '8518210000', packageType: 'CARTON', packageCount: 1, grossWeightKg: 10,
       volumeCbm: 0.024, lengthCm: 40, widthCm: 30, heightCm: 20, declaredValue: 100, currency: 'USD',
-      dangerousGoods: false, cargoRemark: sample, skuNo: `SKU-${target}-${context.marker}`.slice(0, 64),
+      dangerousGoods: false, woodenProduct: false, cargoRemark: sample, skuNo: `SKU-${target}-${context.marker}`.slice(0, 64),
       upcNo, shipmentId, referenceId,
       unitsPerPackage: 10, totalQuantity: 10, netWeightKg: 9, unitDeclaredValue: 10,
       material: '塑料', usage: '人工验收', model: `MODEL-${target}`, brand: 'IT-TEST' }],

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

@@ -230,7 +230,8 @@ export async function run(context) {
   if (!loadingPlanId) return
   const assignmentResponse = await request(context, 'POST', `${smartLoadingBase}/plans/${loadingPlanId}/assignments`, {
     inboundId, inboundDetailId: id(candidate.inboundDetailId), packageCount: 1,
-    expectedVersion: Number(loadingPlan.version), operationId: `${context.marker}-bridge-assign`.slice(0, 128),
+    expectedVersion: Number(loadingPlan.version),
+    operationId: `${context.marker}-${loadingPlanId}-bridge-assign`.slice(0, 128),
   })
   const assignedLoadingPlan = context.apiSuccess(MODULE, '将本轮入库货物分配到柜次计划', assignmentResponse, '', OPTIONS)
   context.assert(MODULE, '柜次计划明细和版本真实持久化', assignmentResponse,

scripts/admin-test-env-modules/phase3-order-splitting.mjs

@@ -165,13 +165,13 @@ function snapshotMatches(tree, original, loaded, remaining, activeSuffix) {
     && activeMatches && quantityConserved(tree)
 }
 
-function bookingPayload(marker, sequence, source, agent) {
+function bookingPayload(marker, sequence, source, agent, carrier) {
   const suffix = `${marker}-${sequence}`.replace(/[^A-Za-z0-9]/g, '').slice(-18)
   return oceanBookingDraft({ marker }, suffix, {
     customerId: source.tenantId, customerName: source.customerName, channelCode: source.channelCode,
     warehouseId: source.warehouseId, warehouseName: source.warehouseName,
   }, { vesselName: `SPLIT-VESSEL-${suffix}`.slice(0, 128), voyageNo: `SV-${sequence}`.slice(0, 64),
-    shippingCompanyId: id(agent.id), shippingCompanyName: agent.name,
+    shippingCompanyId: id(carrier.id), shippingCompanyName: carrier.name, carrierCode: carrier.carrierCode,
     bookingAgentId: id(agent.id), bookingAgentName: agent.name,
     estimatedSailingAt: '2026-09-16T08:00:00', estimatedArrivalAt: '2026-10-16T08:00:00' })
 }
@@ -184,6 +184,9 @@ async function loadOneFragment(context, state) {
   const agentPage = context.apiSuccess(MODULE, `为 ${sourceOrderNo} 读取 ACTIVE 订舱代理`, agentResponse, '', OPTIONS)
   const agent = agentPage?.records?.find?.((item) => item?.id && item?.name)
   if (!agent) return null
+  const { ensureMatsonCarrierPartner } = await import('./carrier-partner-fixture.mjs')
+  const carrier = await ensureMatsonCarrierPartner(context, MODULE, OPTIONS)
+  if (!carrier?.id) return null
   const simulationResponse = await request(context, 'POST', CONTAINERS, {
     channelCode: state.channelCode, warehouseId, containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000,
   })
@@ -192,7 +195,7 @@ async function loadOneFragment(context, state) {
   if (!containerId) return null
   context.createdResources.phase3OrderSplitting.retainedAuditRecordIds.push(containerId)
   const bookingCreate = await request(context, 'POST', '/api/platform/v1/ocean-bookings', {
-    expectedVersion: 0, data: bookingPayload(context.marker, sequence, state, agent),
+    expectedVersion: 0, data: bookingPayload(context.marker, sequence, state, agent, carrier),
   }, { 'Idempotency-Key': `${operationBase}-booking-create` })
   const bookingCreated = context.apiSuccess(MODULE, `为 ${sourceOrderNo} 创建渠道仓库一致的订舱`, bookingCreate, '', OPTIONS)
   const oceanBookingId = id(bookingCreated?.oceanBooking?.id)

scripts/admin-test-env-modules/phase4-overseas-master-data.mjs

@@ -64,7 +64,7 @@ function warehousePayload(marker, edited = false) {
     countryCode: 'US',
     timezone: 'UTC-8',
     contactName: 'Phase4 QA',
-    contactPhone: '+1-213-555-0199',
+    contactPhone: '12135550199',
     contactEmail: null,
     status: 'ACTIVE',
     remark: edited ? `${marker} lifecycle edited` : `${marker} lifecycle`,
@@ -302,7 +302,7 @@ function vehiclePayload(context, edited = false) {
     model: edited ? 'Phase4 QA Truck Edited' : 'Phase4 QA Truck',
     fuelConsumptionPer100Km: edited ? 18.75 : 18.5,
     mileageKm: edited ? 101 : 100,
-    driverOrDispatchCompany: `${context.marker} Carrier`, phone: '+1-213-555-0188',
+    driverOrDispatchCompany: `${context.marker} Carrier`, phone: '12135550188',
     region: 'OVERSEAS', ownership: 'OWNED',
     ...(edited ? {} : { status: 'IN_SERVICE' }),
     remark: edited ? `${context.marker} lifecycle edited` : `${context.marker} lifecycle`,

scripts/admin-test-env-modules/suppliers.mjs

@@ -9,6 +9,9 @@ function code(response, expected) { return response?.http === 200 && String(resp
 function records(page) { return Array.isArray(page?.records) ? page.records : [] }
 function id(value) { return value == null ? '' : String(value) }
 function traced(response) { return Boolean(response?.requestId && response?.traceId) }
+function sameCarrierCodes(actual, expected) {
+  return Array.isArray(actual) && [...actual].sort().join('|') === [...expected].sort().join('|')
+}
 function query(values = {}) { const p = new URLSearchParams(); for (const [k,v] of Object.entries(values)) if (v !== '' && v != null) p.set(k,String(v)); return `${BASE}${p.size ? `?${p}` : ''}` }
 function payload(marker, overrides = {}) { return { name:`供应商验收-${marker}`,category:'BOOKING',carrierCodes:['MATSON','COSCO'],region:'宁波',legalRepresentative:'验收法人',contactName:'验收联系人',phone:'13800000000',email:'supplier-acceptance@example.com',address:'验收地址',businessLicenseNo:`ACPT${marker}`.slice(0,64),licenseFileId:null,status:'ACTIVE',settlementPeriod:'MONTHLY_30',remark:marker,...overrides } }
 
@@ -31,7 +34,7 @@ export async function run(context) {
   try {
     const detailResponse=await context.request('GET',`${BASE}/${encodeURIComponent(supplierId)}?tenantId=0`)
     const detail=context.apiSuccess(MODULE,'查询供应商详情',detailResponse,'',OPTIONS)
-    context.assert(MODULE,'详情字段与平台作用域及多船司关联正确',detailResponse,id(detail?.id)===supplierId&&id(detail?.tenantId)==='0'&&detail?.name===createBody.name&&!Object.hasOwn(detail,'scope')&&JSON.stringify(detail?.carrierCodes)===JSON.stringify(['MATSON','COSCO']),`id=${id(detail?.id)}, tenantId=${id(detail?.tenantId)}, carrierCodes=${JSON.stringify(detail?.carrierCodes)}, scopeExposed=${Object.hasOwn(detail||{},'scope')}`,OPTIONS)
+    context.assert(MODULE,'详情字段与平台作用域及多船司关联正确',detailResponse,id(detail?.id)===supplierId&&id(detail?.tenantId)==='0'&&detail?.name===createBody.name&&!Object.hasOwn(detail,'scope')&&sameCarrierCodes(detail?.carrierCodes,['MATSON','COSCO']),`id=${id(detail?.id)}, tenantId=${id(detail?.tenantId)}, carrierCodes=${JSON.stringify(detail?.carrierCodes)}, scopeExposed=${Object.hasOwn(detail||{},'scope')}`,OPTIONS)
 
     const duplicateResponse=await context.request('POST',`${BASE}?tenantId=0`,payload(`${marker}D`,{name:createBody.name}))
     context.assert(MODULE,'重复名称返回冲突并保留链路ID',duplicateResponse,code(duplicateResponse,'A0409')&&traced(duplicateResponse),`code=${duplicateResponse.body?.code}, requestId=${duplicateResponse.requestId||'missing'}, traceId=${duplicateResponse.traceId||'missing'}`,OPTIONS)
@@ -52,7 +55,7 @@ export async function run(context) {
     context.apiSuccess(MODULE,'编辑供应商',updateResponse,'',OPTIONS)
     const editedResponse=await context.request('GET',`${BASE}/${encodeURIComponent(supplierId)}?tenantId=0`)
     const edited=context.apiSuccess(MODULE,'回查编辑结果',editedResponse,'',OPTIONS)
-    context.assert(MODULE,'编辑字段及多船司关联已持久化',editedResponse,edited?.name===updateBody.name&&!Object.hasOwn(edited,'scope')&&edited?.contactName==='编辑联系人'&&edited?.settlementPeriod==='MONTHLY_45'&&JSON.stringify(edited?.carrierCodes)===JSON.stringify(['MATSON','COSCO']),`name=${edited?.name||'missing'}, carrierCodes=${JSON.stringify(edited?.carrierCodes)}, scopeExposed=${Object.hasOwn(edited||{},'scope')}`,OPTIONS)
+    context.assert(MODULE,'编辑字段及多船司关联已持久化',editedResponse,edited?.name===updateBody.name&&!Object.hasOwn(edited,'scope')&&edited?.contactName==='编辑联系人'&&edited?.settlementPeriod==='MONTHLY_45'&&sameCarrierCodes(edited?.carrierCodes,['MATSON','COSCO']),`name=${edited?.name||'missing'}, carrierCodes=${JSON.stringify(edited?.carrierCodes)}, scopeExposed=${Object.hasOwn(edited||{},'scope')}`,OPTIONS)
 
     const disableResponse=await context.request('PATCH',`${BASE}/${encodeURIComponent(supplierId)}/status?tenantId=0`,{status:'INACTIVE'})
     context.apiSuccess(MODULE,'停用供应商',disableResponse,'',OPTIONS); inactive=ok(disableResponse)