655新增抬杆查询接口优化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderRepository.java

@@ -376,9 +376,19 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
 
     public List<KwtWaybillOrder> findWbOrderByTruckNo(String truckNo) {
         return list(Wrappers.<KwtWaybillOrder>lambdaQuery()
-                .eq(KwtWaybillOrder::getDelFlag,0)
-                .eq(KwtWaybillOrder::getTruckNo,truckNo)
-                .notIn(KwtWaybillOrder::getStatus, Arrays.asList(25, 99))
+                .eq(KwtWaybillOrder::getDelFlag, 0)
+                .eq(KwtWaybillOrder::getTruckNo, truckNo)
+                .ne(KwtWaybillOrder::getStatus, 99)
+                .and(wrapper -> wrapper
+                        // 分支1：如果是空载离场，允许状态为 25
+                        .and(w1 -> w1.eq(KwtWaybillOrder::getRemark, "空载离场")
+                                .eq(KwtWaybillOrder::getStatus, 25))
+                        // 或者
+                        .or()
+                        // 分支2：如果不是空载离场，则不能是 25 (即只允许 20 等其他状态)
+                        .and(w2 -> w2.ne(KwtWaybillOrder::getRemark, "空载离场")
+                                .ne(KwtWaybillOrder::getStatus, 25))
+                )
                 .orderByDesc(KwtWaybillOrder::getId));
     }