查找周期下运单列表

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

@@ -115,7 +115,7 @@ public class WorkerController {
     @ApiOperation(value = "每个作业上报单独小按钮使用", notes = "")
     @PostMapping("/update_order")
     public Result updateOrder(@RequestHeader(value = "orgId") Long orgId,
-                               @RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
+                              @RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("每个作业上报单独小按钮使用，/tms/worker/update_order，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
@@ -132,11 +132,27 @@ public class WorkerController {
         return new Result(flag);
     }
 
-    @ApiOperation(value = "当前行车周期内运单列表", notes = "装车运单，只展示当前行车周期未完成的；除非当前已收车，则按排序展示第1个未完成的装车运单；卸车运单，重车时，才展示 ")
+    @ApiOperation(value = "当前周期所有订单列表", notes = " ")
     @PostMapping("/find_cycle_order_list")
-    public Result<List<WorkOrderVO>> findCycleOrderList(@RequestHeader(value = "orgId") Long orgId,
+    public Result<List<WorkOrder>> findCycleOrderList(@RequestHeader(value = "orgId") Long orgId,
+                                                      @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
+        log.info("当前周期所有订单列表,/tms/worker/find_cycle_order_list，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkCycle workCycle = workCycleService.findCurrentWorkCycle(workOrder.getTruckId());
+        if (workCycle != null) {
+
+        }
+        List<WorkOrder> list = workOrderService.findCycleOrderList(workCycle.getId(), null, null);
+        return new Result<>(list);
+    }
+
+    @ApiOperation(value = "首页订单列表", notes = "装车运单，只展示当前行车周期未完成的；除非当前已收车，则按排序展示第1个未完成的装车运单；卸车运单，重车时，才展示 ")
+    @PostMapping("/find_index_order_list")
+    public Result<List<WorkOrderVO>> findIndexOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                         @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
-        log.info("当前行车周期内运单列表,/tms/worker/find_cycle_order_list，参数:{}", JSON.toJSONString(workOrder));
+        log.info("首页订单列表,/tms/worker/find_index_order_list，参数:{}", JSON.toJSONString(workOrder));
         if (workOrder == null || workOrder.getTruckId() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }

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

@@ -144,7 +144,7 @@ public class CommonServiceImpl implements CommonService {
             workerInfo.setEscortPhone(truckEscort.getMobile());
         }
 
-        //查询正在执行的运单
+        //正在执行的当前运单
         WorkOrder workOrder = workOrderService.findWorkingOrder(truckId, null);
         if (workOrder != null) {
             workerInfo.setOrderId(workOrder.getId());