From 739497f903991ab3ec54fd314d5aa66f4a8dd6d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 六月 2025 13:37:23 +0800
Subject: [PATCH] 波次任务功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 96dcb4b..ae85f96 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -161,11 +161,17 @@
         }
         List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
         if (results.isEmpty()) {
-            waveService.update(new LambdaUpdateWrapper<Wave>()
-                    .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
-                    .set(Wave::getUpdateBy, loginUserId)
-                    .set(Wave::getUpdateTime, new Date())
-                    .eq(Wave::getId, waveId));
+            Wave wave = waveService.getById(waveId);
+            if (Objects.isNull(wave)) {
+                throw new CoolException("<UNK>");
+            }
+            wave.setUpdateBy(loginUserId).setUpdateTime(new Date());
+            if (wave.getAnfme().compareTo(wave.getWorkQty()) == 0) {
+                wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_TASK.val);
+            } else {
+                wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
+            }
+            waveService.updateById(wave);
             return R.ok();
         }
         /**鐢熸垚鍑哄簱浠诲姟*/

--
Gitblit v1.9.1