update 更新单据ID及单号字段驼峰格式

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVO.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,21 +21,25 @@ public class CarWaybillVO {
     /**
      * 物流订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
 
     /**
      *物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**
      * 车辆运单id
      */
+    @JsonProperty("wOrderId")
     private String wOrderId;
 
     /**
      * 运单编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
     /**
      * 车牌号

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/DriverListVo.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -55,15 +56,18 @@ public class DriverListVo {
     /**
      * 物流订单id
      */
+    @JsonProperty("lOrderId")
     private String lOrderId;
 
     /**
      * 车辆运单id
      */
+    @JsonProperty("wOrderId")
     private String wOrderId;
 
     /**
      * 车辆运单编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillBoardListVO.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -17,10 +18,12 @@ public class WaybillBoardListVO {
     /**
      * 运单Id
      */
+    @JsonProperty("wOrderId")
     private String wOrderId;
     /**
      * 运单号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 
     /**
@@ -98,6 +101,11 @@ public class WaybillBoardListVO {
      */
     private String truckNo;
 
+    /**
+     * 循环/趟次
+     */
+    private String type;
+
     /**
      * 装载重量
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDriverVo.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -15,21 +16,25 @@ public class WaybillOrderDriverVo {
     /**
      * 主键
      */
+    @JsonProperty("wOrderId")
     private Long wOrderId;
 
     /**
      * 编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 
     /**
      * 主键
      */
+    @JsonProperty("lOrderId")
     private Long lOrderId;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderVO.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -16,31 +17,37 @@ public class WaybillOrderVO {
     /**
      * 主键
      */
+    @JsonProperty("wOrderId")
     private Long wOrderId;
 
     /**
      * 编号
      */
+    @JsonProperty("wOrderNo")
     private String wOrderNo;
 
     /**
      * 主键
      */
+    @JsonProperty("lOrderId")
     private Long lOrderId;
 
     /**
      * 物流订单编号
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**
      * 交易订单id（kwo_trade_order）
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 交易订单编号（kwo_trade_order）
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -238,6 +238,7 @@ public class WaybillManagementService {
             waybillBoardListVO.setWOrderId(String.valueOf(sckwWaybillOrder.getWOrderId()));
             waybillBoardListVO.setWOrderNo(String.valueOf(sckwWaybillOrder.getWOrderNo()));
             waybillBoardListVO.setStatus(String.valueOf(sckwWaybillOrder.getStatus()));
+            waybillBoardListVO.setType(String.valueOf(sckwWaybillOrder.getType()));
             waybillBoardListVO.setStatusLabel(CarWaybillEnum.getName(sckwWaybillOrder.getStatus()));
             waybillBoardListVO.setGoodsName(String.valueOf(sckwWaybillOrder.getGoodsName()));
             waybillBoardListVO.setLoadName(sckwWaybillOrder.getLoadName());