From 71a7fffd983efe701f3c848c207fc9eb94ab1665 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 四月 2026 13:18:46 +0800
Subject: [PATCH] 1.数字孪生--库位和库存详情 新增按堆垛机去查库位
---
src/main/java/com/zy/asrs/service/DigitalTwinService.java | 2 +-
src/main/java/com/zy/asrs/controller/DigitalTwinController.java | 6 +++---
src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java | 9 ++++++---
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
index 464f86e..ff90413 100644
--- a/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
+++ b/src/main/java/com/zy/asrs/controller/DigitalTwinController.java
@@ -112,13 +112,13 @@
/**
* 搴撲綅鍜屽簱瀛樿鎯�
*
- * @param areaId
+ * @param arr
* @return
*/
@RequestMapping(value = "/warehouseDetail")
// @ManagerAuth
- public R warehouseDetail(@RequestParam(required = false) String areaId) {
- return R.ok(digitalTwinService.warehouseDetail(areaId));
+ public R warehouseDetail(@RequestParam(required = false) Integer[] arr) {
+ return R.ok(digitalTwinService.warehouseDetail(arr));
}
/**
* 鏌ヨ鎵�鏈夊簱浣嶇姸鎬佸拰鐗╂枡-浜屾満搴婁俊鎭寲鏁板瓧瀛敓鐢�
diff --git a/src/main/java/com/zy/asrs/service/DigitalTwinService.java b/src/main/java/com/zy/asrs/service/DigitalTwinService.java
index f59c1c4..2c1b4a1 100644
--- a/src/main/java/com/zy/asrs/service/DigitalTwinService.java
+++ b/src/main/java/com/zy/asrs/service/DigitalTwinService.java
@@ -53,7 +53,7 @@
* @param areaId
* @return
*/
- List<LocMast> warehouseDetail(String areaId);
+ List<LocMast> warehouseDetail(Integer[] arr);
/**
* 杩戞湡鍓╀綑搴撲綅鏁伴噺锛岄粯璁�7澶�
diff --git a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
index 8be482d..b34a1a7 100644
--- a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
@@ -220,11 +220,14 @@
/**
* 鏌ヨ搴撳瓨鍜屽簱浣嶈缁嗕俊鎭�
*
- * @param areaId
+ * @param arr
* @return
*/
- public List<LocMast> warehouseDetail(String areaId) {
- return locMastService.selectList(new EntityWrapper<>());
+ public List<LocMast> warehouseDetail(Integer[] arr) {
+ if (arr == null || arr.length == 0) {
+ return locMastService.selectList(new EntityWrapper<>());
+ }
+ return locMastService.selectList(new EntityWrapper<LocMast>().in("crn_no", Arrays.asList(arr)));
}
/**
--
Gitblit v1.9.1