优化

lastleg-service/src/test/java/com/baiyue/lastleg/dispatch/DispatchCandidateMapperContractTest.java

@@ -16,6 +16,57 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class DispatchCandidateMapperContractTest {
+    /** 执行正式仓ID的完整CASE及外层过滤，保留实库存优先、客户来源和长ID文本身份。 */
+    @Test
+    void wholeCandidateWarehouseProjectionExecutesAsTextWithoutChangingSourceOwnership() throws Exception {
+        String sql = String.join(" ", DispatchCandidateMapper.class.getMethod("wholeAvailable", String.class,
+            String.class, List.class, String.class, String.class, String.class, String.class).getAnnotation(Select.class).value());
+        int start = sql.indexOf("CAST(CASE WHEN p.warehouse_pallet_id IS NOT NULL THEN (SELECT MIN(pos.overseas_warehouse_id)");
+        int end = sql.indexOf(" AS overseasWarehouseId", start);
+        assertTrue(start >= 0 && end > start, "正式whole候选必须在整个仓CASE外统一为文本投影");
+        String expression = sql.substring(start, end).replace("&gt;", ">").replace("&lt;", "<");
+        assertTrue(expression.endsWith("END AS CHAR(128))"));
+        assertTrue(expression.contains("NULLIF(CAST(ip.overseas_warehouse_id AS CHAR(128)),'')"));
+        String warehouseFilter = sql.substring(sql.lastIndexOf(") selected WHERE ") + 1)
+            .replace("#{warehouseId}", "?").replace("</script>", "");
+        String query = "SELECT selected.planPalletId FROM (SELECT p.id AS planPalletId," + expression
+            + " AS overseasWarehouseId FROM ll_inbound_plan_pallet p JOIN ll_inbound_plan ip ON ip.id=p.plan_id)"
+            + warehouseFilter;
+        try (var connection = DriverManager.getConnection("jdbc:h2:mem:dispatch-whole-warehouse-text;MODE=MySQL")) {
+            var statement = connection.createStatement();
+            statement.execute("CREATE TABLE ll_inbound_plan(id BIGINT,customer_id VARCHAR(128),overseas_warehouse_id BIGINT,source_order_id BIGINT)");
+            statement.execute("CREATE TABLE ll_inbound_plan_pallet(id BIGINT,plan_id BIGINT,warehouse_pallet_id BIGINT)");
+            statement.execute("CREATE TABLE ll_inventory_position(customer_id VARCHAR(128),pallet_id BIGINT,available_packages BIGINT,overseas_warehouse_id VARCHAR(128))");
+            statement.execute("CREATE TABLE ll_order(id BIGINT,customer_id VARCHAR(128),overseas_warehouse_id VARCHAR(128))");
+            statement.execute("INSERT INTO ll_inbound_plan VALUES (1,'A',193000000000200002,NULL),"
+                + "(2,'A',193000000000100001,NULL),(3,'B',NULL,20),(4,'A',193000000000100001,NULL),"
+                + "(5,'B',193000000000200002,NULL),(6,'A',NULL,NULL),(7,'A',193000000000100001,21),"
+                + "(8,'A',193000000000100001,NULL),(9,'A',NULL,21)");
+            statement.execute("INSERT INTO ll_inbound_plan_pallet VALUES (1,1,10),(2,2,NULL),(3,3,NULL),"
+                + "(4,4,40),(5,5,50),(6,6,NULL),(7,7,NULL),(8,8,80),(9,9,NULL)");
+            statement.execute("INSERT INTO ll_inventory_position VALUES ('A',10,1,'193000000000100001'),"
+                + "('B',40,1,'193000000000100001'),('A',40,0,'193000000000100001'),"
+                + "('B',50,1,'193000000000100001'),('A',80,1,'193000000000200002')");
+            statement.execute("INSERT INTO ll_order VALUES (20,'A','193000000000200002'),"
+                + "(20,'B','193000000000100001'),(21,'B','193000000000100001')");
+            try (var prepared = connection.prepareStatement(query)) {
+                assertWarehouseRows(prepared, "193000000000100001", List.of(1L, 2L, 3L, 5L, 7L));
+                assertWarehouseRows(prepared, "193000000000200002", List.of(8L));
+                for (String invalid : List.of("19300000000010000", "193000000000100001x", "0193000000000100001", "1.93e17", "wrong"))
+                    assertWarehouseRows(prepared, invalid, List.of());
+            }
+        }
+    }
+
+    /** 每次实际执行同一参数化仓过滤，禁止用前缀、数字强转或其他客户库存替代身份。 */
+    private void assertWarehouseRows(java.sql.PreparedStatement prepared, String warehouse, List<Long> expected) throws Exception {
+        prepared.setString(1, warehouse);
+        var actual = new ArrayList<Long>();
+        try (var rows = prepared.executeQuery()) { while (rows.next()) actual.add(rows.getLong(1)); }
+        actual.sort(Long::compareTo);
+        assertEquals(expected, actual, warehouse);
+    }
+
     @Test
     void ordinaryAndReturnRelabelCandidatesExcludeDirectOutboundDeliveryModes() throws Exception {
         for (String method : List.of("relabelAvailable", "nativeReturnRelabelAvailable")) {
@@ -200,7 +251,9 @@ class DispatchCandidateMapperContractTest {
             String sql = String.join(" ", method.getAnnotation(Select.class).value());
             assertTrue(sql.contains("CASE WHEN p.warehouse_pallet_id IS NOT NULL"));
             assertTrue(sql.contains("pos.overseas_warehouse_id"));
-            assertTrue(sql.contains("NULLIF(CAST(ip.overseas_warehouse_id AS CHAR),'')"));
+            assertTrue(sql.contains(method.getName().equals("available")
+                ? "NULLIF(CAST(ip.overseas_warehouse_id AS CHAR(128)),'')"
+                : "NULLIF(CAST(ip.overseas_warehouse_id AS CHAR),'')"));
             assertTrue(sql.contains("source_order.id=ip.source_order_id"));
             assertTrue(sql.contains("source_order.customer_id=ip.customer_id"));
             assertTrue(sql.contains("source_order.overseas_warehouse_id"));