feat:行车日志调整

src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -14,9 +14,9 @@ public enum ErrCodeEnum {
      */
     BAD_PARAM(2000, "参数错误！"),
     /**
-     * 运单已终止
+     * 运单已中止
      */
-    CLOSED_ORDER(2223, "运单已终止"),
+    CLOSED_ORDER(2223, "运单已中止"),
     /**
      * 系统配置错误
      */

src/main/java/com/aoyang/tms/common/WorkLogTypeEnum.java

@@ -32,7 +32,7 @@ public enum WorkLogTypeEnum {
 
     LOAD_COMPLETE(30, "完成 装车运单"),
 
-    LOAD_CANCELED(31, "装车运单 终止"),
+    LOAD_CANCELED(31, "装车运单 中止"),
 
 
     UNLOAD_ORDER_START(40, "执行 卸车运单, 前往卸车点"),
@@ -49,7 +49,7 @@ public enum WorkLogTypeEnum {
 
     UNLOAD_COMPLETE(60, "完成 卸车运单"),
 
-    UNLOAD_CANCELED(61, "卸车运单 终止"),
+    UNLOAD_CANCELED(61, "卸车运单 中止"),
 
 
     RETURN_POINT_ARRIVED(70, "到达 收车点，开始\"收车后检查\""),

src/main/java/com/aoyang/tms/service/WorkOrderService.java

@@ -77,7 +77,7 @@ public interface WorkOrderService extends IService<WorkOrder> {
     Result<IPage<TruckOrderManageVO>> getTruckOrderManageList(PageParam<WorkManagePageParam> pageParam);
 
     /**
-     * 运营端终止运单
+     * 运营端中止运单
      *
      * @return
      */

src/main/java/com/aoyang/tms/service/impl/WorkerServiceImpl.java

@@ -134,6 +134,10 @@ public class WorkerServiceImpl implements WorkerService {
         try {
             WorkOrder workOrder = workOrderService.getById(truckCheckInfo.getOrderId());
             if (workOrder != null) {
+                //1.车辆进入作业中状态
+                Truck truck = truckService.getById(workOrder.getTruckId());
+                truck.setTmsStatus(TmsTruckStatus.WORKING);
+                truckService.updateById(truck);
                 //3.更新订单,更新前往装车点时间
                 workOrder.setGotoSpotTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
@@ -190,10 +194,6 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setEndTripUrl(workOrderParam.getEndTripUrl());
                 workOrder.setWorkStartTime(workOrderParam.getWorkStartTime());
                 workOrder.setWorkEndTime(workOrderParam.getWorkEndTime());
-                //1.车辆进入作业中状态
-                Truck truck = truckService.getById(workOrder.getTruckId());
-                truck.setTmsStatus(TmsTruckStatus.WORKING);
-                truckService.updateById(truck);
                 if (workOrder.getType() == 1) {
                     //3.订单进入前往装车点状态，
                     workOrder.setOrderStatus(WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus());