From fe1b02a121c173e9b2d56bbe5a1982e0e69e0548 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 28 四月 2026 18:06:08 +0800
Subject: [PATCH] feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ProductionOperationTaskController 提供工单的增删改查接口 - 开发 ProductionOperationTaskService 和实现类处理业务逻辑 - 配置 ProductionOperationTaskMapper 及 XML 文件实现数据库操作 - 添加 ProductionOperationTaskVo 视图对象用于数据展示 - 扩展 ProductionOrder 实体类增加生产订单相关属性 - 更新 ProductionOrderMapper.xml 完善订单查询映射配置 - 优化 ProductionOrderPickRecordMapper.xml 记录物料领取明细 - 新增 ProductionOrderRoutingOperationParam 参数配置实体 - 完善 工序参数处理逻辑
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index c1ce6ab..168202f 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -74,7 +74,14 @@
/**
* 绉熸埛ID
*/
- private Integer tenantId;
+ private Long tenantId;
+
+ /**
+ * 褰撳墠閮ㄩ棬id
+ */
+ private Long currentDeptId;
+
+ private String dataScope;
public LoginUser()
{
@@ -94,13 +101,23 @@
this.permissions = permissions;
}
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId, Set<String> permissions)
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId, Set<String> permissions)
{
this.userId = userId;
this.deptIds = deptIds;
this.user = user;
this.permissions = permissions;
this.tenantId = tenantId;
+ }
+
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId,Long currentDeptId, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptIds = deptIds;
+ this.user = user;
+ this.permissions = permissions;
+ this.tenantId = tenantId;
+ this.currentDeptId = currentDeptId;
}
public Long getUserId()
@@ -144,6 +161,11 @@
public String getUsername()
{
return user.getUserName();
+ }
+
+ public String getNickName()
+ {
+ return user.getNickName();
}
/**
@@ -278,11 +300,31 @@
return null;
}
- public Integer getTenantId() {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantId(Integer tenantId) {
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
-}
+
+ public void setDeptIds(Long[] deptIds) {
+ this.deptIds = deptIds;
+ }
+
+ public Long getCurrentDeptId() {
+ return currentDeptId;
+ }
+
+ public void setCurrentDeptId(Long currentDeptId) {
+ this.currentDeptId = currentDeptId;
+ }
+
+ public String getDataScope() {
+ return dataScope;
+ }
+
+ public void setDataScope(String dataScope) {
+ this.dataScope = dataScope;
+ }
+}
--
Gitblit v1.9.3