From 3238a2dd68e782bc2e5711016d140c61067c9409 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 03 二月 2026 16:43:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 31d7ee9..f9d151f 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -67,7 +67,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- if (entry.getKey().equals("loc_no")) {
+ if (entry.getKey().equals("loc_no") || entry.getKey().equals("row1") || entry.getKey().equals("bay1") || entry.getKey().equals("lev1")) {
wrapper.eq(entry.getKey(), val);
}else {
wrapper.like(entry.getKey(), val);
@@ -164,11 +164,21 @@
JSONObject map = row.get(j);
String nodeType = map.getString("type");
+ String value = map.getString("value");
if("shelf".equals(nodeType)) {
if(initBay == -1) {
initBay = 2;
}
+ int userConfirmBay = -1;
+ try {
+ userConfirmBay = (int) Double.parseDouble(value);
+ }catch (Exception e){}
+
+ if (userConfirmBay != -1) {
+ initBay = userConfirmBay;
+ }
+
HashMap<String, Object> locNoMap = new HashMap<>();
locNoMap.put("row", initRow);
locNoMap.put("bay", initBay);
--
Gitblit v1.9.1