From 60d14252f4951b1229e5699a0aa3c993f4ad173d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 25 四月 2024 23:10:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index be0183d..f07fba4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -107,7 +107,7 @@
AgvBasDevp agvBasDevp = JSONArray.parseObject(param,AgvBasDevp.class);
//鑻ュ綋鍓嶇珯鐐硅揣浣嶇姸鎬佷笉涓篎.鍦ㄥ簱鐘舵�侊紝鍒欒繑鍥為敊璇�
- if(!agvBasDevp.getLocSts().equals("F")){
+ if(!agvBasDevp.getLocSts().equals("F") && !agvBasDevp.getLocSts().equals("R")){
return R.error("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙ｉ櫎缁戝畾");
}
agvBasDevp.setLocSts("O");
--
Gitblit v1.9.1