From a55e3a5cff9cf3d2067c4ba3668c1331f28b7ca0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 29 三月 2024 08:31:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b77707d..48c4154 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -80,8 +80,16 @@
         if (Cools.isEmpty(param.getStatus())){
             return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
         }
-        openService.getAgvTaskOver(param);
-        return R.ok();
+        R agvTaskOver = openService.getAgvTaskOver(param);
+        apiLogService.save("AGV璇锋眰浠诲姟瀹屾垚"
+                ,request.getRemoteAddr()+request.getRequestURI()
+                ,appkey
+                ,request.getRemoteAddr()
+                ,JSON.toJSONString(param)
+                ,agvTaskOver.toString()
+                ,true
+        );
+        return agvTaskOver;
     }
 
     //鍒涘缓浠诲姟
@@ -161,9 +169,10 @@
             return R.error("鎵樼洏缂栫爜涓虹┖锛�");
         } else if (Cools.isEmpty(param.getWharfSource())){
             return R.error("婧愮爜澶翠负绌猴紒");
-        } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
-            return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
         }
+//        else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
+//            return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
+//        }
         R r = openService.AgvToWCSToWms(param);
         apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
                 ,request.getRemoteAddr()+request.getRequestURI()

--
Gitblit v1.9.1