feat: 优化看板出库接口，一个接口变成两个接口，让看板分别调用，重要的数据可以更新频繁一点，任务数据最多取8条。

易文鹏
1 parent c754247a
Showing 1 changed file with 20 additions and 29 deletions
src/main/java/com/huaheng/api/tv/controller/TvController.java
@@ -261,36 +261,14 @@ public class TvController extends BaseController {
         return TVResult.success(receiptTv2);
     }
  
-    //出库看板
-    @PostMapping("/getTvShipmentView")
-    @ResponseBody
-    //@ApiLogger(apiName = "看板出库", from = "TV")
-    public TVResult getTvShipmentView(@RequestBody Map<String, String> map) {
-        AllBean allBean = new AllBean();
-        String par = map.get("par");
-        String roadway = map.get("roadway");
-        //List<String> str = Arrays.asList("300", "400");
-        //List<TaskDetail> list = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>()
-        //        .in(TaskDetail::getTaskType, str)
-        //        .last(" and created >= CURRENT_DATE() and `status`>=100"));
-        //List<TopBean> topList = new ArrayList<>();
-        //if (!list.isEmpty()) {
-        //    topList = taskDetailService.getTvReceiptView("2");//出库物料统计
-        //}
-        //allBean.setTopList(topList);
-        //List<UpBean> upList = taskDetailService.getTvNotReceiptList("2");//获取未完成订单看板
-        //allBean.setUpList(upList);
-
-        RoadwayLocationStatus roadwayLocationStatus = getRoadwayLocationStatus(roadway);
-        //List<ShipmentDetailTv> portList = shipmentDetailMapper.getTvOutList(par);//当前站台出库明细
-        List<ShipmentDetailTv> portList = getShipmentDetailTaskByPort(par);//当前站台出库明细
-        allBean.setPortList(portList);
-        allBean.setRoadwayLocationStatus(roadwayLocationStatus);
-        return TVResult.success(allBean);
-    }
  
+    //-----------------------------------出库--------------------------------------
  
-    public List<ShipmentDetailTv> getShipmentDetailTaskByPort(String par) {
+    //出库看板 任务
+    @PostMapping("/getTvShipmentTask")
+    @ResponseBody
+    public TVResult getTvShipmentTask(@RequestBody Map<String, String> map) {
+        String par = map.get("par");
         List<ShipmentDetailTv> returnList = new ArrayList<>();
         List<TaskDetail> newShipmentDetailList = new ArrayList<>();
         // 按逗号分隔 par 字符串，得到多个 port
@@ -317,6 +295,9 @@ public class TvController extends BaseController {
         taskHeaderList.addAll(taskHeaderList1);
         taskHeaderList.addAll(taskHeaderList2);
  
+        // 取前8条任务
+        taskHeaderList = taskHeaderList.subList(0, Math.min(taskHeaderList.size(), 8));
+
         for (TaskHeader taskHeader : taskHeaderList) {
             List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
             newShipmentDetailList.addAll(taskDetailList);
@@ -337,7 +318,17 @@ public class TvController extends BaseController {
             }
             returnList.add(tv);
         }
-        return returnList;
+        return TVResult.success(returnList);
+    }
+
+
+    //出库看板 库位状态
+    @PostMapping("/getRoadwayLocationStatus")
+    @ResponseBody
+    public TVResult getRoadwayLocationStatus(@RequestBody Map<String, String> map) {
+        String roadway = map.get("roadway");
+        RoadwayLocationStatus roadwayLocationStatus = getRoadwayLocationStatus(roadway);
+        return TVResult.success(roadwayLocationStatus);
     }