From d52bab61f91056e75e60ddeda76a72cd1bd63615 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 07 八月 2025 14:40:00 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index 2e98334..6d62137 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -8,15 +8,22 @@
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.util.Map;
import java.util.Objects;
+
+import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
/**
* 澶у睆鎿嶄綔鍩烘湰鍔熻兘
*/
+@Slf4j
@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -63,9 +70,10 @@
throw new CoolException("璇锋眰鍙傛暟锛氫换鍔＄紪鐮佷笉鑳戒负绌猴紒锛�");
}
String taskNoStr = (String) param.get("taskNo");
+ String waveNo = param.get("waveNo").toString();
// Long matnr = Long.valueOf(taskNo.get("matnr").toString());
- return waveManagentService.getTaskDetlQutify(taskNoStr);
+ return waveManagentService.getTaskDetlQutify(taskNoStr, waveNo);
}
/**
@@ -74,7 +82,8 @@
*/
@GetMapping("/seed/locs")
public R getSeedLoc() {
- return waveManagentService.AllSeedLocs();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.AllSeedLocs(request);
}
/***
@@ -84,7 +93,8 @@
*/
@GetMapping("/sow/tasks")
public R getTasks() {
- return waveManagentService.getTask();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.getTask(request);
}
/**
@@ -104,6 +114,10 @@
if (Objects.isNull(reviewParam.getWaveSeedId())) {
return R.error("鎾鏄庣粏鏍囪瘑涓嶈兘涓虹┖锛侊紒");
}
+// if (Objects.isNull(reviewParam.getSiteNo())) {
+// return R.error("鎾绔欑偣涓嶈兘涓虹┖锛侊紒");
+// }
+
return waveManagentService.reviewSeeds(reviewParam);
}
--
Gitblit v1.9.1