|
@@ -1248,7 +1248,9 @@ public class GatekeeperOrderService {
|
|
|
// 山上:需要区分是进场抬杆还是出场抬杆
|
|
// 山上:需要区分是进场抬杆还是出场抬杆
|
|
|
if (checkIsFirst(waybillOrder)) {
|
|
if (checkIsFirst(waybillOrder)) {
|
|
|
// 第一次过磅
|
|
// 第一次过磅
|
|
|
- return Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.PENDING_VEHICLE.getCode()) ? Boolean.TRUE : Boolean.FALSE;
|
|
|
|
|
|
|
+ Boolean result = Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.PENDING_VEHICLE.getCode()) ? Boolean.TRUE : Boolean.FALSE;
|
|
|
|
|
+ log.info("第一次过磅校验出场是否可放行完成,抬杆结果:{}", JSON.toJSONString(result));
|
|
|
|
|
+ return result;
|
|
|
} else {
|
|
} else {
|
|
|
// 第二次过磅
|
|
// 第二次过磅
|
|
|
List<KwtGatekeeperWaybillOrder> gatekeeperWaybillOrders = gatekeeperWaybillOrderRepository
|
|
List<KwtGatekeeperWaybillOrder> gatekeeperWaybillOrders = gatekeeperWaybillOrderRepository
|
|
@@ -1265,7 +1267,7 @@ public class GatekeeperOrderService {
|
|
|
GatekeeperStatusEnum.EMPTY_EXITED.getCode()
|
|
GatekeeperStatusEnum.EMPTY_EXITED.getCode()
|
|
|
);
|
|
);
|
|
|
Boolean result = PASS_STATUSES.contains(gatekeeperWaybillOrder.getStatus()) ? Boolean.TRUE : Boolean.FALSE;
|
|
Boolean result = PASS_STATUSES.contains(gatekeeperWaybillOrder.getStatus()) ? Boolean.TRUE : Boolean.FALSE;
|
|
|
- log.info("校验出场是否可放行完成,result:{}", JSON.toJSONString(result));
|
|
|
|
|
|
|
+ log.info("第一次过磅,校验出场是否可放行完成,抬杆结果:{}", JSON.toJSONString(result));
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|