From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案， 如何实现，对现有找库位规则进行整改，数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位，离线设备不分配 3、库位分配要均衡到每一个设备 4、库位高度需要匹配到对应库位信息，低库位能向上兼容 5、空托盘优先放在locType2库位=1的库位，没有这种库位了，允许放到其他库位 6、给入库站点设置有限去那些堆垛机，其次去那些堆垛机，弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置，当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频，如果是高频则从前往后找库位，如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用
---
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index f39f3f5..d1a65dd 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -34,30 +34,33 @@
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
+ @RequestParam(required = false, defaultValue = "asc")String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("sts_no", true);
+ }
return R.ok(basCrnStatusService.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()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/basCrnStatus/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佹坊鍔�")
public R add(BasCrnStatus basCrnStatus) {
basCrnStatus.setModiUser(getUserId());
basCrnStatus.setModiTime(new Date());
@@ -68,7 +71,7 @@
}
@RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
public R update(BasCrnStatus basCrnStatus){
if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
return R.error();
@@ -80,7 +83,7 @@
}
@RequestMapping(value = "/basCrnStatus/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
public R delete(@RequestParam String param){
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
if (Cools.isEmpty(list)){
@@ -93,7 +96,7 @@
}
@RequestMapping(value = "/basCrnStatus/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1