出车检查

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.common.TmsTruckStatus;
 import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.controller.param.UpSignParam;
 import com.aoyang.tms.controller.vo.LocationVO;
@@ -61,6 +62,8 @@ public class WorkerController {
     private WorkCycleService workCycleService;
     @Resource
     private TruckRepairInfoService truckRepairInfoService;
+    @Resource
+    private TruckService truckService;
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
@@ -325,12 +328,6 @@ public class WorkerController {
         if (truckCheckInfo == null || truckCheckInfo.getType() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
-        if(truckCheckInfo.getOrderId()!=null) {
-            WorkOrder workOrderCheck = workOrderService.getById(truckCheckInfo.getOrderId());
-            if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
-                return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
-            }
-        }
 
         //1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
 
@@ -362,6 +359,24 @@ public class WorkerController {
         } catch (UnsupportedEncodingException ignored) {
         }
 
+        //1.车辆进入出车前检车状态
+        Truck truck = truckService.getById(workOrder.getTruckId());
+        truck.setTmsStatus(TmsTruckStatus.WORKING);
+        truckService.updateById(truck);
+        //2.插入车辆检查数据
+        BeanUtils.copyProperties(workOrder, truckCheckInfo);
+        truckCheckInfo.setCreater(userId);
+        truckCheckInfo.setCreaterName(userName);
+        truckCheckInfo.setCreateDate(LocalDateTime.now());
+        truckCheckInfoService.save(truckCheckInfo);
+
+        if(truckCheckInfo.getOrderId()!=null) {
+            WorkOrder workOrderCheck = workOrderService.getById(truckCheckInfo.getOrderId());
+            if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
+                return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
+            }
+        }
+
         Boolean flag = workerService.starWork(userId, utf8Name, truckCheckInfo);
         return new Result<>(flag);
     }

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

@@ -134,16 +134,6 @@ 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);
-                //2.插入车辆检查数据
-                BeanUtils.copyProperties(workOrder, truckCheckInfo);
-                truckCheckInfo.setCreater(userId);
-                truckCheckInfo.setCreaterName(userName);
-                truckCheckInfo.setCreateDate(LocalDateTime.now());
-                truckCheckInfoService.save(truckCheckInfo);
                 //3.更新订单,更新前往装车点时间
                 workOrder.setGotoSpotTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);