1、调整车辆运单数据状态枚举描述；

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CarWaybillEnum.java

@@ -52,7 +52,7 @@ public enum CarWaybillEnum {
     /**
      * 已撤销
      */
-    REVOKED(11, "revoked", "11", "单趟撤回"),
+    REVOKED(11, "revoked", "11", "撤回"),
     /**
      * 已核单-不通过[审核不通过]
      */

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

@@ -416,15 +416,7 @@ public class KwtWaybillOrderService {
         /**Mongodb数据存储**/
         //1车辆订单
         for (SckwWaybillOrder waybillOrder : sckwWaybillOrders) {
-            //rabbitMq业务汇总数据发送/消费对象
-            SckwBusSum busSum = new SckwBusSum();
-            //业务汇总类型
-            busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
-            //操作对象（1新增/2修改/3替换数据）
-            busSum.setMethod(1);
-            //业务汇总数据对象
-            busSum.setObject(waybillOrder);
-            streamBridge.send("sckw-busSum", busSum);
+            editSckwWaybillOrder(waybillOrder, null, Global.NUMERICAL_ONE);
         }
 
         //2承运订单
@@ -533,6 +525,7 @@ public class KwtWaybillOrderService {
                     SckwWaybillOrder mongoOrder = setSckwWaybillOrder(sendCarDto, waybillOrder, logisticsOrder, loadAddress,
                             unloadAddress, checkEnt, carrierEnt, goods);
                     mongoOrder.set_id(circulate.getId());
+                    mongoOrder.setWOrderId(null);
                     mongoOrder.setWOrderNo(null);
                     sckwWaybillOrders.add(mongoOrder);
                 }
@@ -1108,6 +1101,8 @@ public class KwtWaybillOrderService {
             waybillOrder.setStatus(CarWaybillEnum.REVOKED.getCode());
             waybillOrderDao.updateById(waybillOrder);
 
+            setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getUpdateTime(), waybillOrder.getStatus(), "完结物流订单时撤回车辆运单！");
+
             //车辆订单-Mongodb数据更新
             SckwWaybillOrder wOrder = new SckwWaybillOrder();
             wOrder.set_id(waybillOrder.getId());
@@ -1118,6 +1113,7 @@ public class KwtWaybillOrderService {
         List<KwtLogisticsOrderCirculate> circulates = logisticsOrderCirculateDao.findCirculateList(lorderId, null, null, 0);
         for (KwtLogisticsOrderCirculate circulate : circulates) {
             circulate.setStatus(Global.NUMERICAL_ONE);
+            circulate.setRemark("完结物流订单时撤回车辆运单！");
             logisticsOrderCirculateDao.updateById(circulate);
 
             //车辆订单-Mongodb数据更新