diff --git a/src/main/java/com/wms/controller/KateWorkQueryController.java b/src/main/java/com/wms/controller/KateWorkQueryController.java index 26c533d..4902a6a 100644 --- a/src/main/java/com/wms/controller/KateWorkQueryController.java +++ b/src/main/java/com/wms/controller/KateWorkQueryController.java @@ -594,12 +594,16 @@ public class KateWorkQueryController { // 没有看板数据,不需要生成看板需求 continue; } - if (pullGoods.getFeedingValue() == null || pullGoods.getFeedingValue().compareTo(BigDecimal.ZERO) <= 0) { + if (pullGoods.getFeedingValue() == null) { logger.error("看板物料信息缺少补货点。"); response.setCode(ResponseCode.ERROR.getCode()); - response.setMessage(pullGoods.getGoodsId() + "基础信息中缺少补货点或者补货点的值小于等于0。"); + response.setMessage(pullGoods.getGoodsId() + "基础信息中缺少补货点。"); return convertJsonString(response); } + if (pullGoods.getFeedingValue().compareTo(BigDecimal.ZERO) <= 0) { + // 补货点小于等于0,不补货 + continue; + } // 最大容量 BigDecimal maxNum = pullGoods.getKanbanNum().multiply(pullGoods.getQuantityPerKanban()); // 目标数量 diff --git a/src/main/java/com/wms/controller/UserController.java b/src/main/java/com/wms/controller/UserController.java index 35d8f80..5521a77 100644 --- a/src/main/java/com/wms/controller/UserController.java +++ b/src/main/java/com/wms/controller/UserController.java @@ -220,19 +220,13 @@ public class UserController { newUser.setUserName(kateUser.getName()); List localUsers = userService.list(new LambdaQueryWrapper() .eq(User::getUserName, kateUser.getName())); - if (!localUsers.isEmpty()) {// 本地存在 + if (localUsers != null && !localUsers.isEmpty()) {// 本地存在 newUser.setRoleId(localUsers.get(0).getRoleId()); } else { - if (kateUser.getGroups().contains("CXL-ASRS-Admin")) {// 普通用户 - newUser.setRoleId(1); - } else if (kateUser.getGroups().contains("CXL-ASRS-User")) { - newUser.setRoleId(2); - } else { - logger.error("当前用户不被允许登录:{}", newUser.getUserName()); - rsp.setCode(ResponseCode.ERROR.getCode()); - rsp.setMessage("当前用户不被允许登录"); - return JSON.toJSONString(rsp); - } + logger.error("当前用户未登记,请先添加用户。{}", newUser.getUserName()); + rsp.setCode(ResponseCode.ERROR.getCode()); + rsp.setMessage("当前用户未登记,请先添加用户。"); + return JSON.toJSONString(rsp); } // 返回成功 logger.info("登录成功,登录用户:{}", newUser.getUserName());