From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 18 一月 2025 17:06:18 +0800
Subject: [PATCH] # 6. 大屏添加作业类型 (全盘，还是分拣 IOType) 10.平库出库时，当前平库ID是写死在Sql里，需修改 11.平库出库没有判断是否预约出库，且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细，可以再次拣货，拣货明细需添加一个拣货状态 47. 确认发货前，需判断是否已绑定至集货区 48. CTU出库后，库位103不再删除原有库位信息
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java | 150 +++++++++++++++++++++++++-------------------------
1 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java
index f1d69ee..d73044d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java
@@ -1,75 +1,75 @@
-package com.zy.asrs.wms.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.wms.common.domain.BaseParam;
-import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.common.domain.PageResult;
-import com.zy.asrs.wms.system.entity.User;
-import com.zy.asrs.wms.system.mapper.UserMapper;
-import com.zy.asrs.wms.system.service.RoleMenuService;
-import com.zy.asrs.wms.system.service.UserRoleService;
-import com.zy.asrs.wms.system.service.UserService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service("userService")
-public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
-
- @Resource
- private UserRoleService userRoleService;
- @Resource
- private RoleMenuService roleMenuService;
- @Resource
- private BCryptPasswordEncoder bCryptPasswordEncoder;
-
- @Override
- public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
- return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap(true)), pageParam.getTotal());
- }
-
- @Override
- public User getByUsername(String username, Long hostId) {
- if (Cools.isEmpty(username)) {
- return null;
- }
- User user = baseMapper.selectByUsername(username, hostId);
- if (user != null) {
- user.setRoles(userRoleService.listByUserId(user.getId()));
- user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
- }
- return user;
- }
-
- @Override
- public User getByIdRel(Long userId) {
- User user = this.getById(userId);
- if (user != null) {
- user.setRoles(userRoleService.listByUserId(user.getId()));
- user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
- }
- return user;
- }
-
- @Override
- public boolean comparePassword(String dbPassword, String inputPassword) {
- return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
- }
-
- @Override
- public String encodePassword(String password) {
- return password == null ? null : bCryptPasswordEncoder.encode(password);
- }
-
- @Override
- public User superGetById(Long id) {
- return this.baseMapper.superGetById(id);
- }
-
- @Override
- public int removeByHostId(Long hostId) {
- return this.baseMapper.removeByHostId(hostId);
- }
-}
+package com.zy.asrs.wms.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.common.domain.PageResult;
+import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.system.mapper.UserMapper;
+import com.zy.asrs.wms.system.service.RoleMenuService;
+import com.zy.asrs.wms.system.service.UserRoleService;
+import com.zy.asrs.wms.system.service.UserService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service("userService")
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+ @Resource
+ private UserRoleService userRoleService;
+ @Resource
+ private RoleMenuService roleMenuService;
+ @Resource
+ private BCryptPasswordEncoder bCryptPasswordEncoder;
+
+ @Override
+ public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) {
+ return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap(true)), pageParam.getTotal());
+ }
+
+ @Override
+ public User getByUsername(String username, Long hostId) {
+ if (Cools.isEmpty(username)) {
+ return null;
+ }
+ User user = baseMapper.selectByUsername(username, hostId);
+ if (user != null) {
+ user.setRoles(userRoleService.listByUserId(user.getId()));
+ user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+ }
+ return user;
+ }
+
+ @Override
+ public User getByIdRel(Long userId) {
+ User user = this.getById(userId);
+ if (user != null) {
+ user.setRoles(userRoleService.listByUserId(user.getId()));
+ user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+ }
+ return user;
+ }
+
+ @Override
+ public boolean comparePassword(String dbPassword, String inputPassword) {
+ return bCryptPasswordEncoder.matches(inputPassword, dbPassword);
+ }
+
+ @Override
+ public String encodePassword(String password) {
+ return password == null ? null : bCryptPasswordEncoder.encode(password);
+ }
+
+ @Override
+ public User superGetById(Long id) {
+ return this.baseMapper.superGetById(id);
+ }
+
+ @Override
+ public int removeByHostId(Long hostId) {
+ return this.baseMapper.removeByHostId(hostId);
+ }
+}
--
Gitblit v1.9.1