feat:查询bug

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

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

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

@@ -306,6 +306,9 @@ public class WorkerController {
         //1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
         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());
+        }
         return new Result<>(flag);
     }
 

src/main/resources/mapper/TruckMapper.xml

@@ -115,7 +115,7 @@
                 and (two.id is null or two.order_status = 0)
             </if>
             <if test="param!=null and param.unExecuted == 1">
-                and truck.tms_status = 0 and two.order_status = 0
+                and two.order_status = 0
             </if>
             <if test="param!=null and param.unAllocated == 1">
                 and two.id is null