From 7bd6e380475d1f4ec7a030dffcf0c217b879b0a5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 09:39:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

---
 src/main/java/com/zy/asrs/controller/AgvOpenController.java |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 4aa441f..702185d 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -71,15 +71,14 @@
         //save api log (appkey 鍚庣画娣诲姞)
 
         AppAuthUtil.auth("",param, request);
-
-        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
+        int wrkNo = Integer.parseInt(param.getTaskCode());
+        if(wrkNo < 0){
+            wrkNo = -wrkNo;
+        }
+        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
         if(Cools.isEmpty(agvWrkMast)){
             return R.error("浠诲姟缂栧彿閿欒");
         }
-
-//        if(!checkParam(param,agvWrkMast)){
-//            return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�");
-//        }
 
         AgvTask agvTask = AgvTask.valueOf(param.getEventType());
         Class<AgvTask> clz = AgvTask.class;
@@ -98,15 +97,6 @@
         return R.ok();
     }
 
-    private boolean checkParam(AgvTaskCallBackParam param, AgvWrkMast agvWrkMast){
-        if(!agvWrkMast.getLocNo().equals(param.getLocationCode())){
-            return false;
-        }
-        if(!agvWrkMast.getSourceLocNo().equals(param.getStationCode())){
-            return false;
-        }
-        return true;
-    }
 
 }
 

--
Gitblit v1.9.1