From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/service/impl/UserServiceImpl.java | 145 +++++++++++++++++++++++++-----------------------
1 files changed, 75 insertions(+), 70 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 4a87d4f..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,70 +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);
- }
-}
+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