zk преди 1 година
родител
ревизия
6e240ff09c

+ 1 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -212,7 +212,7 @@ public class KwtWaybillOrderController {
     }
 
     /**
-     * 派车-查询已派车量、待运量数据
+     * 派车-查询已派车量、待运量数据(4.2废弃)
      * @param orderId
      * @return
      */

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/SendCarEntrustDto.java

@@ -41,8 +41,8 @@ public class SendCarEntrustDto {
      * 计划时间
      */
     @JsonProperty("planTime")
-    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(locale="zh", pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "计划时间不能为空")
     private Date planTime;
 

+ 0 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderTicketV4Dto.java

@@ -52,7 +52,6 @@ public class WaybillOrderTicketV4Dto {
     @JsonProperty("operateTime")
     @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-    @NotNull(message = "时间不能为空")
     private Date operateTime;
 
     /**

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillDetailVo.java

@@ -29,6 +29,7 @@ public class WaybillDetailVo {
     /**
      * 关联承运订单
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillSubtaskSelectVo.java

@@ -39,6 +39,7 @@ public class WaybillSubtaskSelectVo {
     /**
      * 关联承运订单
      */
+    @JsonProperty("lOrderNo")
     private String lOrderNo;
 
     /**