wangweiyu 4 лет назад
Родитель
Сommit
f943d9c9d3

+ 1 - 1
src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -360,7 +360,7 @@ public enum ErrCodeEnum {
     /**
      * 该卡车下已经有一个押运员
      */
-    EXECUTE_WEIGHT_ERROR(2315, "执行运单失败,请确认当前车辆状态"),
+    EXECUTE_WEIGHT_ERROR(2315, "执行运单失败"),
     ;
 
     private int code;

+ 3 - 1
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -313,7 +313,9 @@ public class WorkerController {
         workOrder.setExecuteTime(LocalDateTime.now());
         Boolean flag = workerService.startOrder(userId, utf8Name, workOrder);
         if (!flag) {
-            return new Result<>(ErrCodeEnum.EXECUTE_WEIGHT_ERROR.getCode(), ErrCodeEnum.EXECUTE_WEIGHT_ERROR.getMessage());
+            String str = workOrderCheck.getType() == 1 ? ",当前车辆为重车" : ",当前车辆为空车";
+            return new Result<>(ErrCodeEnum.EXECUTE_WEIGHT_ERROR.getCode(),
+                    ErrCodeEnum.EXECUTE_WEIGHT_ERROR.getMessage() + str);
         }
         return new Result<>(flag);
     }