diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 56c7bed4..46b2e9ae 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -245,6 +245,18 @@ public class InvWarehouseController extends BaseController { invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.updateInvSubWarehouse(invWarehouseEntity); + //如果要是一级仓库就吧全部子集都刷成一样的寄售仓库 + if(StrUtil.isBlank(invWarehouseEntity.getParentCode())){ + List invWarehouseEntityList=invWarehouseService.selectLowWarehouseAll(invWarehouseEntity.getCode()); + for (InvWarehouseEntity obj : invWarehouseEntityList) { + obj.setAdvanceType(invWarehouseEntity.getAdvanceType()); + obj.setUpdateTime(new Date()); + invWarehouseService.updateInvSubWarehouse(obj); + } + } + + + //更新部门信息 DeptEntity pEntity = deptService.selectByCode(invWarehouseEntity.getParentId()); pEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index d98b8189..6d97faae 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -55,6 +55,9 @@ public class SysUserController extends BaseController { @Resource private AuthAdminService authAdminService; + @Resource + private DeptService deptService; + @GetMapping("/list") public BaseResponse list(FilterAuthUserRequest filterAuthUserRequest, BindingResult bindingResult) { @@ -77,10 +80,16 @@ public class SysUserController extends BaseController { List depts = new ArrayList<>(); String deptName = ""; for (DeptUserResponse deptUserResponse : deptUserResponses) { - depts.add(deptUserResponse.getDeptId()); - deptName = deptName + "," + deptUserResponse.getDeptName(); + if(deptUserResponse.getDeptId()!=1){ + depts.add(deptUserResponse.getDeptId()); + deptName = deptName + "," + deptUserResponse.getDeptName(); + } + } + if(deptName.length()!=0){ + authAdminResponse.setDeptName(deptName.substring(1)); + }else{ + authAdminResponse.setDeptName(deptName); } - authAdminResponse.setDeptName(deptName.substring(1)); authAdminResponse.setDepts(depts); } authAdminResponse.setRoles(roles); @@ -199,6 +208,11 @@ public class SysUserController extends BaseController { // sysUserRole.setUserId(authAdmin.getId()); // sysUserRole.setRoleId(sysUserRole1.getRoleId()); // userService.insertUserAuth1(sysUserRole); + //默认插入第一部门 + List deptCodeList=authUserSaveRequest.getDepts(); + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + //插入部门 @@ -276,6 +290,11 @@ public class SysUserController extends BaseController { userService.updateAuthAdmin(authAdmin); + //默认插入第一部门 + List deptCodeList=authUserSaveRequest.getDepts(); + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + //修改所属部门 deptUserService.deleteByUser(authUserSaveRequest.getId()); if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) { diff --git a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java index 02ad0e65..1dcebd8b 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; @@ -105,4 +106,6 @@ public interface InvWarehouseDao extends BaseMapperPlus selectLowWarehouseAll(@Param("pcode") String pCode); + } diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index f6527b90..ee8c001d 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.auth; +import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; @@ -85,4 +86,7 @@ public interface InvWarehouseService { String selectParentIdByCode( String invCode); List selectInvById(List InvList); + + + List selectLowWarehouseAll(String pCode); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 1cf3c979..2a757879 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -233,4 +233,9 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { public List selectInvById(List InvList) { return invWarehouseDao.selectInvById(InvList); } + + @Override + public List selectLowWarehouseAll(String pCode) { + return invWarehouseDao.selectLowWarehouseAll(pCode); + } } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index e292f6b2..7d4400c9 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -421,4 +421,14 @@ limit 1 + + +