From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 1ce5d11..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,12 +22,15 @@
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;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -96,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -115,10 +119,13 @@
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
}
- WaveSeed waveSeed = waveSeedService.getOne(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("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
}
+
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
if (Objects.isNull(task)) {
@@ -128,8 +135,14 @@
Map<String, Object> param = new HashMap<>();
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