From 66f482d6b979f4988f425d029ea4be3c6ec52471 Mon Sep 17 00:00:00 2001 From: yangyang Date: 星期六, 21 六月 2025 16:14:13 +0800 Subject: [PATCH] no message --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 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 ce2cf7c..d59b241 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 @@ -3,15 +3,27 @@ import com.mysql.cj.util.StringUtils; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; +import com.zy.asrs.wms.apis.wcs.entity.request.RfidSingalRequest; +import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse; 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 { @@ -45,6 +57,7 @@ /** * 澶у睆鑾峰彇浠诲姟鏄庣粏 + * 鑾峰彇褰撳墠鎾涓叿浣撲换鍔℃槑缁� * @param param * @return */ @@ -68,20 +81,24 @@ */ @GetMapping("/seed/locs") public R getSeedLoc() { - return waveManagentService.AllSeedLocs(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + return waveManagentService.AllSeedLocs(request); } /*** * 澶у睆鑾峰彇鍑哄簱鍒楄〃 + * 鑾峰彇褰撳墠鎾涓墽琛屾暟鎹� * @return */ @GetMapping("/sow/tasks") public R getTasks() { - return waveManagentService.getTask(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + return waveManagentService.getTask(request); } /** - * 瀹℃牳鎾鐘舵�佷换鍔� + * 娉㈡鎾 + * 鎾鏄庣粏鏁伴噺淇敼 * @param reviewParam * @return */ @@ -126,4 +143,7 @@ return waveManagentService.getAllOrders(waveNo); } + + + } -- Gitblit v1.9.1