Merge branch 'test-01' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test-01

deploy/sql/2026-08-04-二期入库新增表字段-MySQL8一键执行.sql

@@ -515,6 +515,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_pallet_allocation (
   inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
   allocation_no INT UNSIGNED NOT NULL COMMENT '入库单内分配序号',
   warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务仓库ID',
+  warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '仓储资源所属租户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 '托盘可用容积快照',

firstleg/src/main/java/com/baiyue/firstleg/entity/InboundPalletAllocationEntity.java

@@ -20,6 +20,7 @@ public class InboundPalletAllocationEntity {
     private Long inboundId;
     private Integer allocationNo;
     private Long warehouseId;
+    private Long warehouseResourceTenantId;
     private Long palletId;
     private String palletCode;
     private BigDecimal palletCapacityCbm;

firstleg/src/main/java/com/baiyue/firstleg/repository/InboundPalletAllocationRepository.java

@@ -22,7 +22,8 @@ public class InboundPalletAllocationRepository {
     }
 
     @Transactional
-    public void replace(long tenantId, long inboundId, long warehouseId, BigDecimal capacity,
+    public void replace(long tenantId, long inboundId, long warehouseId, long warehouseResourceTenantId,
+                        BigDecimal capacity,
                         BatchResult result) {
         Map<Long, String> reservationNos = mapper.selectList(new LambdaQueryWrapper<InboundPalletAllocationEntity>()
                 .eq(InboundPalletAllocationEntity::getTenantId, tenantId)
@@ -39,6 +40,7 @@ public class InboundPalletAllocationRepository {
             value.setInboundId(inboundId);
             value.setAllocationNo(source.allocationNo());
             value.setWarehouseId(warehouseId);
+            value.setWarehouseResourceTenantId(warehouseResourceTenantId);
             value.setPalletId(source.palletId());
             value.setPalletCode(source.palletCode());
             value.setPalletCapacityCbm(capacity);

firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementLocationOccupationService.java

@@ -49,14 +49,14 @@ public class MeasurementLocationOccupationService {
                 properties.getDefaultPalletCapacityCbm(), "STANDARD",
                 LocalDateTime.now().plus(properties.getReservationTtl()), true))),
             "测量完成后库位预占失败");
-        allocations.replace(tenantId, inboundId, warehouseId,
+        allocations.replace(tenantId, inboundId, warehouseId, resourceTenantId,
             properties.getDefaultPalletCapacityCbm(), reserved);
         try {
             WarehousePalletLocationClient.BatchResult occupied = requireSuccess(call(() -> warehouse.confirm(
                 internalToken, new WarehousePalletLocationClient.ConfirmRequest(resourceTenantId, warehouseId,
                     SOURCE_SERVICE, inboundId, operatorId, volume,
                     properties.getDefaultPalletCapacityCbm()))), "测量完成后库位占用失败");
-            allocations.replace(tenantId, inboundId, warehouseId,
+            allocations.replace(tenantId, inboundId, warehouseId, resourceTenantId,
                 properties.getDefaultPalletCapacityCbm(), occupied);
         } catch (RuntimeException failure) {
             try {

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

@@ -423,6 +423,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_pallet_allocation (
   inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
   allocation_no INT UNSIGNED NOT NULL COMMENT '入库单内分配序号',
   warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务仓库ID',
+  warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '仓储资源所属租户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 '托盘可用容积快照',

firstleg/src/test/java/com/baiyue/firstleg/service/MeasurementLocationOccupationServiceTest.java

@@ -62,6 +62,7 @@ class MeasurementLocationOccupationServiceTest {
             org.mockito.ArgumentMatchers.eq(BUSINESS_TENANT),
             org.mockito.ArgumentMatchers.eq(INBOUND),
             org.mockito.ArgumentMatchers.eq(WAREHOUSE),
+            org.mockito.ArgumentMatchers.eq(RESOURCE_TENANT),
             org.mockito.ArgumentMatchers.eq(new BigDecimal("1.200000")),
             org.mockito.ArgumentMatchers.any());
     }
@@ -108,7 +109,7 @@ class MeasurementLocationOccupationServiceTest {
         verify(warehouse).release(org.mockito.ArgumentMatchers.eq("internal-token"), release.capture());
         assertThat(release.getValue().tenantId()).isEqualTo(RESOURCE_TENANT);
         assertThat(release.getValue().businessId()).isEqualTo(INBOUND);
-        verify(allocations).replace(BUSINESS_TENANT, INBOUND, WAREHOUSE,
+        verify(allocations).replace(BUSINESS_TENANT, INBOUND, WAREHOUSE, RESOURCE_TENANT,
             new BigDecimal("1.200000"), batch("RESERVED"));
     }