From 29af9f4ce47416f94d58ebffa7405dbeb8701244 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 四月 2024 16:45:20 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 b0c320d..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
@@ -6,11 +6,7 @@
import com.zy.asrs.wcs.core.map.service.MapService;
import com.zy.asrs.wcs.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* Created by vincent on 3/15/2024
@@ -23,6 +19,13 @@
private MapService mapService;
// @PreAuthorize("hasAuthority('core:map:list')")
+ @PostMapping("/floor/list")
+ public R floorList() {
+ return R.ok().add(mapService.getMapFloorList(getLoginUserId()));
+ }
+
+
+ // @PreAuthorize("hasAuthority('core:map:list')")
@PostMapping("/list")
public R mapList(@RequestBody MapQueryParam param) {
return R.ok().add(mapService.getMapData(param, getLoginUserId()));
@@ -30,10 +33,36 @@
// @PreAuthorize("hasAuthority('core:map:save')")
@PostMapping("/save")
- @Transactional
public R mapSave(@RequestBody MapDataParam param) {
mapService.saveMapData(param, getLoginUserId());
return R.ok();
}
+
+ // 璐ф灦 - 搴撲綅 --------------------------------------------------------
+ @GetMapping("/shelf/info")
+ public R shelfInfo(@RequestParam String locNo) {
+ 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")
+// public R conveyorPlcList() {
+// return R.ok().add(mapService.getShelfLocNoList(locNo));
+// }
+
}
--
Gitblit v1.9.1