From eb3aa089103a0cdd3d2d160e074c3df98026a99b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 23 六月 2025 13:48:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 4b61f5d..c4890eb 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
@@ -116,6 +116,13 @@
if (items.isEmpty()) {
throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
}
+
+ if (!waveItemService.update(new LambdaUpdateWrapper<WaveItem>()
+ .set(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_EXCE_STATUS_ING.val)
+ .in(WaveItem::getId, waveItems))) {
+ throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
+ }
+
/**鐢熸垚鍑哄簱浠诲姟*/
try {
generateOutTask(items, loginUserId, waves);
@@ -123,7 +130,7 @@
log.error("UNK", e);
throw new CoolException(e.getMessage());
}
- return null;
+ return R.ok();
}
/**
--
Gitblit v1.9.1