1、车辆循环单接单逻辑调整；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderCirculateMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.model.KwtLogisticsOrderCirculate;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 import java.util.Map;
 import java.util.List;
 
@@ -25,7 +27,8 @@ public interface KwtLogisticsOrderCirculateMapper extends BaseMapper<KwtLogistic
      * @param id 循环单ID
      * @return
      */
-    int updateIdByKey(@Param("newId") Long newId, @Param("wOrderId") Long wOrderId, @Param("id") Long id);
+    int updateIdByKey(@Param("newId") Long newId, @Param("wOrderId") Long wOrderId, @Param("id") Long id,
+                      @Param("updateBy") Long updateBy, @Param("updateTime") Date updateTime);
 
     /**
      * 查询循环单-根据司机id单据状态-联查表

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

@@ -1508,7 +1508,7 @@ public class KwtWaybillOrderService {
             /*circulate.setWOrderId(null);
             logisticsOrderCirculateDao.updateById(circulate);*/
             Long wOrderId = new IdWorker(Global.NUMERICAL_ONE).nextId();
-            logisticsOrderCirculateDao.updateIdByKey(wOrderId, null, circulate.getId());
+            logisticsOrderCirculateDao.updateIdByKey(wOrderId, null, circulate.getId(), waybillOrder.getUpdateBy(), waybillOrder.getUpdateTime());
         }
 
         /**6跟新司机/车辆数据

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderCirculateMapper.xml

@@ -32,7 +32,11 @@
     </sql>
 
     <update id="updateIdByKey">
-        UPDATE kwt_logistics_order_circulate set id = #{newId}, w_order_id = #{wOrderId} WHERE id = #{id}
+        UPDATE kwt_logistics_order_circulate
+        set
+        id = #{newId}, w_order_id = #{wOrderId},
+        update_by = #{updateBy}, update_time = #{updateTime}
+        WHERE id = #{id}
     </update>
 
     <select id="selectDriverOrderByStatus" resultType="java.lang.Long">