From efa392d963d11000ef22c6778684648042a80ac6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:19:33 +0800
Subject: [PATCH] 8月8号问题修复
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 7d7c5e2..96fd17d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -22,6 +22,7 @@
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -98,6 +99,7 @@
* 鎾澧欐媿鐏紝ESS璋冪敤
*/
@PostMapping("/light/off")
+ @Transactional(rollbackFor = Exception.class)
public R lightOff(@RequestBody Map<String, Object> request) {
if (Objects.isNull(request)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -117,26 +119,30 @@
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
}
- List<WaveSeed> waveSeed = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
+ WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>()
+ .eq(WaveSeed::getExceStatus, 1)
+ .eq(WaveSeed::getSiteNo, request.get("tagCode").toString()), false);
if (Objects.isNull(waveSeed)) {
throw new CoolException("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
}
- List<Long> taskIds = waveSeed.stream().map(WaveSeed::getTaskId).collect(Collectors.toList());
-
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds));
- if (tasks.isEmpty()) {
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
+ if (Objects.isNull(task)) {
throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
}
- List<String> taskNos = tasks.stream().map(Task::getTaskNo).collect(Collectors.toList());
-
Map<String, Object> param = new HashMap<>();
- param.put("taskNo", taskNos);
+ param.put("taskNo", task.getTaskNo());
param.put("siteNo", cacheSite.getSiteNo());
+ param.put("weedId", waveSeed.getId());
param.put("orderNo",cacheSite.getOrderNo());
+ waveSeed.setExceStatus(0);
+ if (!waveSeedService.updateById(waveSeed)) {
+ throw new CoolException("鎾鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
return wcsApiService.slapLightLogic(param);
}
--
Gitblit v1.9.1