签名

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

@@ -14,6 +14,10 @@ public enum ErrCodeEnum {
      */
     BAD_PARAM(2000, "参数错误！"),
     /**
+     * 收车中不能执行运单
+     */
+    CAN_NOT_DO_ORDER(2001, "收车中不能执行运单"),
+    /**
      * 运单已中止
      */
     CLOSED_ORDER(2223, "运单已中止"),

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

@@ -310,6 +310,13 @@ public class WorkerController {
         }
 
         WorkOrder workOrderCheck = workOrderService.getById(workOrder.getId());
+
+        Truck truck = truckService.getById(workOrderCheck.getTruckId());
+        if (truck.getTmsStatus().equals(TmsTruckStatus.RETURNING)){
+            return new Result(ErrCodeEnum.CAN_NOT_DO_ORDER.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+
         if (workOrderCheck.getOrderStatus().equals(WorkOrderEnum.CONCELED.orderStatus())) {
             return new Result(ErrCodeEnum.CLOSED_ORDER.getCode(), ErrCodeEnum.CLOSED_ORDER.getMessage());
         }