Merge remote-tracking branch 'origin/master'

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

@@ -14,6 +14,10 @@ public enum ErrCodeEnum {
      */
     BAD_PARAM(2000, "参数错误！"),
     /**
+     * 运单已终止
+     */
+    CLOSED_ORDER(2223, "运单已终止"),
+    /**
      * token无效
      */
     TOKEN_ERROR(2001, "token无效"),
@@ -176,10 +180,7 @@ public enum ErrCodeEnum {
      * 卡车有未支付订单
      */
     UNPAY_ORDER(2222, "卡车有未支付订单"),
-    /**
-     * 订单已取消
-     */
-    CANCEL_ORDER(2223, "订单已取消"),
+
     /**
      * 订单已支付
      */

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

@@ -298,6 +298,12 @@ public class WorkerController {
         if (workOrder == null || workOrder.getId() == null || workOrder.getStartTrip() == null || StringUtils.isBlank(workOrder.getStartTripUrl())) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        WorkOrder workOrderCheck = workOrderService.getById(workOrder.getId());
+        if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
+            return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
+        }
+
         String utf8Name = userName;
         try {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
@@ -319,6 +325,13 @@ 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.并记行车日志
 
         //出车检查
@@ -360,11 +373,18 @@ public class WorkerController {
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        WorkOrder workOrderCheck = workOrderService.getById(workOrder.getId());
+        if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
+            return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
+        }
         String utf8Name = userName;
         try {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
+
+
         //1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
         Boolean flag = workerService.startWait(userId, utf8Name, workOrder);
         return new Result<>(flag);
@@ -377,11 +397,18 @@ public class WorkerController {
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        WorkOrder workOrderCheck = workOrderService.getById(workOrder.getId());
+        if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
+            return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
+        }
         String utf8Name = userName;
         try {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
+
+
         //1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
         Boolean flag = workerService.submitResult(userId, utf8Name, workOrder);
         return new Result<>(flag);