From 138b5fc883c3ccb25f4bed7114a60f93e78aaa9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 02 六月 2024 13:30:37 +0800
Subject: [PATCH] #条码检测
---
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 9070c6a..30cd109 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -48,7 +48,7 @@
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
+ convert1(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
}
@@ -105,6 +105,9 @@
if (!agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()))) {
throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
+ if (locMast.getLocSts().equals("O")) {
+ locMast.setBarcode("");
+ }
}
}
locMast.setModiUser(getUserId());
@@ -153,11 +156,13 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
public R init(LocMastInitParam param) {
//娓呯┖鍘熸湁搴撲綅
- agvLockMastService.clearLoc();
+// agvLockMastService.clearLoc();
+ //鍒濆鍖栦竴妤煎簱浣�
+ agvLockMastService.initLocFloor1();
//鍒濆鍖栦簩妤煎簱浣�
- agvLockMastService.initLocFloor2();
+// agvLockMastService.initLocFloor2();
//鍒濆鍖栦笁妤肩珯鐐�
- //agvLockMastService.initLocFloor3();
+// agvLockMastService.initLocFloor3();
return R.ok();
}
@@ -180,4 +185,16 @@
}
}
}
+ private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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(), val);
+ }
+ }
+ }
}
--
Gitblit v1.9.1