Merge remote-tracking branch 'origin/dev' into dev

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

@@ -511,7 +511,7 @@ public class KwtWaybillOrderService {
                     String wOrderNo = getRedisGenerateWaybillOrderNo(RedisOrderGenerateEnum.WAYBILL_ORDER, OrderRuleEnum.WAYBILL_ORDER, logisticsOrder.getLOrderNo());
                     waybillOrder.setId(null);
                     waybillOrder.setWOrderNo(wOrderNo);
-                    ranksSave(waybillOrder, loadAddress, unloadAddress);
+                    ranksSave(waybillOrder, loadAddress, unloadAddress, null);
 
                     /**SckwWaybillOrder数据组装**/
                     SckwWaybillOrder mongoOrder = setSckwWaybillOrder(sendCarDto, waybillOrder, logisticsOrder, loadAddress,
@@ -581,7 +581,8 @@ public class KwtWaybillOrderService {
      * @author zk
      * @date 2023/7/21
      **/
-    public void ranksSave(KwtWaybillOrder waybillOrder, KwtWaybillOrderAddress loadAddress, KwtWaybillOrderAddress unloadAddress) {
+    public void ranksSave(KwtWaybillOrder waybillOrder, KwtWaybillOrderAddress loadAddress,
+                          KwtWaybillOrderAddress unloadAddress, Date operateTime) {
         /**车辆运单信息**/
         waybillOrderDao.insert(waybillOrder);
 
@@ -598,7 +599,8 @@ public class KwtWaybillOrderService {
         waybillOrderAddressDao.insert(unloadAddress);
 
         /**车辆运单状态记录**/
-        this.setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getUpdateTime(), waybillOrder.getStatus(), null);
+        this.setWaybillOrderTrack(waybillOrder.getId(), operateTime != null ? operateTime : waybillOrder.getUpdateTime(),
+                waybillOrder.getStatus(), null);
     }
 
     /**
@@ -619,6 +621,11 @@ public class KwtWaybillOrderService {
             int count = logisticsOrderCirculateDao.insert(circulate);
             return count > 0 ? circulate : null;
         } else {
+            //有效循环单不做新增处理、已撤回/拒绝出车更新循环单信息
+            if (circulate.getStatus() == Global.NO) {
+                return null;
+            }
+
             //更新原循环单ID
             Long newId = new IdWorker(Global.NUMERICAL_ONE).nextId();
             logisticsOrderCirculateDao.updateIdByKey(newId, null, circulate.getId(), LoginUserHolder.getUserId(), new Date());
@@ -1252,7 +1259,7 @@ public class KwtWaybillOrderService {
             KwtWaybillOrder waybillOrder = setKwtWaybillOrder(circulate, params, wOrderNo);
 
             /**2车辆运单存储**/
-            ranksSave(waybillOrder, loadAddress, unloadAddress);
+            ranksSave(waybillOrder, loadAddress, unloadAddress, params.getOperateTime());
             //补上车辆运单待接单状态
             setWaybillOrderTrack(circulate, waybillOrder.getId());