修改提交

lastleg-service/src/test/java/com/baiyue/lastleg/inventory/InventorySchemaContractTest.java

@@ -28,7 +28,7 @@ class InventorySchemaContractTest {
         }
 
         assertTrue(schema.contains("create table if not exists ll_inventory_balance"));
-        assertTrue(schema.contains("unique key uk_ll_inventory_dimension (customer_id,overseas_warehouse_id,destination_warehouse_code,inbound_order_id,inbound_code,sku_code)"));
+        assertTrue(schema.contains("unique key uk_ll_inventory_dimension (customer_id,overseas_warehouse_id,destination_warehouse_code,inbound_order_id,inbound_code)"));
         assertTrue(schema.contains("inbound_order_id bigint not null"));
         assertTrue(schema.contains("inbound_code varchar(128) not null"));
         assertTrue(schema.contains("available_packages bigint not null default 0"));
@@ -89,6 +89,9 @@ class InventorySchemaContractTest {
         assertTrue(migration.contains("alter table ll_inventory_ledger add column inbound_order_id"));
         assertTrue(migration.contains("update ll_inventory_ledger"));
         assertTrue(migration.contains("alter table ll_dispatch_order add column partial_completion_reason"));
+        assertTrue(migration.contains("2026-08-22 / 030"));
+        assertTrue(migration.contains("drop index uk_ll_inventory_dimension"));
+        assertTrue(migration.contains("customer_id,overseas_warehouse_id,destination_warehouse_code,inbound_order_id,inbound_code)"));
         assertFalse(migration.contains("drop column sku_code"));
         assertFalse(migration.contains("drop column product_quantity"));
     }

lastleg-service/src/test/java/com/baiyue/lastleg/inventory/command/InventoryCommandServiceTest.java

@@ -63,7 +63,7 @@ class InventoryCommandServiceTest {
     void stockInUpdatesBalancePositionAndLedgerInOneTransaction() throws Exception {
         assertTrue(InventoryCommandService.class.getMethod("stockIn", String.class, String.class,
             InventoryCommandRequests.StockIn.class).getAnnotation(Transactional.class) != null);
-        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(null);
         var result = service.stockIn("100", "7", stockIn("IN-1", "stock-in-1", 12, 24));
 
         assertEquals(12, result.availablePackages());
@@ -79,7 +79,7 @@ class InventoryCommandServiceTest {
 
     @Test
     void registersInTransitWithoutCreatingAPalletPosition() {
-        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(null);
 
         InventoryCommandResponse result = service.registerInTransit("100", "SYSTEM", inTransit("transit-1", 12));
 
@@ -95,8 +95,9 @@ class InventoryCommandServiceTest {
     @Test
     void stockInTransfersPackagesFromInTransitToAvailable() {
         InventoryBalance balance = balance(200L, 0);
+        balance.setSkuCode("SKU-1");
         balance.setInTransitPackages(12L);
-        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(balance);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(balance);
 
         InventoryCommandResponse result = service.stockIn("100", "7", stockIn("IN-1", "stock-in-transit", 12, 24));
 
@@ -105,9 +106,28 @@ class InventoryCommandServiceTest {
         assertEquals(12L, balance.getAvailablePackages());
     }
 
+    @Test
+    void differentSkusShareInboundBalanceAndKeepSkuInLedger() {
+        InventoryBalance balance = balance(200L, 4);
+        balance.setSkuCode("SKU-1");
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(balance);
+        InventoryCommandRequests.StockIn request = new InventoryCommandRequests.StockIn(
+            "100", "Customer 100", "WH-1", "WH1", "Warehouse 1", "DEST-1", "ONT8", "ONT8",
+            101L, "IN-1", "IN-CODE-1", "SKU-2", "Product 2", null, 300L, "PLT-1", null,
+            null, null, 3, "ORD-1", "EVT-1", "stock-in-sku-2", null);
+
+        service.stockIn("100", "7", request);
+
+        assertEquals("MIXED", balance.getSkuCode());
+        assertEquals(7L, balance.getAvailablePackages());
+        ArgumentCaptor<InventoryLedger> ledger = ArgumentCaptor.forClass(InventoryLedger.class);
+        verify(ledgers).insert(ledger.capture());
+        assertEquals("SKU-2", ledger.getValue().getSkuCode());
+    }
+
     @Test
     void stockInAllowsPalletPositionWithZeroOptionalPackages() {
-        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(null);
 
         var result = service.stockIn("100", "7", stockIn("IN-1", "stock-in-zero", 0, 0));
 
@@ -133,7 +153,7 @@ class InventoryCommandServiceTest {
     @Test
     void replayUsesPersistedResultWithoutMutatingInventoryAgain() throws Exception {
         var request = stockIn("IN-1", "stock-in-1", 12, 24);
-        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(null);
         service.stockIn("100", "7", request);
         ArgumentCaptor<InventoryOperation> operation = ArgumentCaptor.forClass(InventoryOperation.class);
         verify(operations).insert(operation.capture());