暂扣 标记合托功能

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

@@ -179,6 +179,25 @@ paths:
       responses:
         '200': { description: 新增后的费用明细, content: { application/json: { schema: { $ref: '#/components/schemas/LastMileFeeApiResponse' } } } }
         '404': { description: 尾程订单不存在或不属于操作客户 }
+  /api/platform/v1/last-leg/orders/{id}/pallet-merge-required:
+    put:
+      summary: 设置尾程订单合托标记
+      description: 权限 platform:overseas-warehouse:last-mile-order:edit；标记后，PDA扫描本单箱唛并解析入仓单时返回合托提示；实际完成合托后不可取消。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: id, in: path, required: true, schema: { type: integer, format: int64 } }
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required: [palletMergeRequired]
+              properties: { palletMergeRequired: { type: boolean } }
+      responses:
+        '200': { description: 合托标记已更新 }
+        '404': { description: 尾程订单不存在或不属于操作客户 }
+        '409': { description: 入仓已完成或实际合托已完成，不能修改标记 }
   /api/platform/v1/last-leg/dispatches:
     get:
       summary: 分页查询排车单
@@ -729,7 +748,7 @@ components:
         timestamp: { type: string, format: date-time }
     ReceivingInbound:
       type: object
-      required: [inboundCode, destinationType, plannedPalletCount, totalPackages, receivedPackages, pendingPackages]
+      required: [inboundCode, destinationType, plannedPalletCount, totalPackages, receivedPackages, pendingPackages, palletMergeRequired]
       properties:
         inboundCode: { type: string }
         destinationType: { type: string, enum: [FBA, OVERSEAS] }
@@ -743,6 +762,8 @@ components:
         totalPackages: { type: integer }
         receivedPackages: { type: integer }
         pendingPackages: { type: integer }
+        palletMergeRequired: { type: boolean, description: 尾程订单是否要求PDA合托提醒 }
+        palletMergeHint: { type: string, nullable: true, description: 标记合托时供PDA直接展示的中文提示 }
     ReceivingWarehouseProfile:
       type: object
       required: [warehouseId, warehouseCode, warehouseName]
@@ -810,7 +831,7 @@ components:
         compatible: { type: boolean }
     ReceivingReceipt:
       type: object
-      required: [result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages, receivedPackages, pendingPackages, sessionStatus]
+      required: [result, containerNo, inboundCode, destinationType, palletCode, acceptedPackages, receivedPackages, pendingPackages, sessionStatus, palletMergeRequired]
       properties:
         result: { type: string }
         containerNo: { type: string }
@@ -821,6 +842,8 @@ components:
         receivedPackages: { type: integer }
         pendingPackages: { type: integer }
         sessionStatus: { type: string, enum: [SIGNED, RECEIVING] }
+        palletMergeRequired: { type: boolean }
+        palletMergeHint: { type: string, nullable: true }
     ReceivingCandidateListApiResponse:
       allOf:
         - { $ref: '#/components/schemas/ReceivingApiResponseBase' }