优化

firstleg/src/main/resources/db/phase2-inbound-schema.sql

@@ -714,22 +714,29 @@ CREATE TABLE IF NOT EXISTS fl_inbound_pallet_allocation (
   tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
   inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
   allocation_no INT UNSIGNED NOT NULL COMMENT '入库单内分配序号',
+  block_id BIGINT UNSIGNED NOT NULL COMMENT 'Warehouse整票连续库位块ID',
+  slot_no INT UNSIGNED NOT NULL COMMENT '连续块内稳定槽位序号',
+  weight_result_id BIGINT UNSIGNED NULL COMMENT '已绑定称重结果ID；预留空槽为空',
+  pallet_sequence INT UNSIGNED NULL COMMENT '已绑定称重托盘在整票内的稳定顺序；空槽为空',
   warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务仓库ID',
   warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '平台公共仓储资源固定使用 0；tenant_id 仍是客户隔离键',
-  pallet_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务托盘ID',
-  pallet_code VARCHAR(50) NOT NULL COMMENT '托盘编码快照',
-  pallet_capacity_cbm DECIMAL(18,4) NOT NULL COMMENT '托盘可用容积快照',
+  pallet_id BIGINT UNSIGNED NULL COMMENT '仓库服务托盘ID；预留空槽为空',
+  pallet_code VARCHAR(50) NULL COMMENT '托盘编码快照；预留空槽为空',
+  pallet_capacity_cbm DECIMAL(18,4) NULL COMMENT '托盘可用容积快照；预留空槽为空',
   allocated_volume_cbm DECIMAL(18,4) NOT NULL COMMENT '本托盘分配体积',
   allocated_package_count INT UNSIGNED NULL COMMENT '本托盘分配箱数',
   location_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务库位ID',
   location_code VARCHAR(50) NOT NULL COMMENT '库位编码快照',
-  reservation_id BIGINT UNSIGNED NULL COMMENT '仓库预占资源唯一ID，A0共享场景用于区分托盘',
-  reservation_no VARCHAR(64) NOT NULL COMMENT '仓库库位预占单号',
+  shared_overflow TINYINT(1) NOT NULL DEFAULT 0 COMMENT '普通连续位不足时是否使用共享A0',
+  reservation_id BIGINT UNSIGNED NOT NULL COMMENT '仓库预占资源唯一ID，A0共享场景用于区分槽位',
+  slot_status VARCHAR(24) NOT NULL DEFAULT 'RESERVED_EMPTY' COMMENT '槽位状态：RESERVED_EMPTY、BOUND、TRANSFERRED、RELEASED',
   allocation_status VARCHAR(24) NOT NULL DEFAULT 'RESERVED' COMMENT '托盘库位分配状态：RESERVED已预占、CONFIRMED已确认、TRANSFERRED已转移、RELEASED已释放',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
   updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
   PRIMARY KEY (id),
   UNIQUE KEY uk_pallet_allocation_no (tenant_id, inbound_id, allocation_no),
+  UNIQUE KEY uk_pallet_allocation_slot (tenant_id, block_id, slot_no),
+  UNIQUE KEY uk_pallet_allocation_weight (tenant_id, weight_result_id),
   KEY idx_allocation_location (tenant_id, warehouse_id, location_id, allocation_status),
   KEY idx_allocation_reservation (reservation_id),
   CONSTRAINT fk_allocation_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)

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

@@ -1047,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]*$'}}
@@ -1622,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
@@ -1716,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 服务中的最新客户申报只读视图；订单编辑只能改变本对象，不得覆盖箱码、实测尺寸/重量或审核结果

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

@@ -275,10 +275,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: