勘料

njzscloud-svr/src/main/java/com/njzscloud/supervisory/device/service/DeviceInfoService.java

@@ -438,6 +438,10 @@ public class DeviceInfoService extends ServiceImpl<DeviceInfoMapper, DeviceInfoE
                                 .build();
                     }
                     log.info("进道闸转出道闸，订单号：{}", orderInfoSn);
+                    if (orderInfo.getCheckStatus() == CheckStatus.WeiKanLiao) {
+                        // 播语音
+                        playVoice(sn, cid, "{}未看料", licensePlate);
+                    }
                     boolean b = orderInfoService.truckLeaving(new TruckLeavingOrderParam()
                                     .setOrderId(orderId)
                                     .setWeight(weight)
@@ -475,6 +479,10 @@ public class DeviceInfoService extends ServiceImpl<DeviceInfoMapper, DeviceInfoE
                     if (SettlementWay.CASH.getTxt().equals(settlementWay)) {
                         playVoice(sn, cid, "{}请先支付", licensePlate);
                     }
+                    if (orderInfo.getCheckStatus() == CheckStatus.WeiKanLiao) {
+                        // 播语音
+                        playVoice(sn, cid, "{}未看料", licensePlate);
+                    }
                     boolean b = orderInfoService.truckLeaving(new TruckLeavingOrderParam()
                                     .setOrderId(orderId)
                                     .setWeight(weight)

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java

@@ -542,6 +542,6 @@ public class OrderPagingResult {
     private String stationPhone;
     private Double stationLng;
     private Double stationLat;
-    private String route;
+    private List<String> route;
     // endregion
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/TrainBillResult.java

@@ -489,5 +489,7 @@ public class TrainBillResult {
     private String stationUscc;
     private String stationContacts;
     private String stationPhone;
+    private List<String> route;
+
     // endregion
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -214,10 +214,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
      */
     public OrderPagingResult detail(Long id) {
         List<String> routes = baseMapper.getRoute(id);
-        String route = StrUtil.join("--> ", routes);
         OrderPagingResult orderPagingResult = baseMapper.detail(Wrappers.<OrderPagingResult>query()
                 .in("a.id", id));
-        orderPagingResult.setRoute(route);
+        orderPagingResult.setRoute(routes);
         return orderPagingResult;
     }