运单列表pc端

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

@@ -61,12 +61,12 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         //装车
         vo.setLoadWait(getOrgOrderCount(orgId, 1, WorkOrderEnum.ZHUANGCHE_WAIT.orderStatus()));
         vo.setLoadGotoSpot(getOrgOrderCount(orgId, 1, WorkOrderEnum.GOTO_ZHUANGCHE_SPOT.orderStatus()));
-        vo.setLoadSubmit(getOrgOrderCount(orgId,  1, WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus()));
+        vo.setLoadSubmit(getOrgOrderCount(orgId, 1, WorkOrderEnum.ZHUANGCHE_RESULT_SUBMIT.orderStatus()));
         vo.setLoadCount(vo.getLoadGotoSpot() + vo.getLoadGotoSpot() + vo.getLoadSubmit());
         //卸车
-        vo.setUnloadWait(getOrgOrderCount(orgId,  2, WorkOrderEnum.XIECHE_WAIT.orderStatus()));
-        vo.setUnloadGotoSpot(getOrgOrderCount(orgId,  2, WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus()));
-        vo.setUnloadSubmit(getOrgOrderCount(orgId,  2, WorkOrderEnum.XIECHE_RESULT_SUBMIT.orderStatus()));
+        vo.setUnloadWait(getOrgOrderCount(orgId, 2, WorkOrderEnum.XIECHE_WAIT.orderStatus()));
+        vo.setUnloadGotoSpot(getOrgOrderCount(orgId, 2, WorkOrderEnum.GOTO_XIECHE_SPOT.orderStatus()));
+        vo.setUnloadSubmit(getOrgOrderCount(orgId, 2, WorkOrderEnum.XIECHE_RESULT_SUBMIT.orderStatus()));
         vo.setUnloadCount(vo.getUnloadGotoSpot() + vo.getUnloadGotoSpot() + vo.getUnloadSubmit());
         //剩余运力
         vo.setSurplusCount(vo.getTotal() - vo.getLoadCount() - vo.getUnloadCount());
@@ -195,10 +195,16 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
             //TODO运单作业状态
             if (workOrder.getType() == 1) {
-                workOrderPageListVO.setWorkOrderType("装车·"+ WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+                workOrderPageListVO.setWorkOrderType("装车·" + WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+                if (workOrder.getOrderStatus().equals(WorkOrderEnum.ZHUANGCHE_WAIT.orderStatus())) {
+                    // 等待中状态运单排队号
+                    if (workOrder.getQueueNo() != null) {
+                        workOrderPageListVO.setWorkOrderType(workOrderPageListVO.getWorkOrderType() + "(排号：" + workOrder.getQueueNo() + ")");
+                    }
+                }
             }
             if (workOrder.getType() == 2) {
-                workOrderPageListVO.setWorkOrderType("卸车·"+ WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+                workOrderPageListVO.setWorkOrderType("卸车·" + WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
             }