1、实体类调整；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/OperateSendCarDto.java

@@ -33,24 +33,24 @@ public class OperateSendCarDto {
 
     /**
      * 物流订单ID
-     */
+
     @JsonProperty("lOrderId")
     @NotNull(message = "物流订单ID不能为空")
-    private Long lOrderId;
+    private Long lOrderId;*/
 
     /**
      * 司机id
-     */
+
     @JsonProperty("driverId")
     @NotNull(message = "司机信息ID不能为空")
-    private Long driverId;
+    private Long driverId;*/
 
     /**
      * 车牌号
-     */
+
     @JsonProperty("truckId")
     @NotNull(message = "车辆信息ID不能为空")
-    private Long truckId;
+    private Long truckId;*/
 
     /**
      * 备注
@@ -61,7 +61,7 @@ public class OperateSendCarDto {
     /**
      * 操作时间
      */
-    @JsonProperty("time")
+    @JsonProperty("operateTime")
     @JsonFormat(locale="zh", pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "时间不能为空")

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderTicketDto.java

@@ -31,7 +31,7 @@ public class WaybillOrderTicketDto {
      * 磅单类型（1装货单/2卸货单）
      */
     @JsonProperty("type")
-    @NotNull(message = "磅单类型不能为空")
+    //@NotNull(message = "磅单类型不能为空")
     private Integer type;
 
     /**

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

@@ -917,8 +917,9 @@ public class KwtWaybillOrderService {
         /**循环派车**/
         if (params.getType() == Global.NUMERICAL_TWO) {
             /**1数据校验**/
-            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
-                    params.getTruckId(), params.getDriverId(), 0);
+            /*KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
+                    params.getTruckId(), params.getDriverId(), 0);*/
+            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.selectById(params.getWOrderId());
             if (circulate == null) {
                 return HttpResult.error("车辆循环运单不存在！");
             }
@@ -935,13 +936,13 @@ public class KwtWaybillOrderService {
 
             /**2获取基础信息**/
             //装货地址
-            KwtWaybillOrderAddress loadAddress = this.getAddress(params.getLOrderId(), Global.NUMERICAL_ONE);
+            KwtWaybillOrderAddress loadAddress = this.getAddress(circulate.getLOrderId(), Global.NUMERICAL_ONE);
             //卸货地址
-            KwtWaybillOrderAddress unloadAddress = this.getAddress(params.getLOrderId(), Global.NUMERICAL_TWO);
+            KwtWaybillOrderAddress unloadAddress = this.getAddress(circulate.getLOrderId(), Global.NUMERICAL_TWO);
             //KwtWaybillOrder数据组装
             KwtWaybillOrder waybillOrder = new KwtWaybillOrder();
             waybillOrder.setEntId(LoginUserHolder.getEntId());
-            waybillOrder.setLOrderId(params.getLOrderId());
+            waybillOrder.setLOrderId(circulate.getLOrderId());
             waybillOrder.setWOrderNo("xxxxxx");
             waybillOrder.setType(params.getType());
             waybillOrder.setStartTime(circulate.getStartTime());
@@ -1055,8 +1056,9 @@ public class KwtWaybillOrderService {
         /**循环派车**/
         if (params.getType() == Global.NUMERICAL_TWO) {
             /**1数据校验**/
-            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
-                    params.getTruckId(), params.getDriverId(), 0);
+            /*KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(params.getLOrderId(),
+                    params.getTruckId(), params.getDriverId(), 0);*/
+            KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.selectById(params.getWOrderId());
             if (circulate == null) {
                 return HttpResult.error("车辆循环运单不存在！");
             }