优化

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

@@ -28,12 +28,13 @@ 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)"));
+        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("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"));
         assertTrue(schema.contains("in_transit_packages bigint not null default 0"));
-        assertFalse(tableDefinition(schema, "ll_inventory_balance").contains("sku_code"));
+        assertTrue(tableDefinition(schema, "ll_inventory_balance").contains("sku_code"));
+        assertTrue(tableDefinition(schema, "ll_inventory_balance").contains("product_name_zh"));
         assertFalse(tableDefinition(schema, "ll_inventory_balance").contains("_quantity"));
         assertTrue(schema.contains("create table if not exists ll_inventory_position"));
         assertTrue(schema.contains("unique key uk_ll_inventory_position (balance_id,pallet_id,batch_no)"));
@@ -52,7 +53,7 @@ class InventorySchemaContractTest {
         assertTrue(schema.contains("unique key uk_ll_inventory_ledger_idempotency (customer_id,idempotency_key)"));
         assertTrue(schema.contains("create table if not exists ll_inventory_operation"));
         assertTrue(schema.contains("create table if not exists ll_inbound_stock_receipt"));
-        assertTrue(schema.contains("unique key uk_ll_stock_receipt_task_allocation (customer_id,task_id,allocation_id)"));
+        assertTrue(schema.contains("unique key uk_ll_stock_receipt_task_allocation_sku (customer_id,task_id,allocation_id,sku_code)"));
         assertFalse(tableDefinition(schema, "ll_inventory_ledger").contains("updated_at"));
     }
 
@@ -97,7 +98,8 @@ class InventorySchemaContractTest {
         assertNotNull(InventoryBalance.class.getDeclaredField("inboundOrderId"));
         assertNotNull(InventoryBalance.class.getDeclaredField("inboundCode"));
         assertNotNull(InventoryLedger.class.getDeclaredField("inboundOrderId"));
-        assertThrowsNoField(InventoryBalance.class, "skuCode");
+        assertNotNull(InventoryBalance.class.getDeclaredField("skuCode"));
+        assertNotNull(InventoryBalance.class.getDeclaredField("productNameZh"));
         assertThrowsNoField(InventoryBalance.class, "availableQuantity");
         assertThrowsNoField(InventoryPosition.class, "skuCode");
         assertThrowsNoField(InventoryPosition.class, "productQuantity");

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")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
         var result = service.stockIn("100", "7", stockIn("IN-1", "stock-in-1", 12, 24));
 
         assertEquals(12, result.availablePackages());
@@ -71,6 +71,7 @@ class InventoryCommandServiceTest {
         ArgumentCaptor<InventoryBalance> balance = ArgumentCaptor.forClass(InventoryBalance.class);
         verify(balances).updateById(balance.capture());
         assertEquals(12L, balance.getValue().getAvailablePackages());
+        assertEquals("SKU-1", balance.getValue().getSkuCode());
         verify(positions).insert(any(InventoryPosition.class));
         verify(ledgers).insert(any(InventoryLedger.class));
         verify(operations).updateById(any(InventoryOperation.class));
@@ -78,7 +79,7 @@ class InventoryCommandServiceTest {
 
     @Test
     void stockInAllowsPalletPositionWithZeroOptionalPackages() {
-        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
 
         var result = service.stockIn("100", "7", stockIn("IN-1", "stock-in-zero", 0, 0));
 
@@ -104,7 +105,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")).thenReturn(null);
+        when(balances.lockDimension("100", "WH-1", "ONT8", 101L, "IN-CODE-1", "SKU-1")).thenReturn(null);
         service.stockIn("100", "7", request);
         ArgumentCaptor<InventoryOperation> operation = ArgumentCaptor.forClass(InventoryOperation.class);
         verify(operations).insert(operation.capture());
@@ -138,7 +139,8 @@ class InventoryCommandServiceTest {
 
     private InventoryCommandRequests.StockIn stockIn(String inbound, String key, long packages, long quantity) {
         return new InventoryCommandRequests.StockIn("100", "Customer 100", "WH-1", "WH1", "Warehouse 1",
-            "DEST-1", "ONT8", "ONT8", 101L, inbound, "IN-CODE-1", 300L, "PLT-1", null, null, null,
+            "DEST-1", "ONT8", "ONT8", 101L, inbound, "IN-CODE-1", "SKU-1", "Product 1", null,
+            300L, "PLT-1", null, null, null,
             packages, "ORD-1", "EVT-1", key, null);
     }
 

lastleg-service/src/test/java/com/baiyue/lastleg/inventory/query/controller/InventoryQueryControllerTest.java

@@ -18,7 +18,7 @@ class InventoryQueryControllerTest {
     private final InventoryQueryService service = mock(InventoryQueryService.class);
     private final InventoryQueryController controller = controller();
     private final InventoryQueryRequests.BalanceQuery query = new InventoryQueryRequests.BalanceQuery(
-        1, 20, null, null, null, null, null, null, null, null);
+        1, 20, null, null, null, null, null, null, null, null, null, null);
 
     @Test
     void merchantCannotOverrideCustomerScope() {

lastleg-service/src/test/java/com/baiyue/lastleg/inventory/query/service/InventoryQueryServiceTest.java

@@ -120,12 +120,11 @@ class InventoryQueryServiceTest {
 
         String csv = new String(service.exportBalances("100", query), StandardCharsets.UTF_8);
 
-        assertTrue(csv.contains("inboundOrderNo,inboundCode,totalPackages"));
-        assertFalse(csv.contains("skuCode"));
+        assertTrue(csv.contains("inboundOrderNo,inboundCode,skuCode,productNameZh,productNameEn,totalPackages"));
         assertFalse(csv.contains("Quantity"));
     }
 
     private static InventoryQueryRequests.BalanceQuery balanceQuery(String status) {
-        return new InventoryQueryRequests.BalanceQuery(1, 20, null, null, null, null, null, null, null, status);
+        return new InventoryQueryRequests.BalanceQuery(1, 20, null, null, null, null, null, null, null, null, null, status);
     }
 }