From 6a3d53b9195e15583af25322afa25de39be183a6 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 06 三月 2024 11:22:39 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/AgvLocMastController.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index e287d77..f1ff9b3 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -17,10 +17,7 @@
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
@@ -104,15 +101,21 @@
     @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
     public R init(LocMastInitParam param) {
         //娓呯┖鍘熸湁搴撲綅
-        agvLockMastService.clearLoc();
+        //agvLockMastService.clearLoc();
         //鍒濆鍖栦竴妤肩珯鐐�
-        agvLockMastService.initLocFloor1();
+        //agvLockMastService.initLocFloor1();
         //鍒濆鍖栦笁妤肩珯鐐�
         agvLockMastService.initLocFloor3();
 
         return R.ok();
     }
 
+    @RequestMapping(value = "/locMast/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(agvLockMastService.selectById(String.valueOf(id)));
+    }
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             String val = String.valueOf(entry.getValue());

--
Gitblit v1.9.1