增加返回所有任务给CTU

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java

@@ -125,6 +125,42 @@ public class CtuDeviceController {
         return ResultBean.newOkResult(shelfToLineTaskList);
     }
 
+
+
+    @ApiOperation("所有原材料CTU获取架子到线体的出库任务(出空箱到入料机构或出库到出料机构)")
+    @RequestMapping("/allShelfToLineTasks")
+    @AnonymousAccess
+    public ResultBean allShelfToLineTasks() {
+        List<DataLog> allTasks = taskService.getAllTasks();
+        allTasks = allTasks.stream().sorted(Comparator.comparing(DataLog::getCreateDate)).collect(Collectors.toList());
+        List<CtuTask> shelfToLineTaskList = new ArrayList<>();
+        for (DataLog dataLog : allTasks) {
+            if (dataLog.isCheckOutTask()) {
+                if (dataLog.isWait() || dataLog.isExecuting()) {
+                    String storageId = dataLog.getStorageId();
+                    Storage storage = dataCache.getStorageById(storageId);
+                    if (storage != null && !storage.isVirtual()) {
+                        CtuTask ctuTask = new CtuTask();
+                        ctuTask.setId(dataLog.getId());
+                        ctuTask.setBoxCode(dataLog.getBarcode());
+                        ctuTask.setTaskType(dataLog.getType());
+                        ctuTask.setFromLoc(dataLog.getPosName());
+                        //手动出空箱的目的地已经设置为In_FeedingInlet, 所以其他出库的未设置目的地的设置为Out_FeedingInlet
+                        String toLoc = dataLog.getLoc();
+                        if (Strings.isBlank(toLoc)) {
+                            toLoc = "Out_FeedingInlet";
+                        }
+                        ctuTask.setToLoc(toLoc);
+                        ctuTask.setCreateDate(dataLog.getCreateDate());
+                        ctuTask.setPriority(dataLog.getPriority());
+                        shelfToLineTaskList.add(ctuTask);
+                    }
+                }
+            }
+        }
+        return ResultBean.newOkResult(shelfToLineTaskList);
+    }
+
     @ApiOperation("修改任务状态")
     @RequestMapping("/updateTaskStatus")
     @AnonymousAccess