From 3bf6f972604761c9ac59a2cb9ea01eeacaec2189 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 15:43:51 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 32fc68c..5dfa697 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -94,11 +94,14 @@
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else if (entry.getKey().equals("loc_no")) {
wrapper.like(entry.getKey(), val);
- } else {
+ } else if (entry.getKey().equals("barcode")) {
+ wrapper.like(entry.getKey(), val);
+ }
+ else {
if (entry.getKey().equals("loc_type1")) {
sign = true;
}
@@ -365,8 +368,8 @@
locNoStr = split[1];
picPath += "_" + locNoStr;
}
- picList.add("http://" + WCS_URL + "/image/" + picPath + "-1.jpg");
- picList.add("http://" + WCS_URL + "/image/" + picPath + "-2.jpg");
+ picList.add("http://172.26.1.189:8080//" + picPath + ".jpg");
+ picList.add("http://172.26.1.189:8080//" + picPath + ".jpg");
LocPicDto locPicDto = new LocPicDto();
locPicDto.setLocNo(locNoStr);
--
Gitblit v1.9.1