Merge branch 'test' into test-02huogui

# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java
#	firstleg/src/main/resources/application.yml
#	firstleg/src/main/resources/openapi/fba-pricing-v1.yaml
#	firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java
#	order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java
#	order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java

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

@@ -6,10 +6,55 @@ info:
 security:
   - bearerAuth: []
 paths:
+  /internal/firstleg/v1/customer-dimension-configs/defaults:
+    post:
+      summary: 幂等初始化客户尺寸计算默认配置
+      description: 仅供 IAM 在客户创建或注册成功编排中调用；同一客户和 initializationKey 重试稳定返回 createdByThisInitialization=true。
+      security:
+        - internalServiceToken: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/CustomerDimensionConfigInitializeRequest'}
+      responses:
+        '200': {description: 成功或业务失败，data 返回 configId 和 createdByThisInitialization}
+    delete:
+      summary: 补偿删除本次新建且尚未修改的默认配置
+      description: 仅供 IAM 创建客户事务补偿使用；同时匹配 initializationKey、默认2cm和version=0才物理删除。
+      security:
+        - internalServiceToken: []
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: initializationKey, in: query, required: true, schema: {type: string, minLength: 1, maxLength: 128}}
+      responses:
+        '200': {description: 幂等补偿完成}
+  /api/platform/v1/first-leg/customer-dimension-config:
+    get:
+      summary: 查询客户尺寸计算配置
+      description: 需要 firstleg:dimension-config:view 权限；配置只描述真实尺寸的每侧加宽值，当前不参与订单或计费。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      responses:
+        '200': {description: 成功时 data 为 CustomerDimensionConfigResponse}
+        '403': {description: 无查询权限}
+    put:
+      summary: 编辑客户尺寸计算配置
+      description: 需要 firstleg:dimension-config:edit 权限；使用 version 执行乐观锁更新。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/CustomerDimensionConfigUpdateRequest'}
+      responses:
+        '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigResponse}
+        '403': {description: 无编辑权限}
   /internal/firstleg/v1/inbounds/order-approved:
     post:
       summary: 订单审核通过后幂等创建入库单
-      description: 仅供订单服务调用；入仓码由订单提交时生成，Firstleg 必须原样沿用。承运商可在后续履约或计费前补充。
+      description: 仅供订单服务调用；入仓码由订单提交时生成，Firstleg 必须原样沿用。
       security:
         - internalServiceToken: []
       requestBody:
@@ -174,7 +219,9 @@ paths:
         签名body的 SHA-256 小写十六进制，六部分使用 LF（\n）连接且末尾不追加换行。
         签名body = data原始UTF-8文本 + LF + image文件内容SHA-256小写十六进制。
         三层语义：Nonce 防短时重放；Idempotency-Key 标识一次 HTTP 写操作；
-        appKey + eventNo 标识第三方业务事件。
+        appKey + eventNo 标识第三方业务事件。多台设备可共用同一 appKey/secret，
+        但 deviceCode、eventNo 和 Idempotency-Key 必须由调用方生成全局唯一值，
+        不得仅在单台设备内从 1 开始递增。
       security:
         - measurementAppKey: []
           measurementTimestamp: []
@@ -245,6 +292,86 @@ paths:
       responses:
         '200': {description: 成功或业务失败，按响应体 code 判断}
         '403': {description: 无查看权限}
+  /api/platform/inbounds/{inboundId}/carton-label-pdf:
+    post:
+      summary: 生成或补打入仓箱唛 PDF
+      description: 需要 platform:firstleg:inbound:view 权限；首次打印冻结整单箱号，重复打印和部分补打复用原映射。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - name: cartonIndex
+          in: query
+          required: false
+          style: form
+          explode: true
+          schema: {type: array, items: {type: integer, minimum: 1}}
+          description: 不传时打印整单；可重复传入以部分补打指定箱下标。
+      responses:
+        '200':
+          description: 成功返回 PDF；业务失败返回统一 JSON 响应，调用方必须按 Content-Type 区分。
+          content:
+            application/pdf: {schema: {type: string, format: binary}}
+            application/json:
+              schema:
+                type: object
+                required: [code, message]
+                properties:
+                  code: {type: string}
+                  message: {type: string}
+                  requestId: {type: string, nullable: true}
+                  traceId: {type: string, nullable: true}
+        '403': {description: 无查看权限}
+  /api/platform/v1/first-leg/inbounds/{inboundId}/measurement/carton-scans:
+    post:
+      summary: 平台模拟单箱设备扫描
+      description: >-
+        需要 platform:firstleg:inbound:measure:edit 权限；仅用于平台联调和代设备录入，
+        复用正式单箱覆盖规则，不代表最终第三方设备协议或鉴权方式。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              required: [data, image]
+              properties:
+                data:
+                  type: object
+                  required: [boxCode, length, width, height, machineNo, measuredAt]
+                  properties:
+                    boxCode: {type: string, maxLength: 128}
+                    length: {type: number, format: double, minimum: 0.001}
+                    width: {type: number, format: double, minimum: 0.001}
+                    height: {type: number, format: double, minimum: 0.001}
+                    weight: {type: number, format: double, minimum: 0.001, nullable: true}
+                    machineNo: {type: string, maxLength: 64}
+                    measuredAt: {type: string, format: date-time}
+                image: {type: string, format: binary}
+      responses:
+        '200': {description: 成功或业务失败，按响应体 code 判断}
+        '403': {description: 无测量编辑权限}
+  /api/platform/v1/first-leg/inbounds/{inboundId}/weight-results/{resultId}/confirm:
+    post:
+      summary: 确认 OCR 重量
+      description: >-
+        需要 platform:firstleg:inbound:weight:confirm 权限；携带人工修改字段时还需要
+        platform:firstleg:inbound:weight:edit 权限。修改与确认在同一事务内完成，保留 OCR 原值，
+        分别写入 CORRECT 和 CONFIRM 修订记录，并重算所有已确认图片的实际总毛重。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: resultId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/ConfirmWeightResultRequest'}
+      responses:
+        '200': {description: 成功或业务失败，按响应体 code 判断}
+        '403': {description: 无确认权限，或修改重量时无编辑权限}
   /api/platform/v1/inbounds/{inboundId}/measurements/approve:
     post:
       summary: 审核通过测量
@@ -365,6 +492,52 @@ components:
       required: true
       schema: {type: string, pattern: '^[1-9][0-9]*$'}
   schemas:
+    CustomerDimensionConfigUpdateRequest:
+      type: object
+      required: [edgeAdditionCm, version]
+      properties:
+        edgeAdditionCm:
+          type: number
+          minimum: 0.001
+          maximum: 100
+          multipleOf: 0.001
+          description: 真实长、宽、高三个方向分别使用的每侧加宽厘米数
+          example: 2.000
+        remark: {type: string, maxLength: 500, nullable: true}
+        version: {type: integer, minimum: 0, description: 乐观锁版本号}
+    CustomerDimensionConfigResponse:
+      type: object
+      required: [id, tenantId, edgeAdditionCm, version]
+      properties:
+        id: {type: string, pattern: '^[1-9][0-9]*$'}
+        tenantId: {type: string, pattern: '^[1-9][0-9]*$'}
+        edgeAdditionCm: {type: number, minimum: 0.001, maximum: 100, example: 2.000}
+        remark: {type: string, nullable: true}
+        version: {type: integer, minimum: 0}
+        createdAt: {type: string, format: date-time, nullable: true}
+        updatedAt: {type: string, format: date-time, nullable: true}
+    CustomerDimensionConfigInitializeRequest:
+      type: object
+      required: [tenantId, operatorId, initializationKey]
+      properties:
+        tenantId: {type: string, pattern: '^[1-9][0-9]*$'}
+        operatorId: {type: string, pattern: '^[0-9]+$'}
+        initializationKey: {type: string, minLength: 1, maxLength: 128}
+    CustomerDimensionConfigInitializeResponse:
+      type: object
+      required: [configId, createdByThisInitialization]
+      properties:
+        configId: {type: string, pattern: '^[1-9][0-9]*$'}
+        createdByThisInitialization: {type: boolean}
+    ConfirmWeightResultRequest:
+      type: object
+      required: [version]
+      description: 人工修改字段必须同时提供；全部省略时直接确认现有 OCR 或已修正重量。
+      properties:
+        version: {type: integer, minimum: 0}
+        adjustedWeightValue: {type: number, format: double, minimum: 0.001, nullable: true}
+        adjustedWeightUnit: {type: string, enum: [KG, LB], nullable: true}
+        adjustmentReason: {type: string, minLength: 1, maxLength: 500, nullable: true}
     OrderApprovedInboundCommand:
       type: object
       required: [tenantId, orderId, inboundCode, customerName, warehouseId]
@@ -383,9 +556,10 @@ components:
         businessType: {type: string, nullable: true}
         channelCode: {type: string, nullable: true}
         channelName: {type: string, nullable: true}
-        carrierId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: 可选，可在后续履约或计费前补充}
+        carrierId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: 历史兼容的内部运输供应商快照}
         carrierName: {type: string, nullable: true}
         taxMode: {type: string, nullable: true}
+        pricingTaxMode: {type: string, enum: [TAX_INCLUDED, TAX_EXCLUDED], nullable: true, description: 报价包税维度；独立于订单taxMode}
         containerMode: {type: string, nullable: true}
         customsInspection: {type: boolean, nullable: true}
         destinationType: {type: string, nullable: true}
@@ -571,6 +745,8 @@ components:
         processStatus: {type: string}
         customerId: {type: string, nullable: true}
         companyId: {type: string, nullable: true}
+        taxMode: {type: string, nullable: true, description: 订单报关方式快照}
+        pricingTaxMode: {type: string, enum: [TAX_INCLUDED, TAX_EXCLUDED], nullable: true, description: 下单时选择的报价包税维度快照}
     InboundMeasurementCallbackRequest:
       type: object
       required: [eventNo, externalDetailNo, warehouseCode, inboundCode, inboundDetailId, deviceCode, measuredAt, boxSpecification, packageCount, lengthCm, widthCm, heightCm]