From a33d5ee3bd3907be492001ffba7969b468f86807 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期五, 12 四月 2024 10:04:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/RgvController.java      |    9 +++++++++
 src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java |    2 ++
 src/main/java/com/zy/core/MainProcess.java                   |    2 +-
 src/main/java/com/zy/asrs/controller/CrnController.java      |    8 +-------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e076aaf..e4fcfca 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -385,13 +385,7 @@
         return crnControl(command)?R.ok():R.error();
     }
 
-    @ManagerAuth(memo = "瑙i攣灏忚溅")
-    @PostMapping("/lock")
-    public R lock(CrnOperatorParam param){
-        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
-        rgvThread.setPakMk(true);
-        return R.ok();
-    }
+
 
 //    @ManagerAuth(memo = "鏆傚仠")
 //    @PostMapping("/operator/pause")
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 06c8f03..216929f 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -5,6 +5,7 @@
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.enums.RgvStatusType;
+import com.zy.asrs.domain.param.CrnOperatorParam;
 import com.zy.asrs.domain.param.RgvOperatorParam;
 import com.zy.asrs.domain.vo.RgvMsgTableVo;
 import com.zy.asrs.domain.vo.RgvStateTableVo;
@@ -217,6 +218,14 @@
         return rgvControl(command)? R.ok(): R.error();
     }
 
+    @ManagerAuth(memo = "瑙i攣灏忚溅")
+    @PostMapping("/lock")
+    public R lock(CrnOperatorParam param){
+        RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
+        rgvThread.setPakMk(true);
+        return R.ok();
+    }
+
     @ManagerAuth(memo = "浠诲姟瀹屾垚")
     @PostMapping("/operator/taskComplete")
     public R rgvTaskComplete(RgvOperatorParam param){
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
index f85698e..120bc71 100644
--- a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
@@ -35,4 +35,6 @@
     // 鐩爣搴撲綅-灞�
     private Short lev;
 
+    private Integer rgvNo;
+
 }
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3341f0a..de7ccb0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -45,7 +45,7 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     //鍒锋柊RGV鍦板浘
                     mainService.refreshRgvMap();
 

--
Gitblit v1.9.1