Merge remote-tracking branch 'origin/test' into dev

# Conflicts: # firstleg/src/main/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceService.java # firstleg/src/test/java/com/baiyue/firstleg/loading/service/CabinetLoadingEvidenceServiceTest.java # scripts/admin-test-env-modules/ocean-bookings.mjs # scripts/admin-test-env-modules/phase3-container-customs-fixture.mjs # scripts/admin-test-env-modules/phase3-container-documents-contract.test.mjs # scripts/admin-test-env-modules/phase3-container-loading.mjs # scripts/admin-test-env-modules/phase3-customs.mjs # scripts/admin-test-env-modules/phase3-loading-finalize.mjs # scripts/admin-test-env-modules/phase3-loading.mjs # scripts/admin-test-env-modules/phase3-port-schedules.mjs # scripts/admin-test-env-modules/service-center-flow.mjs
2026-09-02 14:00:44 +08:00
parent 1574263836 5d098c9762
commit 25ffd62e14
36 changed files with 1383 additions and 523 deletions
@@ -88,7 +88,7 @@ function orderPayload(context, fixture, target) {
    destinationCountryCode: fixture.destination.countryCode || 'US',
    destinationWarehouseId: fixture.destination.id, destinationWarehouseName: fixture.destination.warehouseName,
    expectedShipDate: new Date(Date.now() + 30 * 86400000).toISOString().slice(0, 10),
-    customerRemark: `${sample} 人工列表状态样本`, pickupMethod: 'PICKUP',
+    customerRemark: `${sample} 人工列表状态样本`, pickupMethod: 'SELF_EXPRESS',
    receivingWarehouseId: fixture.domestic.id, receivingWarehouseName: fixture.domestic.warehouseName,
    channelCode: fixture.channel.channelCode, channelName: fixture.channel.channelName,
    carrierId: null, carrierName: null, taxMode: 'BUY_DECLARATION',
@@ -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' }],