From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index bb31f02..337af90 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -153,11 +153,15 @@
}
@PostMapping("/shelf/group")
- public R shelfGroup(@RequestParam(required = false) Integer row, @RequestParam(required = false) Integer bay) {
- if (null == row || null == bay) {
+ public R shelfGroup(@RequestParam(required = false) Integer rowNo,
+ @RequestParam(required = false) Integer bayNo) {
+ if (null == rowNo || null == bayNo) {
return R.error();
}
- List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getRow, row).eq(Loc::getBay, bay).orderByAsc(Loc::getLev));
+ List<Loc> locList = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getRowNo, rowNo)
+ .eq(Loc::getBayNo, bayNo)
+ .orderByAsc(Loc::getLevNo));
return R.ok().add(locList);
}
--
Gitblit v1.9.1