From 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期一, 14 七月 2025 06:36:36 +0800
Subject: [PATCH] no message

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index 9572fb5..656ca8f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -59,13 +59,13 @@
     /**
      * @author Ryan
      * @date 2025/6/20
-     * @description: 娉㈡鍔犲叆鍘嗗彶妗�
+     * @description: 鏇存柊娉㈡鏄庣粏锛屽姞鍏ュ巻鍙叉。
      * @version 1.0
      */
     @Scheduled(cron = "0/30 * * * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void addWaveHistories() {
-        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
+        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.UPDATED_OUT.id));
         if (tasks.isEmpty()) {
             return;
         }
@@ -143,7 +143,10 @@
                         continue;
                     }
                     // 杩囨护宸茬粡鐢熸垚娉㈡鎾鏁版嵁鐨勪换鍔�  璇ヤ换鍔$殑浠诲姟鏄庣粏鍙蜂笉鑳藉湪鎾鏁版嵁琛ㄩ噷闈�
-                    long count = waveSeedService.count(new LambdaQueryWrapper<WaveSeed>().in(WaveSeed::getTaskDetlId, taskDetls.stream().map(TaskDetl::getId).collect(Collectors.toList())).eq(WaveSeed::getHostId, hostId));
+                    long count = waveSeedService.count(new LambdaQueryWrapper<WaveSeed>()
+                            .in(WaveSeed::getTaskDetlId, taskDetls.stream()
+                                    .map(TaskDetl::getId).collect(Collectors.toList()))
+                            .eq(WaveSeed::getHostId, hostId));
                     if (count > 0) {
                         continue;
                     }
@@ -207,10 +210,12 @@
                             waveSeed.setOrderNo(orderDetl.getOrderNo());
                             waveSeed.setOrderId(orderDetl.getOrderId());
                             waveSeed.setOrderDetlId(orderDetl.getId());
+                            waveSeed.setTaskId(taskDetl.getTaskId());
+                            waveSeed.setTaskNo(taskDetl.getTaskNo());
                             waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());
                             waveSeed.setTaskDetlId(taskDetl.getId());
                             //涓烘弧瓒冲綋鍓嶉渶姹傦紝缁忕‘璁わ紝鏀规垚璁㈠崟鏁伴噺
-                            waveSeed.setAnfme(orderDetl.getAnfme());
+                            waveSeed.setAnfme(taskDetl.getAnfme());
                             waveSeed.setWorkQty(0D);
                             waveSeed.setMatnr(taskDetl.getMatnr());
                             waveSeed.setBatch(taskDetl.getBatch());

--
Gitblit v1.9.1