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/common/web/BaseController.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 62c9fbe..995c3d9 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -2,11 +2,18 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.Node;
+import com.zy.asrs.entity.Tag;
+import com.zy.asrs.service.NodeService;
+import com.zy.asrs.service.TagService;
import com.zy.system.entity.User;
+import com.zy.system.entity.UserLogin;
+import com.zy.system.service.UserLoginService;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,19 +21,52 @@
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* Created by vincent on 2019-09-09
*/
public class BaseController extends AbstractBaseController {
+ protected static final String RANGE_TIME_LINK = " - ";
+
@Autowired
protected HttpServletRequest request;
@Autowired
private UserService userService;
+ @Autowired
+ private TagService tagService;
+ @Autowired
+ private NodeService nodeService;
+ @Autowired
+ private UserLoginService userLoginService;
+
+ protected Node getOriginNode(){
+ Node node = nodeService.getTop();
+ if (node == null) {
+ throw new CoolException("搴撳尯鏁版嵁閿欒");
+ }
+ return node;
+ }
+
+ protected Long getHostId(){
+ if (getUserId() == 9527) {
+ return null;
+ }
+ User user = getUser();
+ if (user.getRoleId() == 1) {
+ String hostId = String.valueOf(request.getAttribute("hostId"));
+ if (Cools.isEmpty(hostId)) {
+ UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ if (userLogin != null) {
+ return userLogin.getHostId();
+ }
+ }
+ return Long.parseLong(hostId);
+ } else {
+ return user.getHostId();
+ }
+ }
protected Long getUserId(){
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
@@ -50,6 +90,60 @@
return "";
}
+ protected Tag getOriginTag(){
+ return tagService.getTop();
+ }
+
+ protected <T> void hostEq(EntityWrapper<T> wrapper){
+ Long hostId = getHostId();
+ if (hostId != null) {
+ wrapper.eq("host_id", hostId);
+ }
+ }
+
+ /**
+ * 鍒嗛〉缁勮
+ * @param pageNumber
+ * @param pageSize
+ * @param map
+ * @param cls
+ * @param <T>
+ * @return
+ */
+ protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls){
+ // 鍒嗛〉绱㈠紩鍜屽崟椤垫暟閲忕粍瑁�
+ pageNumber = Optional.ofNullable(pageNumber).orElse(1);
+ pageSize = Optional.ofNullable(pageSize).orElse(10);
+ Page<T> page = new Page<>(pageNumber, pageSize);
+ map.put("pageNumber", pageNumber);
+ map.put("pageSize", pageSize);
+
+ // 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
+ if (!Cools.isEmpty(map.get("condition"))) {
+ Set<String> columns = new HashSet<>();
+ for (Field field : Cools.getAllFields(cls)){
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())){
+ continue;
+ }
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
+ if (!map.keySet().contains(column)) {
+ columns.add(column);
+ }
+ }
+ columns.forEach(col->map.put(col, map.get("condition")));
+ }
+ page.setCondition(map);
+ return page;
+ }
+
/**
* 鍏ㄥ瓧娈垫ā绯婃悳绱�
* @param cls 妯″瀷绫�
--
Gitblit v1.9.1