From 2816415f539ef54839e331657edae7055c243ad8 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期六, 17 一月 2026 19:27:45 +0800
Subject: [PATCH] agv缓存库位清空和标记功能
---
src/main/java/com/zy/asrs/controller/LocCacheController.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocCacheController.java b/src/main/java/com/zy/asrs/controller/LocCacheController.java
index 3d521b7..abd29a9 100644
--- a/src/main/java/com/zy/asrs/controller/LocCacheController.java
+++ b/src/main/java/com/zy/asrs/controller/LocCacheController.java
@@ -46,19 +46,22 @@
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}
- wrapper.eq("full_plt", "N");
+ // 绉婚櫎 full_plt = "N" 鐨勯檺鍒讹紝鍏佽鏌ヨ鎵�鏈夌姸鎬佺殑搴撲綅锛堝寘鎷弧鎵樺拰绌烘墭锛�
+ // 濡傛灉闇�瑕佸湪鍚庣绠＄悊椤甸潰杩囨护锛屽彲浠ュ湪鍓嶇杩涜杩囨护
return R.ok(locCacheService.selectPage(new Page<>(curr, limit), wrapper));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
+ // 灏嗛┘宄板懡鍚嶈浆鎹负涓嬪垝绾垮懡鍚嶏紙濡� locNo -> loc_no锛�
+ String columnName = humpToLine(entry.getKey());
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(columnName, DateUtils.convert(dates[0]));
+ wrapper.le(columnName, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.like(columnName, val);
}
}
}
@@ -136,4 +139,80 @@
return locCacheService.initLocCache(param, getUserId());
}
+ /**
+ * 閿佸畾/瑙ｉ攣缂撳瓨搴撲綅
+ * @param locNo 搴撲綅鍙�
+ * @param lock 鏄惁閿佸畾锛宼rue-閿佸畾锛宖alse-瑙ｉ攣
+ * @param fullPlt 鏄惁婊℃墭锛宼rue-婊℃墭锛堣缃负F锛夛紝false-绌烘墭锛堣缃负D锛夛紝瑙ｉ攣鏃跺彲涓虹┖
+ * @return 鎿嶄綔缁撴灉
+ */
+ @RequestMapping(value = "/locCache/lockOrUnlock/auth", method = RequestMethod.POST)
+ @ManagerAuth
+ public R lockOrUnlock(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) {
+ if (Cools.isEmpty(locNo)) {
+ return R.error("搴撲綅鍙蜂笉鑳戒负绌�");
+ }
+ if (lock == null) {
+ return R.error("閿佸畾鍙傛暟涓嶈兘涓虹┖");
+ }
+ return locCacheService.lockOrUnlockLocCache(locNo, lock, fullPlt, getUserId());
+ }
+
+ /**
+ * 閿佸畾/瑙ｉ攣褰撳墠鎺掔殑鎵�鏈夊簱浣�
+ * @param locNo 搴撲綅鍙凤紙鐢ㄤ簬鑾峰彇鎺掑彿锛�
+ * @param lock 鏄惁閿佸畾锛宼rue-閿佸畾锛宖alse-瑙ｉ攣
+ * @param fullPlt 鏄惁婊℃墭锛宼rue-婊℃墭锛堣缃负F锛夛紝false-绌烘墭锛堣缃负D锛夛紝瑙ｉ攣鏃跺彲涓虹┖
+ * @return 鎿嶄綔缁撴灉
+ */
+ @RequestMapping(value = "/locCache/lockOrUnlockRow/auth", method = RequestMethod.POST)
+ @ManagerAuth
+ public R lockOrUnlockRow(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) {
+ if (Cools.isEmpty(locNo)) {
+ return R.error("搴撲綅鍙蜂笉鑳戒负绌�");
+ }
+ if (lock == null) {
+ return R.error("閿佸畾鍙傛暟涓嶈兘涓虹┖");
+ }
+ return locCacheService.lockOrUnlockRowLocCache(locNo, lock, fullPlt, getUserId());
+ }
+
+ /**
+ * 閿佸畾/瑙ｉ攣褰撳墠鍒楃殑鎵�鏈夊簱浣�
+ * @param locNo 搴撲綅鍙凤紙鐢ㄤ簬鑾峰彇鍒楀彿bay1锛�
+ * @param lock 鏄惁閿佸畾锛宼rue-閿佸畾锛宖alse-瑙ｉ攣
+ * @param fullPlt 鏄惁婊℃墭锛宼rue-婊℃墭锛堣缃负F锛夛紝false-绌烘墭锛堣缃负D锛夛紝瑙ｉ攣鏃跺彲涓虹┖
+ * @return 鎿嶄綔缁撴灉
+ */
+ @RequestMapping(value = "/locCache/lockOrUnlockBay/auth", method = RequestMethod.POST)
+ @ManagerAuth
+ public R lockOrUnlockBay(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) {
+ if (Cools.isEmpty(locNo)) {
+ return R.error("搴撲綅鍙蜂笉鑳戒负绌�");
+ }
+ if (lock == null) {
+ return R.error("閿佸畾鍙傛暟涓嶈兘涓虹┖");
+ }
+ return locCacheService.lockOrUnlockBayLocCache(locNo, lock, fullPlt, getUserId());
+ }
+
+ /**
+ * 娓呯┖鏁存帓鐨勬墍鏈夊簱浣嶏紙鎵�鏈夊垪锛�
+ * @param locNo 搴撲綅鍙凤紙鐢ㄤ簬鑾峰彇鎺掑彿row1锛�
+ * @param lock 鏄惁閿佸畾锛宼rue-閿佸畾锛宖alse-瑙ｉ攣锛堟竻绌猴級
+ * @param fullPlt 鏄惁婊℃墭锛宼rue-婊℃墭锛堣缃负F锛夛紝false-绌烘墭锛堣缃负D锛夛紝瑙ｉ攣鏃跺彲涓虹┖
+ * @return 鎿嶄綔缁撴灉
+ */
+ @RequestMapping(value = "/locCache/clearAllColumnsInRow/auth", method = RequestMethod.POST)
+ @ManagerAuth
+ public R clearAllColumnsInRow(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) {
+ if (Cools.isEmpty(locNo)) {
+ return R.error("搴撲綅鍙蜂笉鑳戒负绌�");
+ }
+ if (lock == null) {
+ return R.error("閿佸畾鍙傛暟涓嶈兘涓虹┖");
+ }
+ return locCacheService.clearAllColumnsInRow(locNo, lock, fullPlt, getUserId());
+ }
+
}
--
Gitblit v1.9.1