root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增原材料出入库、在库管理

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-05 18:23:35 +08:00
parent 047199776d
commit 1c327b5e58
43 changed files with 8698 additions and 2095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
View File

@@ -47,7 +47,7 @@ public class SysRole implements Serializable {
/**
* 排序
*/
private BigDecimal orderSeq;
private BigDecimal order_seq;
/**
* 备注
@@ -57,44 +57,44 @@ public class SysRole implements Serializable {
/**
* 是否启用
*/
private String isUsed;
private String is_used;
/**
* 是否删除
*/
private String isDelete;
private String is_delete;
/**
* 创建人标识
*/
private String createId;
private String create_id;
/**
* 创建人
*/
private String createName;
private String create_name;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private Date create_time;
/**
* 修改人标识
*/
private String updateId;
private String update_id;
/**
* 修改人
*/
private String updateName;
private String update_name;
/**
* 修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private Date update_time;
/**
* 角色菜单id

20
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
View File

@@ -70,12 +70,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
// 插入
sysRole.setRoleId(IdUtil.getSnowflake(1, 1).nextIdStr());
sysRole.setCreateId(userId);
sysRole.setCreateName(nickName);
sysRole.setCreateTime(new Date());
sysRole.setUpdateId(userId);
sysRole.setUpdateName(nickName);
sysRole.setUpdateTime(new Date());
sysRole.setCreate_id(userId);
sysRole.setCreate_name(nickName);
sysRole.setCreate_time(new Date());
sysRole.setUpdate_id(userId);
sysRole.setUpdate_name(nickName);
sysRole.setUpdate_time(new Date());
roleMapper.insert(sysRole);
}
@@ -94,9 +94,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
String userId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
sysRole.setUpdateId(userId);
sysRole.setUpdateName(nickName);
sysRole.setUpdateTime(new Date());
sysRole.setUpdate_id(userId);
sysRole.setUpdate_name(nickName);
sysRole.setUpdate_time(new Date());
roleMapper.updateById(sysRole);
}
@@ -117,7 +117,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
Set<String> menuIds = new HashSet<>();
for (int i = 0; i < menus.size(); i++) {
JSONObject object = menus.getJSONObject(i);
menuIds.add(object.getString("menuId"));
menuIds.add(object.getString("menu_id"));
}
// 删除当前角色绑定的菜单
roleMapper.deleteRoleMenuBatchRoleIds(Arrays.asList(roleId));