From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 116 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index fd42c5c..bb91be1 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -24,7 +24,7 @@
/**
* 閮ㄩ棬ID
*/
- private Long deptId;
+ private Long [] deptIds;
/**
* 鐢ㄦ埛鍞竴鏍囪瘑
@@ -71,35 +71,15 @@
*/
private SysUser user;
- public Long getUserId()
- {
- return userId;
- }
+ /**
+ * 绉熸埛ID
+ */
+ private Long tenantId;
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- public String getToken()
- {
- return token;
- }
-
- public void setToken(String token)
- {
- this.token = token;
- }
+ /**
+ * 褰撳墠閮ㄩ棬id
+ */
+ private Long currentDeptId;
public LoginUser()
{
@@ -111,12 +91,61 @@
this.permissions = permissions;
}
- public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+ public LoginUser(Long userId, Long [] deptId, SysUser user, Set<String> permissions)
{
this.userId = userId;
- this.deptId = deptId;
+ this.deptIds = deptId;
this.user = user;
this.permissions = 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()
+ {
+ return userId;
+ }
+
+ public void setUserId(Long userId)
+ {
+ this.userId = userId;
+ }
+
+ public Long [] getDeptIds()
+ {
+ return deptIds;
+ }
+
+ public void setDeptId(Long [] deptIds)
+ {
+ this.deptIds = deptIds;
+ }
+
+ public String getToken()
+ {
+ return token;
+ }
+
+ public void setToken(String token)
+ {
+ this.token = token;
}
@JSONField(serialize = false)
@@ -130,6 +159,11 @@
public String getUsername()
{
return user.getUserName();
+ }
+
+ public String getNickName()
+ {
+ return user.getNickName();
}
/**
@@ -263,4 +297,24 @@
{
return null;
}
+
+ public Long getTenantId() {
+ return 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;
+ }
}
--
Gitblit v1.9.3