From c01f7222dcd48a7263ee414287469c754e7de22c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
index f313881..6b9dd62 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
@@ -45,6 +45,19 @@
         return R.ok().add(mapService.getShelfLocNoList(locNo));
     }
 
+    // 绌挎杞� --------------------------------------------------------
+    @GetMapping("/shuttle/info")
+    public R shuttleInfo(@RequestParam String shuttleNo) {
+        return R.ok().add(mapService.getShuttleInfo(shuttleNo));
+    }
+
+    // 鎻愬崌鏈� --------------------------------------------------------
+    @GetMapping("/lift/info")
+    public R liftInfo(@RequestParam String liftNo) {
+        return R.ok().add(mapService.getLiftInfo(liftNo));
+    }
+
+
 
     // 杈撻�佺嚎 - 搴撲綅 --------------------------------------------------------
 //    @GetMapping("/conveyor/plc/list")

--
Gitblit v1.9.1