From dd3e73b101fec95d7277c93d0ab75c266a22e0e4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 24 二月 2025 16:01:24 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/RgvController.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 639cbd7..bf121b5 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -40,10 +40,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.rmi.CORBA.Util;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * RGV鎺ュ彛
@@ -475,13 +472,29 @@
 
 
     @PostMapping("/disable/rgv/status")
-//    @ManagerAuth(memo = "浣滀笟淇℃伅")
+//    @ManagerAuth(memo = "淇敼RGV鐘舵��")
     public R rgvDisableStatus(@RequestParam Integer rgvId,
                               @RequestParam Integer status){
+        log.info("/disable/rgv/status===銆嬩慨鏀筊GV鐘舵�侊紒锛侊紒rgvId:{},status:{},data:{}",rgvId,status,new Date());
         BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
+        if (basCircularShuttle == null){
+            return R.error().add("鏈壘鍒版RGV锛屽紓甯革紒锛侊紒");
+        }
         basCircularShuttle.setStatus(status);
         basCircularShuttleService.updateById(basCircularShuttle);
         return R.ok();
     }
 
+    @PostMapping("/disable/task/delete")
+//    @ManagerAuth(memo = "鍒犻櫎浠诲姟")
+    public R taskDisabledelete(@RequestParam Long wrkNo){
+        log.info("/disable/task/delete===銆嬪垹闄や换鍔★紒锛侊紒wrkNo:{},data:{}",wrkNo,new Date());
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+        if (Cools.isEmpty(wrkMast)){
+            return R.error().add("鏈壘鍒版浠诲姟锛屽紓甯革紒锛侊紒");
+        }
+        wrkMastService.deleteById(wrkMast);
+        return R.ok();
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1