From 009d0f0a39fc84468b323433e2093fc877322bdb Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 11:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E7=B9=81?= =?UTF-8?q?=E5=BF=99=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=A2=84?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E6=8C=89=E8=B4=A7=E4=BD=8D=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/DeptController.java | 2 + .../controller/auth/DeptUserController.java | 19 +- .../controller/auth/InvBusUserController.java | 6 +- .../controller/auth/SysUserController.java | 46 ++-- .../basic/UdiRelevanceController.java | 2 - .../dao/auth/WarehouseBussinessTypeDao.java | 1 - .../glxp/api/entity/inout/IoOrderEntity.java | 8 + .../res/basic/BasicBussinessTypeResponse.java | 2 +- .../WarehouseBussinessTypeServiceImpl.java | 2 +- .../impl/BasicBussinessTypeServiceImpl.java | 3 +- .../mybatis/mapper/auth/AuthAdminDao.xml | 31 +-- .../resources/mybatis/mapper/auth/DeptDao.xml | 220 +++++++++++------- .../mybatis/mapper/auth/InvBusUserDao.xml | 79 ++++--- .../mapper/auth/WarehouseBussinessTypeDao.xml | 9 - .../mybatis/mapper/thrsys/ThrDeptDao.xml | 2 +- src/main/resources/schemas/schema_v2.1.sql | 6 +- 16 files changed, 242 insertions(+), 196 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 15391122..294806ed 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.auth; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -228,6 +229,7 @@ public class DeptController extends BaseController { deptEntity.setPcode(deptEntity.getPcode()); } deptEntity.setUpdateTime(new Date()); + deptEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = deptService.insertInvWarehouse(deptEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); diff --git a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java index 3110a227..62115df1 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -64,23 +64,28 @@ public class DeptUserController { @PostMapping("udi/auth/dept/user/delete") @Log(title = "用户管理", businessType = BusinessType.DELETE) public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) { - // 判断此用户是否创建单据 + // 判断此用户是否创建单据 List ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId()); - if( ioOrderEntities != null && ioOrderEntities.size() != 0 ){ - return ResultVOUtils.error(500,"该用户已创建单据,不能移除!"); + if (ioOrderEntities != null && ioOrderEntities.size() != 0) { + return ResultVOUtils.error(500, "该用户已创建单据,不能移除!"); } //判断此用户是否与仓库有关联 List listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + ""); - if( listWareHouse != null && listWareHouse.size() != 0){ - return ResultVOUtils.error(500,"该用户已绑定仓库,不能移除!"); + if (listWareHouse != null && listWareHouse.size() != 0) { + return ResultVOUtils.error(500, "该用户已绑定仓库,不能移除!"); } //判断此用户是否与除一级部门 还绑定其他部门 FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setUserId(deptUserEntity.getUserId()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); - if( deptUserEntities != null && deptUserEntities.size()>1){ - return ResultVOUtils.error(500,"该用户已绑定多个部门,不能移除!"); + for (int i = 0; i < deptUserEntities.size(); i++) { + if (deptUserEntities.get(i).getDeptId() == 1) { + deptUserEntities.remove(deptUserEntities.get(i)); + } + } + if (deptUserEntities != null && deptUserEntities.size() > 1) { + return ResultVOUtils.error(500, "该用户已绑定多个部门,不能移除!"); } diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index 53c6c52f..c0c5fad0 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.auth; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -131,15 +132,16 @@ public class InvBusUserController { @PostMapping("/spms/bus/user/warehouse/post") @Log(title = "用户管理", businessType = BusinessType.INSERT) public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { - boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { + invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); relBusRequset.getSelectActions().forEach(action -> { InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); invBusUserEntity.setUserId(relBusRequset.getUserId()); invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); invBusUserEntity.setScAction(action); - invBusUserService.insertInvBusUser(invBusUserEntity); + invBusUserEntity.setId(IdUtil.getSnowflakeNextId()); + invBusUserService.save(invBusUserEntity); }); } InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); 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 3beeeb25..f064d3f4 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -73,24 +74,24 @@ public class SysUserController extends BaseController { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); BeanUtils.copyProperties(item, authAdminResponse); List roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); - List deptUserResponses=null; - if("key".equals(filterAuthUserRequest.getKey())){ - deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); - }else{ - deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId()); + List deptUserResponses = null; + if ("key".equals(filterAuthUserRequest.getKey())) { + deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); + } else { + deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId()); } if (CollUtil.isNotEmpty(deptUserResponses)) { List depts = new ArrayList<>(); String deptName = ""; for (DeptUserResponse deptUserResponse : deptUserResponses) { - if(deptUserResponse.getDeptId()!=1){ + if (deptUserResponse.getDeptId() != 1) { depts.add(deptUserResponse.getDeptId()); deptName = deptName + "," + deptUserResponse.getDeptName(); } } - if(deptName.length()!=0){ + if (deptName.length() != 0) { authAdminResponse.setDeptName(deptName.substring(1)); - }else{ + } else { authAdminResponse.setDeptName(deptName); } authAdminResponse.setDepts(depts); @@ -194,7 +195,7 @@ public class SysUserController extends BaseController { String pid = invWarehouseService.selectParentIdByCode(authUserSaveRequest.getLocInvCode()); authAdmin.setLocDeptCode(pid); authAdmin.setLocInvCode(authUserSaveRequest.getLocInvCode()); - + authAdmin.setId(IdUtil.getSnowflakeNextId()); boolean b = userService.insertAuthAdmin(authAdmin); authAdmin = userService.findByUserName(authAdmin.getUserName()); if (!b) { @@ -212,15 +213,14 @@ public class SysUserController extends BaseController { // sysUserRole.setRoleId(sysUserRole1.getRoleId()); // userService.insertUserAuth1(sysUserRole); //默认插入第一部门 - List deptCodeList=authUserSaveRequest.getDepts(); - if(deptCodeList == null){ - deptCodeList=new ArrayList<>(); + List deptCodeList = authUserSaveRequest.getDepts(); + if (deptCodeList == null) { + deptCodeList = new ArrayList<>(); } deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); - //插入部门 if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) { List list = new ArrayList<>(); @@ -296,24 +296,24 @@ public class SysUserController extends BaseController { userService.updateAuthAdmin(authAdmin); - //默认插入第一部门 + //默认插入第一部门 ArrayList deptCodeList = new ArrayList<>(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); - if(deptUserEntities == null){ - deptCodeList.add(1L); - authUserSaveRequest.setDepts(deptCodeList); - }else{ - Boolean checkDeptId=false; + if (deptUserEntities == null) { + deptCodeList.add(1L); + authUserSaveRequest.setDepts(deptCodeList); + } else { + Boolean checkDeptId = false; for (DeptUserEntity deptUserEntity : deptUserEntities) { - if(deptUserEntity.getDeptId() == 1){ - checkDeptId=true; - }else{ + if (deptUserEntity.getDeptId() == 1) { + checkDeptId = true; + } else { deptCodeList.add(deptUserEntity.getDeptId()); } } - if(checkDeptId==false){ + if (checkDeptId == false) { deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 4e227480..46ba0cb8 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -379,12 +379,10 @@ public class UdiRelevanceController extends BaseController { //新增或修改关联 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/check/udi") - public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) { List keys = udiCombineRequest.getKeys(); if (keys != null && keys.size() > 0) { - List datas = udiRelevanceService.batchSelectByUuid(keys); if (datas.isEmpty()) { return ResultVOUtils.success("无被选入！"); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index bad14a81..c6fa891c 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -27,7 +27,6 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus list); - int batchInsert(@Param("list") List list); List selectListByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index b6b8fd5c..b8fbae06 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -243,5 +243,13 @@ public class IoOrderEntity { @TableField(value = "checkPreInOrders") private String checkPreInOrders; + + // 预验收按货位出库，退货 + @TableField(value = "checkPreInInvCode") + private String checkPreInInvCode; + + // 预验收按货位出库，退货 + @TableField(value = "checkPreInSpaceCode") + private String checkPreInSpaceCode; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 027a6590..f1a5e85c 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -12,7 +12,7 @@ public class BasicBussinessTypeResponse { /** * 单据类型ID */ - private Integer id; + private Long id; /** * 单据类型编码 diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index a7bbb12e..2a1624b4 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -68,7 +68,7 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType }); //加入新数据 - warehouseBussinessTypeDao.batchInsert(warehouseBussinessTypeEntities); + warehouseBussinessTypeDao.insertBatch(warehouseBussinessTypeEntities); } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 2d8a6d7b..cf64ea84 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -84,7 +84,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl().eq(basicBussinessTypeEntity.getId() != null, "id", basicBussinessTypeEntity.getId())); + if (null == basicBussinessTypeEntity.getId() || !isExit) { //处理添加新单据类型时的平衡补单逻辑 if (StrUtil.isNotBlank(basicBussinessTypeEntity.getSupplementOrderType())) { //查询平衡补单的单据类型数据是否存在 diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index cfa6f2ca..ca9ebd5b 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -6,8 +6,8 @@ resultType="com.glxp.api.entity.auth.AuthAdmin"> SELECT auth_user.*, auth_dept.name deptName, auth_warehouse.name warehouseName FROM auth_user - left join auth_dept on auth_user.locDeptCode = auth_dept.code - LEFT JOIN auth_warehouse on auth_user.locInvCode = auth_warehouse.code + left join auth_dept on auth_user.locDeptCode = auth_dept.code + LEFT JOIN auth_warehouse on auth_user.locInvCode = auth_warehouse.code AND id IN @@ -27,8 +27,8 @@ = DATE_FORMAT(#{lastUpdateTime} - , '%Y-%m-%d %H:%i:%S') + , '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime} + , '%Y-%m-%d %H:%i:%S') ]]> @@ -77,10 +77,10 @@ - INSERT INTO auth_user( userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag + INSERT INTO auth_user( id, userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag , employeeName, CustomerId, lastModifyTime, locDeptCode, locInvCode, comments) - values - (#{userName}, + values + (#{id}, #{userName}, #{passWord}, @@ -118,9 +118,10 @@ replace - INTO auth_user(id, userName, passWord, lastLoginIp, - lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId, locDeptCode, - locInvCode, comments) + INTO auth_user(id, userName, passWord, lastLoginIp, + lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId, + locDeptCode, + locInvCode, comments) values (#{id}, #{userName}, #{passWord}, @@ -189,7 +190,7 @@ - select * ,(select name from auth_dept WHERE a.pcode = code) pName + select *, (select name from auth_dept WHERE a.pcode = code) pName FROM auth_dept a @@ -18,7 +17,7 @@ AND a.code = #{code} - AND a.name like concat('%',#{name},'%') + AND a.name like concat('%', #{name}, '%') AND a.advanceType = #{advanceType} @@ -38,15 +37,14 @@ AND a.spUse = #{spUse} - - @@ -93,7 +90,6 @@ SELECT * FROM auth_dept WHERE id = #{id} - + UPDATE auth_dept - pid=#{pid}, - name=#{name}, - code=#{code}, - advanceType=#{advanceType}, - isDefault=#{isDefault}, - status=#{status}, - updateTime=#{updateTime}, - remark=#{remark}, - level=#{level}, - pcode=#{pcode}, - remark=#{thirdId}, - remark=#{thirdId1}, - remark=#{thirdId2}, - remark=#{thirdId3}, - remark=#{thirdId4}, - spUse=#{spUse}, - - + + pid=#{pid}, + + + name=#{name}, + + + code=#{code}, + + + advanceType=#{advanceType}, + + + isDefault=#{isDefault}, + + + status=#{status}, + + + updateTime=#{updateTime}, + + + remark=#{remark}, + + + level=#{level}, + + + pcode=#{pcode}, + + + remark=#{thirdId}, + + + remark=#{thirdId1}, + + + remark=#{thirdId2}, + + + remark=#{thirdId3}, + + + remark=#{thirdId4}, + + + spUse=#{spUse}, + WHERE id = #{id} replace into auth_dept (id, pid, code, `name`, advanceType, isDefault, status, - updateTime, remark, `level`, pcode, thirdId, thirdId1, thirdId2, thirdId3, - thirdId4,spUse) values + updateTime, remark, `level`, pcode, thirdId, thirdId1, thirdId2, thirdId3, + thirdId4, spUse) values (#{item.id}, - #{item.pid}, - #{item.code}, - #{item.name}, - #{item.advanceType}, - #{item.isDefault}, - #{item.status}, - #{item.updateTime}, - #{item.remark}, #{item.level}, - #{item.pcode}, #{item.thirdId}, - #{item.thirdId1}, #{item.thirdId2}, - #{item.thirdId3}, #{item.thirdId4},#{item.spUse}) + #{item.pid}, + #{item.code}, + #{item.name}, + #{item.advanceType}, + #{item.isDefault}, + #{item.status}, + #{item.updateTime}, + #{item.remark}, #{item.level}, + #{item.pcode}, #{item.thirdId}, + #{item.thirdId1}, #{item.thirdId2}, + #{item.thirdId3}, #{item.thirdId4}, #{item.spUse}) @@ -308,28 +334,42 @@ diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index 897eb5cf..d12c5d48 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -2,7 +2,6 @@ - - replace - INTO auth_user_bustype - (userId, `subInvCode`, scAction, remark) - values ( - #{userId}, - #{subInvCode}, - #{scAction}, - #{remark} - ) + INTO auth_user_bustype + (userId, `subInvCode`, scAction, remark) + values (#{userId}, + #{subInvCode}, + #{scAction}, + #{remark}) @@ -103,27 +95,34 @@ DELETE FROM auth_user_bustype - - - AND subInvCode = #{subInvCode} - - - and scAction in - - #{item} - - - + + + AND subInvCode = #{subInvCode} + + + and scAction in + + #{item} + + + UPDATE auth_user_bustype - userId=#{userId}, - subInvCode=#{subInvCode}, - scAction=#{scAction}, - remark=#{remark}, + + userId=#{userId}, + + + subInvCode=#{subInvCode}, + + + scAction=#{scAction}, + + + remark=#{remark}, + WHERE id = #{id} - diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 775664cf..54ee44bc 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -135,15 +135,6 @@ #{item.id,jdbcType=INTEGER} - - - insert into auth_warehouse_bustype - (code, `action`, `name`) - values - - (#{item.code,jdbcType=VARCHAR}, #{item.action,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}) - -