From f40eca81fed1efa0ec7ab8659929187733e83eb0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 16:26:07 +0800
Subject: [PATCH] # 跨层移库禁止 吸塑移出

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index d5e8940..3d35a72 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -64,7 +64,7 @@
     }
 
     /*
-    缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+    缁戝畾璐ф灦鏉＄爜涓庢殏瀛樹綅
      */
     @PostMapping("/combBinging/auth")
     public R combBinding(@RequestBody Map<String,Object> map){
@@ -72,7 +72,7 @@
         String stationCode = map.get("stationCode").toString();
         Short containerType = Short.valueOf(barcode.substring(0,2));
         agvMobileService.combBinding(barcode,stationCode,containerType);
-        return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
+        return R.ok("璐ф灦缁戝畾绔欑偣鎴愬姛");
     }
 
     /*
@@ -118,6 +118,7 @@
     @PostMapping("/start/pakin/auth")
     @Synchronized
     @Transactional
+    @ManagerAuth(memo = "鍚姩鍏ュ簱")
     public R startPakin(@RequestBody AgvMobileStartPakin params){
         // 缁勬墭
         params.getCombParams().forEach(combParam -> {
@@ -134,6 +135,7 @@
      */
     @PostMapping("/pakin/empty/auth")
     @Synchronized
+    @ManagerAuth(memo = "绌烘澘鍏ュ簱")
     public R pakinEmpty(@RequestBody AgvMobileStartParam params){
 
         for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -149,6 +151,7 @@
      */
     @PostMapping("/pakout/empty/auth")
     @Synchronized
+    @ManagerAuth(memo = "绌烘澘鍑哄簱")
     public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
 
         for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -159,7 +162,7 @@
     }
 
     /*
-    绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+    绌烘澘鍑哄簱璐ф灦鐮侀�夋嫨
      */
     @PostMapping("/pakout/empty/container/selector/auth")
     public R containerType(@RequestBody HashMap<String,String> params){
@@ -215,6 +218,7 @@
     鐩樼偣鎺ュ彛
      */
     @PostMapping("/check/detl/v1")
+    @ManagerAuth(memo = "搴撳瓨鐩樼偣")
     public R checkLocDetl(@RequestBody HashMap<String,String> param){
 
         String locNo = param.get("locNo");
@@ -242,6 +246,7 @@
     鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
      */
     @PostMapping("/update/detl/v1")
+    @ManagerAuth(memo = "绾犳搴撲綅")
     public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
         String locNo = param.get("locNo");
         String containerCode = param.get("containerCode");
@@ -323,7 +328,7 @@
         }
 
         if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
-            return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+            return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
         }
 
 
@@ -482,6 +487,14 @@
         return R.ok();
     }
 
+    @PostMapping("/hand/control/handBack")
+    @Transactional
+    @ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
+    public R handBack(@RequestBody AgvMobileStartPakin param){
+        agvMobileService.handBack(param, getUserId());
+        return R.ok();
+    }
+
     public static void main(String[] args) {
         List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
         List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
@@ -516,9 +529,9 @@
         wrkMast.setSourceLocNo(sourceLocNo);
         //鐩爣绔欑偣
         wrkMast.setLocNo(locNo);
-        //瀹瑰櫒缂栫爜
+        //璐ф灦缂栫爜
         wrkMast.setBarcode(barcode);
-        //瀹瑰櫒绫诲瀷
+        //璐ф灦绫诲瀷
         wrkMast.setWhsType(containerType);
         // 鐩爣妤煎眰
         wrkMast.setCrnNo(floor);

--
Gitblit v1.9.1