From b29e62bc51001c6ef934cd618869a2fb85657dba Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 05 二月 2026 16:59:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 17 ++++++++++++++++-
1 files changed, 16 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..1853dff 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,9 +164,23 @@
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 userConfigRow = -1;
+ int userConfirmBay = -1;
+ try {
+ String[] split = value.split("-");
+ userConfigRow = Integer.parseInt(split[0]);
+ userConfirmBay = Integer.parseInt(split[1]);
+ }catch (Exception e){}
+
+ if (userConfirmBay != -1) {
+ initRow = userConfigRow;
+ initBay = userConfirmBay;
}
HashMap<String, Object> locNoMap = new HashMap<>();
@@ -209,6 +223,7 @@
}
redisUtil.del(RedisKeyType.LOC_MAP_BASE.key);
+ redisUtil.del(RedisKeyType.LOC_MAST_MAP_LIST.key);
return R.ok();
}
--
Gitblit v1.9.1