2 Комити a3005d2351 ... 7f2efc2ff8

Аутор SHA1 Порука Датум
  chenlin 7f2efc2ff8 Merge branch 'dev' of http://git.sckaiwu.cn/17358629955/sckw-service-platform into dev пре 2 година
  chenlin 09e922c2b2 update 订单列表增加物流单号返回 пре 2 година

+ 2 - 0
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -486,6 +486,8 @@ public class KwTransportService {
                     null : waybillOrder.getWOrderNo());
             vo.setWOrderId(waybillOrder.getWOrderId() == null ?
                     String.valueOf(waybillOrder.get_id()) : String.valueOf(waybillOrder.getWOrderId()));
+            vo.setLOrderNo(waybillOrder.getLOrderNo() == null ?
+                    null : waybillOrder.getLOrderNo());
             vo.setTruckNo(waybillOrder.getTruckNo());
             vo.setDriverName(waybillOrder.getDriverName() == null ?
                     null : String.valueOf(waybillOrder.getDriverName()));

+ 8 - 2
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/CarWaybillVo.java

@@ -21,17 +21,23 @@ public class CarWaybillVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 4526063761808958350L;
     /**
-     * 物流订单id
+     * 单id
      */
     @JsonProperty(value="wOrderId")
     private String wOrderId;
 
     /**
-     * 物流订单号
+     * 单号
      */
     @JsonProperty(value="wOrderNo")
     private String wOrderNo;
 
+    /**
+     * 物流订单号
+     */
+    @JsonProperty(value="lOrderNo")
+    private String lOrderNo;
+
     /**
      * 车辆牌照
      */