UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓库用户相关问题修改

Browse Source
master
anthonywj 2 years ago
parent 86b7e95a1d
commit 2bffc13f85
6 changed files with 77 additions and 70 deletions
Show Stats Download Patch File Download Diff File

21
src/main/java/com/glxp/api/controller/auth/AuthUserController.java
Unescape Escape View File

@ -87,23 +87,18 @@ public class AuthUserController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("/admin/auth/admin/selectNotSelectUser")
public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) {
filterInvLinkDataRequest.setKey("1");
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
List<Long> list = new ArrayList<>();
if (filterInvLinkDataRequest.getListUser() != null && filterInvLinkDataRequest.getListUser().length > 0)
for (Long aLong : filterInvLinkDataRequest.getListUser()) {
list.add(aLong);
}
List<WarehouseUserEntity> warehouseUserEntities1 = warehouseUserService.selectNotSelectUserid(list);
//获取当前仓库已关联用户
FilterInvLinkDataRequest temRequest = new FilterInvLinkDataRequest();
temRequest.setCode(filterInvLinkDataRequest.getCode());
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.getWarehouseUserList(temRequest);
List<Long> userIds = new ArrayList<>();
for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities1) {
for (WarehouseUserEntity warehouseUserEntity : warehouseUserEntities) {
userIds.add(warehouseUserEntity.getUserid());
}
// List<Long> userIds = new ArrayList<>();
// warehouseUserEntities.forEach(user -> {
// userIds.add(user.getUserid());
// });
//过滤当前已关联用户
FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest();
BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest);
filterNoSelectUserRequest.setUserIds(userIds);

46
src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
Unescape Escape View File

@ -73,7 +73,7 @@ public class InvWarehouseController extends BaseController {
// PageInfo<InvSubWarehouseResponse> pageInfo = new PageInfo<>(responses);
// PageSimpleResponse<InvSubWarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// pageSimpleResponse.setList(responses);
// pageSimpleResponse.setList(responses);
return ResultVOUtils.success(responses);
}
@ -218,7 +218,7 @@ public class InvWarehouseController extends BaseController {
boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName());
if (checkResult) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "分库名称重复！");
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！");
}
FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest();
@ -248,7 +248,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/spms/sub/inv/warehouse/edit")
public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult,FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
BindingResult bindingResult, FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
@ -256,31 +256,17 @@ public class InvWarehouseController extends BaseController {
if (invWarehouseEntity.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
//判断仓库是否存在
ArrayList<InvWarehouseEntity> list = new ArrayList<>();
filterInvSubWarehouseRequest.setParentId(invWarehouseEntity.getParentId());
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
for (InvWarehouseEntity warehouseEntity : invWarehouseEntities) {
if(invWarehouseEntity.name.equals(warehouseEntity.getName()) && invWarehouseEntity.getParentCode().equals(warehouseEntity.getParentCode())){
list.add(warehouseEntity);
}
}
if(list.size()==0){
boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
pEntity.setUpdateTime(new Date());
deptService.updateInvWarehouse(pEntity);
boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId());
pEntity.setUpdateTime(new Date());
deptService.updateInvWarehouse(pEntity);
return ResultVOUtils.success("修改成功！");
}else{
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("修改成功！");
}
@ -401,12 +387,12 @@ public class InvWarehouseController extends BaseController {
filterInvLinkDataRequest.setUserName(null);
filterInvLinkDataRequest.setEmployeeName(filterInvLinkDataRequest.getKey());
List<WarehouseUserEntity> warehouseUserList1 = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest);
PageInfo<WarehouseUserEntity> pageInfo=null;
if(warehouseUserList.size()!=0){
pageInfo= new PageInfo<>(warehouseUserList);
}else if(warehouseUserList1.size()!=0){
pageInfo = new PageInfo<>(warehouseUserList1);
}else{
PageInfo<WarehouseUserEntity> pageInfo = null;
if (warehouseUserList.size() != 0) {
pageInfo = new PageInfo<>(warehouseUserList);
} else if (warehouseUserList1.size() != 0) {
pageInfo = new PageInfo<>(warehouseUserList1);
} else {
pageInfo = new PageInfo<>(warehouseUserList);
}

8
src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
Unescape Escape View File

@ -122,13 +122,7 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
}
if (filterInvLinkDataRequest.getPage() != null) {
int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit();
if("1".equals(filterInvLinkDataRequest.getKey())){
PageHelper.startPage (offset, filterInvLinkDataRequest.getLimit());
}else{
PageHelper.offsetPage (offset, filterInvLinkDataRequest.getLimit());
}
PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit());
}
return warehouseUserDao.selectListkey(filterInvLinkDataRequest);
}

4
src/main/resources/application-dev.yml
Unescape Escape View File

@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: Glxp@6066
password: 123456
hikari:
connection-timeout: 60000
maximum-pool-size: 60

31
src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
Unescape Escape View File

@ -2,11 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.auth.AuthAdminDao">
<select id="listAdminPage" parameterType="com.glxp.api.req.auth.FilterAuthUserRequest"
resultType="com.glxp.api.entity.auth.AuthAdmin">
SELECT auth_user.*,auth_dept.name deptName
FROM auth_user left join auth_dept on auth_user.locDeptCode = auth_dept.code
SELECT auth_user.*, auth_dept.name deptName
FROM auth_user
left join auth_dept on auth_user.locDeptCode = auth_dept.code
<where>
<if test="ids != null and ids.size > 0">
AND id IN
@ -18,20 +18,24 @@
AND userFlag = #{userFlag}
</if>
<if test="userName != null and '' != userName">
AND userName LIKE CONCAT(#{userName},'%')
AND userName LIKE CONCAT(#{userName}, '%')
</if>
<if test="neUserName != null and '' != neUserName">
AND userName != #{neUserName}
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(lastModifyTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(lastModifyTime
, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}
, '%Y-%m-%d %H:%i:%S')
]]>
</if>
<if test="deptCode != null and deptCode != ''">
AND auth_user.locDeptCode = #{deptCode}
</if>
</where>
ORDER BY id
DESC
DESC
</select>
<select id="findByUserName" parameterType="hashmap" resultType="com.glxp.api.entity.auth.AuthAdmin">
@ -157,7 +161,7 @@
comments=#{comments},
</if>
</set>
WHERE id=#{id}
WHERE id = #{id}
</update>
<delete id="deleteById" parameterType="java.lang.Long">
@ -175,17 +179,18 @@
<select id="selectNotSelectUser" resultType="com.glxp.api.entity.auth.AuthAdmin">
select *
from auth_user
<where>
userFlag != 0
<if test="userIds != null and userIds.size()!=0">
<if test="userIds != null and userIds.size() != 0">
and id not in
<foreach collection="userIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</select>
@ -197,10 +202,9 @@
left join auth_role r on r.role_id = sur.role_id
<where>
<if test="roleId != null and '' != roleId">
AND r.role_id =#{roleId}
AND r.role_id = #{roleId}
</if>
</where>
</select>
@ -225,6 +229,5 @@
AND u.user_name LIKE concat('%', #{userName}, '%')
</if>
</where>
</select>
</mapper>

37
src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml
Unescape Escape View File

@ -128,7 +128,8 @@
parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
replace
INTO auth_warehouse
(id, code, `name`, parentId, remark,defaultInv,parentCode)
(id, code, `name`, parentId, remark,defaultInv,parentCode
,thirdId,thirdId1,thirdId2,thirdId3,thirdId4)
values (
#{id},
#{code},
@ -136,7 +137,12 @@
#{parentId},
#{remark},
#{defaultInv},
#{parentCode}
#{parentCode},
#{thirdId},
#{thirdId1},
#{thirdId2},
#{thirdId3},
#{thirdId4}
)
</insert>
@ -175,6 +181,21 @@
<if test="parentCode != null">
parentCode=#{parentCode},
</if>
<if test="thirdId != null">
thirdId=#{thirdId},
</if>
<if test="thirdId1 != null">
thirdId1=#{thirdId1},
</if>
<if test="thirdId2 != null">
thirdId2=#{thirdId2},
</if>
<if test="thirdId3 != null">
thirdId3=#{thirdId3},
</if>
<if test="thirdId4 != null">
thirdId4=#{thirdId4},
</if>
</trim>
WHERE id = #{id}
</update>
@ -182,9 +203,12 @@
<insert id="importInvSubWarehouse" parameterType="java.util.List">
replace
into auth_warehouse
(id, code, `name`, parentId, remark,defaultInv,parentCode)
(id, code, `name`, parentId, remark,defaultInv,parentCode,thirdId,thirdId1,thirdId2,thirdId3,thirdId4)
values
<foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
(
#{item.id},
@ -193,7 +217,12 @@
#{item.parentId},
#{item.remark},
#{item.defaultInv},
#{item.parentCode}
#{item.parentCode},
#{item.thirdId},
#{item.thirdId1},
#{item.thirdId2},
#{item.thirdId3},
#{item.thirdId4}
)
</foreach>
</insert>

Write Preview
Loading…
Cancel
Save