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

# Conflicts:
#	order/AGENTS.md

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

@@ -466,7 +466,8 @@ paths:
       description: >-
         需要 platform:firstleg:smart-loading:list 权限。渠道目录只来自平台当前唯一 ACTIVE 价格版本中
         对该国内仓存在 ACTIVE 价格行的渠道；候选入仓码数、可用箱数及可编排柜次数由 Firstleg 当前事实聚合。
-        零候选或零可用柜次的有效渠道仍返回，Admin 可展示空态；实际分配仍由服务端重新校验仓库、渠道和资格。
+        零候选或零可用柜次的有效渠道仍返回，Admin 可展示空态。渠道只约束智能推荐；人工加入允许跨渠道，
+        仍由服务端重新校验国内仓、客户范围、占用、同柜组、箱数和容量资格。
       parameters:
         - {name: warehouseId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
       responses:
@@ -493,7 +494,7 @@ paths:
         LOADING 全部未完成状态，已完成装柜永不返回。状态映射为：Order SUBMITTED=PENDING_REVIEW；
         Firstleg WAIT_MEASURE/MEASURING/MEASURE_PENDING/MEASURE_REJECTED/WAIT_PRICING/FEE_CONFIRMING/INBOUNDING
         =WAIT_MEASURE；WAIT_SPLIT=WAIT_SPLIT；LOADING=LOADING。状态只用于搜索和展示，canAssign 由有效柜次占用、
-        剩余箱数、同柜组、仓库、渠道和容量等事实决定；容积和重量均允许达到柜型额定值的150%，超过即拒绝。
+        剩余箱数、同柜组、仓库和容量等事实决定；容积和重量均允许达到柜型额定值的150%，超过即拒绝。
         待审核及待测量可以先加入清单；确认预装/PDA 前
         仍必须完成审核与测量并进入 WAIT_SPLIT。同柜不可拆组仅在全部成员命中当前状态集合时作为一个分页单位返回。
       parameters:
@@ -597,7 +598,8 @@ paths:
       summary: 向预装计划新增入库单明细
       description: >-
         EDITING 或 LOADING 且 PDA task 尚未完成时可用。服务端按 planId 锁定同一 PDA task，
-        校验仓库、渠道、客户范围、可用箱数、容积和限重后原子新增/累加明细；LOADING 时同步到原 taskId，
+        校验仓库、客户范围、可用箱数、容积和限重后原子新增/累加明细；人工加入允许订单渠道与柜次渠道不同，
+        智能推荐仍只选择柜次渠道。LOADING 时同步到原 taskId，
         递增 planVersion、taskVersion，原 inventorySnapshotToken 随即失效。与 PDA batch/final complete 并发时，
         锁顺序为 PDA task 行锁 -> plan 乐观锁；仅先取得任务锁且持有匹配版本的一方成功，另一方返回 A0409。
         PDA 应重新 GET task detail 与 inventory snapshot，Admin 应重新 GET SmartLoadingPlan。新增项沿用原 taskId、
@@ -616,6 +618,7 @@ paths:
       description: >-
         需要 platform:firstleg:smart-loading:assign 权限。操作员只选择某个入仓码的本次计划箱数；
         服务端在单一事务内按剩余规格箱数比例生成内部规格快照，用于体积估算及兼容 PDA/拆单；
+        人工分配不限制订单渠道与柜次渠道一致，渠道只约束智能推荐；国内仓、占用、同柜组和容量门禁不变。
         柜内总容积和总重量分别允许达到柜型额定值的150%，超过即拒绝。
         只记录数量计划，具体实装箱号归属为 UNVERIFIED，不得将内部比例分摊宣称为现场箱号事实。
       parameters:
@@ -631,7 +634,8 @@ paths:
       description: >-
         需要 platform:firstleg:smart-loading:assign 权限。订单审核状态不作为清单占位门禁；服务端以
         customerId + orderId + inboundCode 重新核验 Order 权威待审核事实，幂等创建或复用 PREPARING
-        入仓投影，并按订单申报箱数、重量和体积建立柜次占位。已被其他有效柜次占用、仓库/渠道不一致、
+        入仓投影，并按订单申报箱数、重量和体积建立柜次占位。人工分配允许订单渠道与柜次渠道不同；
+        已被其他有效柜次占用、国内仓不一致、
         超容量或订单事实变化返回业务冲突且事务零漂移。清单中存在 PREPARING/WAIT_MEASURE 订单时不得
         确认预装或启动 PDA，审核测量完成并进入 WAIT_SPLIT 后才可继续物理装柜。
       parameters:
@@ -670,6 +674,20 @@ paths:
         content: {application/json: {schema: {$ref: '#/components/schemas/SmartLoadingDeleteRequest'}}}
       responses:
         '200': {description: 成功或业务失败，data 为最新 SmartLoadingPlan}
+  /api/platform/v1/first-leg/smart-loading/plans/{planId}/unpicked-items:
+    delete:
+      summary: 一次性移除当前计划全部未拣明细
+      description: >-
+        需要 platform:firstleg:smart-loading:delete 权限。单次请求、单事务锁定计划与 PDA task，移除全部
+        pickedPackageCount=0 的普通入仓码；同柜不可拆组只在组内所有明细均未拣时整组移除，任一成员已拣则整组保留。
+        planVersion 只递增一次；并发版本变化或任一步失败均整体回滚。同 operationId 重放返回既有结果。
+      parameters:
+        - {name: planId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content: {application/json: {schema: {$ref: '#/components/schemas/SmartLoadingRemoveUnpickedRequest'}}}
+      responses:
+        '200': {description: 成功或业务失败，data 为最新 SmartLoadingPlan}
   /api/platform/v1/first-leg/smart-loading/plans/{planId}/items/{itemId}/warehouse-remark:
     patch:
       summary: 修改装柜明细仓库备注
@@ -1029,6 +1047,7 @@ paths:
       summary: 删除称重图片及重量结果
       description: >-
         需要 platform:firstleg:inbound:weight:edit 权限；仅允许在可编辑的测量状态删除。
+        已绑定图片先将对应槽恢复为 RESERVED_EMPTY，整票块仍归当前入仓码；解绑或文件删除失败时事务失败。
         删除已确认图片后由生产者分别重算剩余确认称重的毛重、净重；消费端不得用净重填充毛重。
       parameters:
         - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1604,6 +1623,14 @@ components:
         adjustedAt: {type: string, format: date-time, nullable: true}
         confirmedBy: {type: string, nullable: true}
         confirmedAt: {type: string, format: date-time, nullable: true}
+        palletSequence: {type: integer, minimum: 1, nullable: true, description: 已绑定称重托盘在整票内的稳定顺序；未绑定槽位时为空}
+        blockId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: Warehouse 整票连续库位块标识}
+        slotNo: {type: integer, minimum: 1, nullable: true, description: 整票连续块内的稳定槽位序号}
+        reservationId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: Warehouse 预占资源唯一标识；A0 共享时仍按此字段区分}
+        locationId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: Warehouse 库位标识}
+        locationCode: {type: string, nullable: true, description: 库位业务编码，例如 A01 或 A0}
+        sharedOverflow: {type: boolean, nullable: true, description: 是否因普通连续位不足而使用共享 A0}
+        slotStatus: {type: string, enum: [RESERVED_EMPTY, BOUND, TRANSFERRED, RELEASED], nullable: true, description: 当前整票槽位状态}
         version: {type: integer, minimum: 0}
     InboundMeasurementItem:
       type: object
@@ -1698,6 +1725,38 @@ components:
           type: array
           description: WEIGHT 称重结果及其图片、确认状态和服务端重量事实
           items: {$ref: '#/components/schemas/InboundWeightResult'}
+        palletLocationGuide:
+          allOf: [{$ref: '#/components/schemas/InboundPalletLocationGuide'}]
+          nullable: true
+          description: 服务端权威的整票上架引导；尚未预留库位时为空，禁止由 weightResults 数量或数组下标推导
+    InboundPalletLocationGuide:
+      type: object
+      required: [blockId, reservedSlotCount, actualPalletCount, reservedEmptySlotCount, slots]
+      properties:
+        blockId: {type: string, pattern: '^[1-9][0-9]*$', description: Warehouse 整票连续库位块标识}
+        reservedSlotCount: {type: integer, minimum: 1, description: 整票当前预留槽位总数，等于 slots 长度}
+        actualPalletCount: {type: integer, minimum: 0, description: 已绑定称重结果的实际托数}
+        reservedEmptySlotCount: {type: integer, minimum: 0, description: slotStatus=RESERVED_EMPTY 的预留空位数}
+        slots:
+          type: array
+          minItems: 1
+          maxItems: 200
+          description: 严格按 slotNo 升序返回的整票槽位
+          items: {$ref: '#/components/schemas/InboundPalletLocationSlot'}
+    InboundPalletLocationSlot:
+      type: object
+      required: [slotNo, reservationId, locationId, locationCode, sharedOverflow, slotStatus]
+      properties:
+        slotNo: {type: integer, minimum: 1}
+        reservationId: {type: string, pattern: '^[1-9][0-9]*$'}
+        locationId: {type: string, pattern: '^[1-9][0-9]*$'}
+        locationCode: {type: string}
+        sharedOverflow: {type: boolean}
+        slotStatus: {type: string, enum: [RESERVED_EMPTY, BOUND, TRANSFERRED, RELEASED]}
+        boundWeightResultId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        palletSequence: {type: integer, minimum: 1, nullable: true}
+        palletId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        palletCode: {type: string, nullable: true}
     InboundMeasurementLatestDeclaration:
       type: object
       description: Order 服务中的最新客户申报只读视图；订单编辑只能改变本对象，不得覆盖箱码、实测尺寸/重量或审核结果
@@ -1956,6 +2015,12 @@ components:
         expectedPlanVersion: {type: integer, minimum: 0}
         expectedItemVersion: {type: integer, minimum: 0}
         operationId: {type: string, minLength: 1, maxLength: 128}
+    SmartLoadingRemoveUnpickedRequest:
+      type: object
+      required: [expectedPlanVersion, operationId]
+      properties:
+        expectedPlanVersion: {type: integer, minimum: 0}
+        operationId: {type: string, minLength: 1, maxLength: 128}
     SmartLoadingWarehouseRemarkRequest:
       type: object
       required: [expectedPlanVersion, expectedItemVersion, operationId]

firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml

@@ -368,10 +368,6 @@ components:
         action: {type: string, enum: [PICK, PARTIAL, SKIP]}
         pickedPackageCount: {type: integer, minimum: 1, description: Incremental count required by PICK}
         finalPickedPackageCount: {type: integer, minimum: 1, description: Final actual count required by PARTIAL}
-        releaseMode: {type: string, enum: [AUTO, MANUAL]}
-        reservationIds:
-          type: array
-          items: {type: integer, format: int64, minimum: 1}
         version: {type: integer, minimum: 0}
         reason: {type: string, maxLength: 500, description: Required by SKIP}
     ReviewRequest: