FeiDaBaoKai/wms_server_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单点登录以及看板补货点功能更新

Browse Source
This commit is contained in:
梁州 2025-06-22 11:43:28 +08:00
parent 892c582abe
commit 9d9519513d
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/wms/controller/KateWorkQueryController.java
View File

@ -594,12 +594,16 @@ public class KateWorkQueryController {
// 没有看板数据，不需要生成看板需求 // 没有看板数据，不需要生成看板需求
continue; continue;
} }
if (pullGoods.getFeedingValue() == null || pullGoods.getFeedingValue().compareTo(BigDecimal.ZERO) <= 0) { if (pullGoods.getFeedingValue() == null) {
logger.error("看板物料信息缺少补货点。"); logger.error("看板物料信息缺少补货点。");
response.setCode(ResponseCode.ERROR.getCode()); response.setCode(ResponseCode.ERROR.getCode());
response.setMessage(pullGoods.getGoodsId() + "基础信息中缺少补货点或者补货点的值小于等于0。"); response.setMessage(pullGoods.getGoodsId() + "基础信息中缺少补货点。");
return convertJsonString(response); return convertJsonString(response);
} }
if (pullGoods.getFeedingValue().compareTo(BigDecimal.ZERO) <= 0) {
// 补货点小于等于0，不补货
continue;
}
// 最大容量 // 最大容量
BigDecimal maxNum = pullGoods.getKanbanNum().multiply(pullGoods.getQuantityPerKanban()); BigDecimal maxNum = pullGoods.getKanbanNum().multiply(pullGoods.getQuantityPerKanban());
// 目标数量 // 目标数量

16
src/main/java/com/wms/controller/UserController.java
View File

@ -220,19 +220,13 @@ public class UserController {
newUser.setUserName(kateUser.getName()); newUser.setUserName(kateUser.getName());
List<User> localUsers = userService.list(new LambdaQueryWrapper<User>() List<User> localUsers = userService.list(new LambdaQueryWrapper<User>()
.eq(User::getUserName, kateUser.getName())); .eq(User::getUserName, kateUser.getName()));
if (!localUsers.isEmpty()) {// 本地存在 if (localUsers != null && !localUsers.isEmpty()) {// 本地存在
newUser.setRoleId(localUsers.get(0).getRoleId()); newUser.setRoleId(localUsers.get(0).getRoleId());
} else { } else {
if (kateUser.getGroups().contains("CXL-ASRS-Admin")) {// 普通用户 logger.error("当前用户未登记，请先添加用户。{}", newUser.getUserName());
newUser.setRoleId(1); rsp.setCode(ResponseCode.ERROR.getCode());
} else if (kateUser.getGroups().contains("CXL-ASRS-User")) { rsp.setMessage("当前用户未登记，请先添加用户。");
newUser.setRoleId(2); return JSON.toJSONString(rsp);
} else {
logger.error("当前用户不被允许登录：{}", newUser.getUserName());
rsp.setCode(ResponseCode.ERROR.getCode());
rsp.setMessage("当前用户不被允许登录");
return JSON.toJSONString(rsp);
}
} }
// 返回成功 // 返回成功
logger.info("登录成功，登录用户：{}", newUser.getUserName()); logger.info("登录成功，登录用户：{}", newUser.getUserName());