补充入库没有明细，wms任务就不下发给wcs

易文鹏
1 parent dd1c8518
Showing 2 changed files with 13 additions and 20 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -252,25 +252,18 @@ public class RyTask extends BaseController {
                     .ne(TaskHeader::getExceptionCode, "取货错误")
                     .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD));
  
-            // 获取所有任务头的ID集合
-            List<Integer> taskHeaderIds = taskHeaderList.stream().map(TaskHeader::getId).collect(Collectors.toList());
-
-            // 查询这些任务头中有任务明细的ID
-            List<Integer> taskDetailIds = taskDetailService.list(
-                            new LambdaQueryWrapper<TaskDetail>().in(TaskDetail::getTaskId, taskHeaderIds)  // 过滤出匹配的任务明细
-                    ).stream()
-                    .map(TaskDetail::getTaskId)
-                    .distinct()  // 去重以防同一任务有多条明细
-                    .collect(Collectors.toList());
-
-            // 过滤掉没有任务明细的任务头
-            List<TaskHeader> filteredTaskHeaderList = taskHeaderList.stream()
-                    .filter(taskHeader -> taskDetailIds.contains(taskHeader.getId()))
-                    .collect(Collectors.toList());
  
+            List<TaskHeader> excluded = new ArrayList<>();
+            for (TaskHeader taskHeader : taskHeaderList) {
+                List<TaskDetail> details = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
+                if (details.isEmpty() && taskHeader.getTaskType() == 200) {
+                    excluded.add(taskHeader);
+                }
+            }
+            taskHeaderList.removeAll(excluded);
  
             System.out.println("===============================自动下发任务===========" + taskHeaderList.size());
-            for (TaskHeader taskHeader : filteredTaskHeaderList) {
+            for (TaskHeader taskHeader : taskHeaderList) {
                 try {
                     taskHeaderService.sendTaskToWcs(Convert.toIntArray(String.valueOf(taskHeader.getId())));
                 } catch (Exception e) {
@@ -334,10 +334,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
  
  
-            List<TaskDetail> list = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskId));
-            if (list.isEmpty()) {
-                return AjaxResult.error("任务没有明细");
-            }
+            //List<TaskDetail> list = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskId));
+            //if (list.isEmpty()) {
+            //    return AjaxResult.error("任务没有明细");
+            //}
  
             // 给wcs传递任务
             AjaxResult ajaxResult = taskAssignService.wcsTaskAssign(task);