655新增抬杆查询接口优化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrder.java

@@ -192,6 +192,11 @@ public class KwtWaybillOrder implements Serializable {
      */
     private String passUrl;
 
+    /**
+     * 是否已抬杆
+     */
+    private String opened;
+
     //用于存储动态状态
     @TableField(exist = false)
     private Integer targetStatus;

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

@@ -378,17 +378,7 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
         return list(Wrappers.<KwtWaybillOrder>lambdaQuery()
                 .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))
-                )
+                .eq(KwtWaybillOrder::getOpened, 0)
                 .orderByDesc(KwtWaybillOrder::getId));
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/GatekeeperOrderService.java

@@ -1246,7 +1246,6 @@ public class GatekeeperOrderService {
         // 获取最新的一条数据
         KwtWaybillOrder waybillOrder = wbOrderByTruckNo.get(0);
         List<KwtWaybillOrderWeighbridge> weighbridges = checkIsFirst(waybillOrder);
-        // 山上：需要区分是进场抬杆还是出场抬杆
         if (CollectionUtils.isEmpty(weighbridges)) {
             // 第一次过磅
             Boolean result = Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.PENDING_VEHICLE.getCode()) ? Boolean.TRUE : Boolean.FALSE;
@@ -1284,24 +1283,23 @@ public class GatekeeperOrderService {
     }
 
     /**
-     * 查询门卫
+     * 校验是否第一次过磅
      * @param waybillOrder
      * @return
      */
-    private List<KwtGatekeeperWaybillOrder> getGatekeeperWaybillOrders(KwtWaybillOrder waybillOrder) {
-        return gatekeeperWaybillOrderRepository
-                .queryGatekeeperWaybillOrderByWOrderIds(Lists.newArrayList(waybillOrder.getId()));
+    private List<KwtWaybillOrderWeighbridge> checkIsFirst(KwtWaybillOrder waybillOrder) {
+        return waybillOrderWeighbridgeRepository
+                .queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId(), WeighbridgeTypeEnum.LOADING.getCode());
     }
 
-
     /**
-     * 校验是否第一次过磅
+     * 查询门卫
      * @param waybillOrder
      * @return
      */
-    private List<KwtWaybillOrderWeighbridge> checkIsFirst(KwtWaybillOrder waybillOrder) {
-        return waybillOrderWeighbridgeRepository
-                .queryWaybillOrderWeighbridgeByWOrderId(waybillOrder.getId(), WeighbridgeTypeEnum.LOADING.getCode());
+    private List<KwtGatekeeperWaybillOrder> getGatekeeperWaybillOrders(KwtWaybillOrder waybillOrder) {
+        return gatekeeperWaybillOrderRepository
+                .queryGatekeeperWaybillOrderByWOrderIds(Lists.newArrayList(waybillOrder.getId()));
     }