优化提交

lastleg-service/src/main/java/com/baiyue/lastleg/service/LastlegOrderService.java

@@ -534,7 +534,10 @@ public class LastlegOrderService {
         String warehouse = StringUtils.hasText(query.warehouse()) ? query.warehouse().trim() : null;
         return new LambdaQueryWrapper<LastlegOrder>()
             .eq(StringUtils.hasText(customerId), LastlegOrder::getCustomerId, customerId)
-            .like(StringUtils.hasText(query.orderNo()), LastlegOrder::getOrderNo, query.orderNo())
+            .and(StringUtils.hasText(query.orderNo()), nested -> nested
+                .like(LastlegOrder::getOrderNo, query.orderNo())
+                .or()
+                .like(LastlegOrder::getSourceOrderNo, query.orderNo()))
             .like(StringUtils.hasText(relabelNo), LastlegOrder::getRelabelOrderNo, relabelNo)
             .eq(StringUtils.hasText(query.orderType()), LastlegOrder::getOrderType, query.orderType())
             .like(StringUtils.hasText(query.inboundCode()), LastlegOrder::getInboundCode, query.inboundCode())
@@ -590,7 +593,7 @@ public class LastlegOrderService {
     private LastlegOrderSummary summary(LastlegOrder o, List<LastlegOrderMapper.PalletMergeRelationRow> relations,
                                         String containerNode, String dispatchStatus) {
         List<LastlegOrderMapper.PalletMergeRelationRow> related = relations == null ? List.of() : relations;
-        return new LastlegOrderSummary(o.getId(), o.getOrderNo(), o.getOrderType(),
+        return new LastlegOrderSummary(o.getId(), displayOrderNo(o), o.getOrderType(),
             LastlegOrderType.labelOf(o.getOrderType()), o.getDestinationType(), o.getSourceInboundId(),
             displayInboundCode(o), o.getLxCode(), o.getSourceOrderNo(), o.getCustomerId(), o.getCustomerName(), o.getOverseasWarehouseId(),
             o.getOverseasWarehouseCode(), o.getOverseasWarehouseName(), o.getTransferWarehouseId(), o.getTransferWarehouseCode(),
@@ -607,6 +610,11 @@ public class LastlegOrderService {
             o.getCustomerRemark(), o.getWarehouseRemark(), o.getCreatedAt(), o.getUpdatedAt());
     }
 
+    static String displayOrderNo(LastlegOrder order) {
+        return "WAREHOUSE_TRANSFER".equals(order.getOrderType()) && StringUtils.hasText(order.getSourceOrderNo())
+            ? order.getSourceOrderNo() : order.getOrderNo();
+    }
+
     private String containerNode(LastlegOrder order) {
         if (!StringUtils.hasText(order.getSourceContainerBookingId())) return null;
         ContainerShippingGate gate = containerShippingGates.selectById(order.getSourceContainerBookingId());

lastleg-service/src/main/resources/db/lastleg.sql

@@ -1530,6 +1530,8 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE transfer_estimated_ship_stmt FROM @ddl; EXECUTE transfer_estimated_ship_stmt; DEALLOCATE PREPARE transfer_estimated_ship_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_warehouse_transfer_order' AND column_name='label_deadline'), 'SELECT 1', 'ALTER TABLE ll_warehouse_transfer_order ADD COLUMN label_deadline DATETIME(3) NULL COMMENT ''换标截止时间'', ADD COLUMN relabel_contact_name VARCHAR(128) NULL COMMENT ''换标联系人'', ADD COLUMN relabel_contact_phone VARCHAR(64) NULL COMMENT ''换标联系电话'', ADD COLUMN relabel_charge_amount DECIMAL(20,2) NULL COMMENT ''换标费用CNY'', ADD COLUMN relabel_delivery_method VARCHAR(32) NULL COMMENT ''换标后派送方式'''));
 PREPARE transfer_relabel_config_stmt FROM @ddl; EXECUTE transfer_relabel_config_stmt; DEALLOCATE PREPARE transfer_relabel_config_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_warehouse_transfer_order' AND column_name='relabel_completed_at'), 'SELECT 1', 'ALTER TABLE ll_warehouse_transfer_order ADD COLUMN relabel_completed_at DATETIME(3) NULL COMMENT ''关联贴标完成时间'' AFTER relabel_no'));
+PREPARE transfer_relabel_completed_stmt FROM @ddl; EXECUTE transfer_relabel_completed_stmt; DEALLOCATE PREPARE transfer_relabel_completed_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_warehouse_transfer_order' AND column_name='palletize_idempotency_key'), 'SELECT 1', 'ALTER TABLE ll_warehouse_transfer_order ADD COLUMN palletize_idempotency_key VARCHAR(255) NULL COMMENT ''PDA打托幂等键'', ADD COLUMN palletize_request_hash CHAR(64) NULL COMMENT ''PDA打托请求哈希'', ADD COLUMN confirmation_idempotency_key VARCHAR(255) NULL COMMENT ''客户测量确认幂等键'', ADD COLUMN confirmation_request_hash CHAR(64) NULL COMMENT ''客户测量确认请求哈希'', ADD COLUMN customer_confirmed_at DATETIME(3) NULL COMMENT ''客户确认测量时间'''));
 PREPARE transfer_fulfillment_stmt FROM @ddl; EXECUTE transfer_fulfillment_stmt; DEALLOCATE PREPARE transfer_fulfillment_stmt;
 

lastleg-service/src/test/java/com/baiyue/lastleg/service/LastlegOrderServiceTest.java

@@ -69,6 +69,16 @@ class LastlegOrderServiceTest {
     @Mock ContainerShippingGateMapper containerShippingGates;
     LastlegOrderService service;
 
+    @Test
+    void exposesWarehouseTransferNumberAsTailOrderNumber() {
+        LastlegOrder order = new LastlegOrder();
+        order.setOrderNo("WT-WH-20260911-020226");
+        order.setOrderType("WAREHOUSE_TRANSFER");
+        order.setSourceOrderNo("WT-WH-20260911-020225");
+
+        assertEquals("WT-WH-20260911-020225", LastlegOrderService.displayOrderNo(order));
+    }
+
     @BeforeEach
     void setUp() {
         service = new LastlegOrderService();