1、循环单规则调整；

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

@@ -1273,10 +1273,12 @@ public class AcceptCarriageOrderService {
                 );
                 /**更新MongoDB*/
                 SckwWaybillOrder order = new SckwWaybillOrder();
-                order.setStatus(NumberConstant.ONE);
+                order.set_id(circulateId);
+                order.setStatus(CarWaybillEnum.REVOKED.getCode());
                 order.setUpdateTime(new Date());
                 order.setUpdateByName(LoginUserHolder.getUserName());
                 order.setUpdateBy(LoginUserHolder.getUserId());
+                order.setDelFlag(Global.YES);
                 SckwBusSum busSum = new SckwBusSum();
                 busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
                 busSum.setMethod(NumberConstant.TWO);

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

@@ -612,13 +612,18 @@ public class KwtWaybillOrderService {
                 waybillOrder.getTruckId(), waybillOrder.getDriverId());
         if (circulate == null) {
             circulate = new KwtLogisticsOrderCirculate();
-            BeanUtils.copyProperties(waybillOrder, circulate);
+            BeanUtils.copyPropertiesValue(waybillOrder, circulate);
             circulate.setWOrderId(null);
             circulate.setStatus(0);
             int count = logisticsOrderCirculateDao.insert(circulate);
             return count > 0 ? circulate : null;
         } else {
-            BeanUtils.copyProperties(waybillOrder, circulate);
+            //更新原循环单ID
+            Long newId = new IdWorker(Global.NUMERICAL_ONE).nextId();
+            logisticsOrderCirculateDao.updateIdByKey(newId, null, circulate.getId(), waybillOrder.getUpdateBy(), waybillOrder.getUpdateTime());
+
+            BeanUtils.copyPropertiesValue(waybillOrder, circulate);
+            circulate.setId(newId);
             circulate.setWOrderId(null);
             circulate.setStatus(0);
             int count = logisticsOrderCirculateDao.updateById(circulate);
@@ -1482,6 +1487,7 @@ public class KwtWaybillOrderService {
             KwtLogisticsOrderCirculate circulate = logisticsOrderCirculateDao.findCirculate(waybillOrder.getLOrderId(),
                     waybillOrder.getTruckId(), waybillOrder.getDriverId());
             circulate.setStatus(Global.NUMERICAL_ONE);
+            circulate.setWOrderId(null);
             logisticsOrderCirculateDao.updateById(circulate);
         }
 

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

@@ -39,6 +39,34 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updateCirculate" parameterType="com.sckw.transport.model.KwtLogisticsOrderCirculate">
+        UPDATE kwt_logistics_order_circulate
+        <set>
+            <if test="null != entId and '' != entId">ent_id = #{entId},</if>
+            <if test="null != lOrderId and '' != lOrderId">l_order_id = #{lOrderId},</if>
+            <if test="null != wOrderId and '' != wOrderId">w_order_id = #{wOrderId},</if>
+            <if test="null != type and '' != type">type = #{type},</if>
+            <if test="null != truckId and '' != truckId">truck_id = #{truckId},</if>
+            <if test="null != truckNo and '' != truckNo">truck_no = #{truckNo},</if>
+            <if test="null != driverId and '' != driverId">driver_id = #{driverId},</if>
+            <if test="null != driverName and '' != driverName">driver_name = #{driverName},</if>
+            <if test="null != driverPhone and '' != driverPhone">driver_phone = #{driverPhone},</if>
+            <if test="null != driverIdcard and '' != driverIdcard">driver_idcard = #{driverIdcard},</if>
+            <if test="null != startTime and '' != startTime">start_time = #{startTime},</if>
+            <if test="null != endTime and '' != endTime">end_time = #{endTime},</if>
+            <if test="null != entrustAmount and '' != entrustAmount">entrust_amount = #{entrustAmount},</if>
+            <if test="null != totalTake and '' != totalTake">total_take = #{totalTake},</if>
+            <if test="null != remark and '' != remark">remark = #{remark},</if>
+            <if test="null != status and '' != status">status = #{status},</if>
+            <if test="null != createBy and '' != createBy">create_by = #{createBy},</if>
+            <if test="null != createTime and '' != createTime">create_time = #{createTime},</if>
+            <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
+            <if test="null != updateTime and '' != updateTime">update_time = #{updateTime},</if>
+            <if test="null != delFlag and '' != delFlag">del_flag = #{delFlag}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
     <select id="selectDriverOrderByStatus" resultType="java.lang.Long">
         SELECT b.w_order_id as wOrderId
         FROM kwt_waybill_order a