From 0d30daf9ee89603b97c6181c2949abbb89bd64c4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:37:10 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2
---
src/main/java/com/zy/asrs/controller/AgvIoWorkController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
index e7f1044..e7bc5c7 100644
--- a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
@@ -66,6 +66,10 @@
param.remove("row");
}
}
+ if(!Cools.isEmpty(param.get("floor"))){
+ wrapper.like("loc_no","@"+param.get("floor"));
+ param.remove("floor");
+ }
excludeTrash(param);
convert(param, wrapper);
allLike(AgvLocDetl.class, param.keySet(), wrapper, condition);
--
Gitblit v1.9.1