From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 10:20:25 +0800
Subject: [PATCH] java 优化库位检索逻辑，添加AGV工作明细服务，修复定时任务
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 6bad9f4..fc550f8 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -51,19 +51,24 @@
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}else {
- wrapper.orderBy("io_time", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ 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]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ if (entry.getKey().equals("manu_type")) {
+ wrapper.like(entry.getKey(), val);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
@@ -79,7 +84,7 @@
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
public R update(WrkMastLog wrkMastLog){
if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
- return R.error();
+ return R.error("涓嶅瓨鍦ㄥ伐浣滄。");
}
wrkMastLogService.updateById(wrkMastLog);
return R.ok();
@@ -90,7 +95,7 @@
public R delete(@RequestParam String param){
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟鏈笂浼�");
}
for (WrkMastLog entity : list){
wrkMastLogService.delete(new EntityWrapper<>(entity));
--
Gitblit v1.9.1