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

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -409,6 +409,7 @@ paths:
       description: >-
         需要 platform:firstleg:smart-loading:list 权限。每个入库单/入仓码只返回一行；
         平均单箱毛重、净重按整票实测重量除以总箱数，平均单箱体积按剩余规格数量加权。
+        响应携带订单状态快照 orderStatusSnapshot 与预计到货时间 expectedArrivalAt，供平台筛选候选入仓码；
         这些数据用于数量级计划，不表示具体箱号已核验归属。
       parameters:
         - {name: bookingId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1415,10 +1416,10 @@ components:
         measurementStatus: {type: string, nullable: true}
         inboundVersion: {type: integer, minimum: 0}
         version: {type: integer, minimum: 0, nullable: true}
-        originalDocumentNo: {type: string, nullable: true, description: 客户订单 referenceId 的服务端快照；旧空快照按订单事实回退}
-        originalGrossWeightKg: {type: number, format: double, nullable: true, description: 客户订单有效货物行 grossWeightKg 合计的服务端快照}
-        originalVolumeCbm: {type: number, format: double, nullable: true, description: 客户订单有效货物行 volumeCbm 合计的服务端快照}
-        originalPackageCount: {type: integer, nullable: true}
+        originalDocumentNo: {type: string, nullable: true, description: 测量批次开始时冻结的客户订单 referenceId；批次为空时才以最新申报回退}
+        originalGrossWeightKg: {type: number, format: double, nullable: true, description: 测量批次开始时冻结的客户申报毛重；不得被后续订单编辑覆盖}
+        originalVolumeCbm: {type: number, format: double, nullable: true, description: 测量批次开始时冻结的客户申报体积；不得被后续订单编辑覆盖}
+        originalPackageCount: {type: integer, nullable: true, description: 最新客户申报总箱数；仅用于与 actualPackageCount 对比}
         actualPackageCount: {type: integer, nullable: true}
         actualGrossWeightKg:
           type: number
@@ -1435,6 +1436,8 @@ components:
         actualVolumeCbm: {type: number, format: double, nullable: true}
         volumeWeightKg: {type: number, format: double, nullable: true}
         actualGoodsName: {type: string, nullable: true, description: 默认由客户货物品名去重汇总，测量阶段允许人工修正}
+        latestDeclaration:
+          $ref: '#/components/schemas/InboundMeasurementLatestDeclaration'
         items:
           type: array
           description: DIMENSION 尺寸测量明细及其图片证据
@@ -1443,6 +1446,31 @@ components:
           type: array
           description: WEIGHT 称重结果及其图片、确认状态和服务端重量事实
           items: {$ref: '#/components/schemas/InboundWeightResult'}
+    InboundMeasurementLatestDeclaration:
+      type: object
+      description: Order 服务中的最新客户申报只读视图；订单编辑只能改变本对象，不得覆盖箱码、实测尺寸/重量或审核结果
+      required: [totalPackageCount, items]
+      properties:
+        referenceId: {type: string, nullable: true}
+        totalPackageCount: {type: integer, minimum: 0}
+        grossWeightKg: {type: number, format: double, nullable: true}
+        volumeCbm: {type: number, format: double, nullable: true}
+        goodsName: {type: string, nullable: true}
+        items:
+          type: array
+          items: {$ref: '#/components/schemas/InboundMeasurementDeclarationItem'}
+    InboundMeasurementDeclarationItem:
+      type: object
+      description: 最新订单货物申报行；inboundDetailId 仅用于与实测明细关联，不作为用户展示编号
+      required: [inboundDetailId, itemNo, packageCount]
+      properties:
+        inboundDetailId: {type: string, pattern: '^[1-9][0-9]*$'}
+        itemNo: {type: integer, minimum: 1}
+        cargoName: {type: string, nullable: true}
+        packageCount: {type: integer, minimum: 0}
+        lengthCm: {type: number, format: double, nullable: true}
+        widthCm: {type: number, format: double, nullable: true}
+        heightCm: {type: number, format: double, nullable: true}
     InboundMeasurementSaveDraftRequest:
       type: object
       required: [version, items]