Merge origin/dev and resolve backend conflicts

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

@@ -46,6 +46,14 @@ paths:
       description: 一件代发复用统一出库任务模型；不接收customerId或warehouseId，派送不进入PDA。
       parameters: [{ name: status, in: query, required: false, schema: { type: string } }]
       responses: { '200': { description: 出库任务列表 } }
+  /api/pda/v1/last-leg/outbound-tasks/resolve/{businessNo}:
+    get:
+      summary: 解析出库作业扫码业务号
+      description: 接受一件代发任务号、出库单号或排车单号；按Token绑定仓返回 OUTBOUND 的 taskNo 或 DISPATCH 的 dispatchNo，PDA据此进入正确作业页。
+      parameters: [{ name: businessNo, in: path, required: true, schema: { type: string } }]
+      responses:
+        '200': { description: 正确作业类型及稳定业务编号 }
+        '404': { description: 当前绑定仓无此出库或排车任务 }
   /api/pda/v1/last-leg/outbound-tasks/{taskNo}:
     get:
       summary: 查询一件代发出库任务详情
@@ -581,7 +589,7 @@ components:
             required: [outboundPalletItemId, palletNo, skuCode, inboundCode, packageCount, pickedPackageCount, status, positions]
             properties:
               outboundPalletItemId: { type: string, description: pick请求提交键，不作为用户展示编号 }
-              palletNo: { type: string }
+              palletNo: { type: string, description: Warehouse 权威实物托盘码 }
               skuCode: { type: string }
               inboundCode: { type: string }
               packageCount: { type: integer }
@@ -594,7 +602,7 @@ components:
                   required: [inventoryPositionId, palletNo, cartonMark, skuCode, inboundCode, availablePackages, pickedPackages]
                   properties:
                     inventoryPositionId: { type: string, description: pick请求提交键，不作为用户展示编号 }
-                    palletNo: { type: string }
+                    palletNo: { type: string, description: Warehouse 权威实物托盘码 }
                     cartonMark: { type: string, nullable: true }
                     skuCode: { type: string }
                     inboundCode: { type: string }