优化提交

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());