优化

lastleg-service/src/main/resources/application.yml

@@ -66,6 +66,9 @@ baiyue:
       pallet-physical:
         connect-timeout: ${LASTLEG_PALLET_PHYSICAL_CONNECT_TIMEOUT:3s}
         read-timeout: ${LASTLEG_PALLET_PHYSICAL_READ_TIMEOUT:5s}
+      domestic-loading-evidence:
+        connect-timeout: ${LASTLEG_DOMESTIC_LOADING_EVIDENCE_CONNECT_TIMEOUT:3s}
+        read-timeout: ${LASTLEG_DOMESTIC_LOADING_EVIDENCE_READ_TIMEOUT:30s}
   clients:
     print:
       url: ${PRINT_SERVICE_URL:}
@@ -74,6 +77,8 @@ baiyue:
       cache-ttl: ${DOMESTIC_WAREHOUSE_CACHE_TTL:30m}
     file:
       url: ${FILE_SERVICE_URL:http://127.0.0.1:9205}
+    domestic-file:
+      url: ${DOMESTIC_FILE_SERVICE_URL:http://127.0.0.1:9205}
     event-bridge:
       url: ${CN_EVENT_BRIDGE_URL:${FIRSTLEG_EVENT_BRIDGE_URL:}}
   firstleg:

lastleg-service/src/main/resources/db/lastleg.sql

@@ -2542,3 +2542,15 @@ CREATE TABLE IF NOT EXISTS ll_return_inventory_operation (
  id BIGINT NOT NULL COMMENT '退货库存PDA操作ID', operator_id VARCHAR(128) NOT NULL COMMENT 'PDA操作人ID', idempotency_key VARCHAR(255) NOT NULL COMMENT '操作幂等键', request_hash CHAR(64) NOT NULL COMMENT '请求内容SHA-256', operation_type VARCHAR(32) NOT NULL COMMENT '操作类型，当前MERGE', result_carton_id BIGINT NULL COMMENT '合箱结果退货库存箱ID', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间',
  PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_operation_operator_key(operator_id,idempotency_key), KEY idx_ll_return_inventory_operation_result(result_carton_id)
 ) ENGINE=InnoDB COMMENT='退货库存PDA合箱幂等操作审计';
+
+CREATE TABLE IF NOT EXISTS ll_container_loading_evidence (
+ id BIGINT NOT NULL COMMENT '海外整柜装柜照片投影ID',
+ source_container_booking_id VARCHAR(128) NOT NULL COMMENT '国内稳定来源柜预订ID',
+ evidence_type VARCHAR(32) NOT NULL COMMENT 'PHOTO_STEP_1至PHOTO_STEP_4或SEAL',
+ source_file_id BIGINT NOT NULL COMMENT '国内File服务文件ID',
+ file_name VARCHAR(255) NOT NULL COMMENT '国内文件名快照',
+ created_at DATETIME(3) NOT NULL COMMENT '投影创建时间',
+ PRIMARY KEY(id),
+ UNIQUE KEY uk_ll_container_loading_evidence_type(source_container_booking_id,evidence_type),
+ UNIQUE KEY uk_ll_container_loading_evidence_file(source_container_booking_id,source_file_id)
+) ENGINE=InnoDB COMMENT='海外拆柜只读国内装柜照片引用';

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -80,6 +80,22 @@ paths:
             application/octet-stream: { schema: { type: string, format: binary } }
         '403': { description: fileId 未绑定到当前操作员的当前柜会话三类签收照片 }
         '404': { description: 当前柜会话或照片不存在 }
+  /api/pda/v1/last-leg/receiving-containers/current/domestic-loading-photos/{evidenceType}/content:
+    get:
+      summary: 查看当前柜国内装柜照片
+      description: 权限 lastleg:pda:operate；只按当前操作员已锁定的物理柜读取国内装柜完成快照，不返回客户或内部文件ID，加载失败不改变拆柜状态。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: evidenceType, in: path, required: true, schema: { type: string, enum: [PHOTO_STEP_1, PHOTO_STEP_2, PHOTO_STEP_3, PHOTO_STEP_4, SEAL] } }
+      responses:
+        '200':
+          description: 国内装柜照片字节流；禁止缓存。
+          content:
+            image/jpeg: { schema: { type: string, format: binary } }
+            image/png: { schema: { type: string, format: binary } }
+            application/octet-stream: { schema: { type: string, format: binary } }
+        '404': { description: 当前柜或指定类型照片不存在 }
+        '503': { description: 国内照片服务暂不可用 }
   /api/pda/v1/last-leg/receiving-containers/current/sign:
     post:
       summary: 签收当前柜
@@ -434,7 +450,7 @@ paths:
   /api/platform/v1/last-leg/inbound-plans/manual:
     post:
       summary: 平台按单票手工生成入库计划
-      description: 权限 platform:overseas-warehouse:inbound-order:create；按 customerId 与 orderId 锁定单票，校验订单版本、状态、暂扣状态、真实入仓码、客户归属及有效公共接柜仓。一次只生成当前票的独立计划，不改变同柜其他订单；命令原子且幂等。
+      description: 权限 platform:overseas-warehouse:inbound-order:create；按 customerId 与 orderId 锁定单票，校验订单版本、状态、暂扣状态、真实入仓码、客户归属及有效公共接柜仓。预计到仓日期由服务端锁定读取来源柜全部订单的 estimatedWarehouseAt，缺失或同柜不一致时拒绝生成，不接受调用方提交。一次只生成当前票的独立计划，不改变同柜其他订单；命令原子且幂等。
       security: [{ bearerAuth: [] }]
       parameters:
         - { name: Idempotency-Key, in: header, required: true, schema: { type: string, minLength: 1, maxLength: 128 } }
@@ -446,7 +462,7 @@ paths:
       responses:
         '200': { description: 统一 ApiResponse 包装的入库计划详情 }
         '400': { description: 客户、入仓码、仓库主数据或请求字段无效 }
-        '409': { description: 订单版本、状态、暂扣状态、重复计划或幂等键冲突 }
+        '409': { description: 订单版本、状态、暂扣状态、柜级预计到仓时间、重复计划或幂等键冲突 }
   /api/platform/v1/last-leg/inbound-plans/convert-container:
     post:
       summary: 按整柜批量生成剩余入库计划
@@ -1941,7 +1957,7 @@ components:
         currentAccount: { type: boolean }
     ReceivingSession:
       type: object
-      required: [containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName, status, version, photos, totalPackages, receivedPackages, pendingPackages, hasDifference, inbounds]
+      required: [containerNo, overseasWarehouseId, overseasWarehouseCode, overseasWarehouseName, status, version, photos, domesticLoadingPhotos, totalPackages, receivedPackages, pendingPackages, hasDifference, inbounds]
       properties:
         containerNo: { type: string }
         overseasWarehouseId: { type: string, pattern: '^\d+$', description: 平台预分配并与PDA Token匹配的海外接柜仓ID }
@@ -1951,6 +1967,7 @@ components:
         operatorName: { type: string, nullable: true }
         version: { type: integer }
         photos: { type: array, maxItems: 3, items: { $ref: '#/components/schemas/ReceivingSignedSessionPhoto' } }
+        domesticLoadingPhotos: { type: array, maxItems: 5, items: { $ref: '#/components/schemas/DomesticLoadingPhoto' }, description: 当前物理柜国内装柜五类只读照片，不含客户信息与内部文件ID }
         preparedAt: { type: string, format: date-time, nullable: true }
         signedAt: { type: string, format: date-time, nullable: true }
         receivingAt: { type: string, format: date-time, nullable: true }
@@ -1968,6 +1985,13 @@ components:
         fileName: { type: string }
         contentType: { type: string }
         sizeBytes: { type: integer, format: int64 }
+    DomesticLoadingPhoto:
+      type: object
+      required: [evidenceType, label, downloadPath]
+      properties:
+        evidenceType: { type: string, enum: [PHOTO_STEP_1, PHOTO_STEP_2, PHOTO_STEP_3, PHOTO_STEP_4, SEAL] }
+        label: { type: string, enum: [空仓, 半仓, 满仓, 锁仓, 带锁码] }
+        downloadPath: { type: string, description: 当前接柜会话鉴权下载路径 }
     ReceivingCartonResolved:
       allOf:
         - { $ref: '#/components/schemas/ReceivingInbound' }
@@ -2606,13 +2630,12 @@ components:
           items: { $ref: '#/components/schemas/LastlegOrderManualNode' }
     ManualInboundPlanRequest:
       type: object
-      description: 单票人工计划只能使用所属柜已冻结的接柜仓；接柜仓变更必须通过柜级接口完成。
-      required: [customerId, orderId, expectedOrderVersion, plannedArrivalDate, palletCount, palletType, assigned, mergeRequired, urgent]
+      description: 单票人工计划只能使用所属柜已冻结的接柜仓；接柜仓变更必须通过柜级接口完成。预计到仓日期由服务端读取来源柜冻结的 estimatedWarehouseArrivalAt，同柜所有计划保持一致，不接受人工提交。
+      required: [customerId, orderId, expectedOrderVersion, palletCount, palletType, assigned, mergeRequired, urgent]
       properties:
         customerId: { type: string, pattern: '^[1-9][0-9]*$' }
         orderId: { type: integer, format: int64, minimum: 1 }
         expectedOrderVersion: { type: integer, minimum: 0 }
-        plannedArrivalDate: { type: string, format: date }
         palletCount: { type: integer, minimum: 1, maximum: 999 }
         palletType: { type: string, minLength: 1, maxLength: 64 }
         assigned: { type: boolean }