From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/project/system/domain/SysDept.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/src/main/java/com/ruoyi/project/system/domain/SysDept.java
index ba12f15..54e53a7 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysDept.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysDept.java
@@ -4,6 +4,7 @@
import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,7 +32,7 @@
private String deptName;
/** 鏄剧ず椤哄簭 */
- private String orderNum;
+ private Integer orderNum;
/** 璐熻矗浜� */
private String leader;
@@ -50,6 +51,12 @@
/** 鐖堕儴闂ㄥ悕绉� */
private String parentName;
+
+ /** 閮ㄩ棬缂栧彿 */
+ private String deptNick;
+
+ /** 鍛樺伐鏁伴噺 */
+ private Integer staffCount;
/** 瀛愰儴闂� */
private List<SysDept> children = new ArrayList<SysDept>();
@@ -96,13 +103,13 @@
this.deptName = deptName;
}
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getOrderNum()
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ public Integer getOrderNum()
{
return orderNum;
}
- public void setOrderNum(String orderNum)
+ public void setOrderNum(Integer orderNum)
{
this.orderNum = orderNum;
}
@@ -180,6 +187,22 @@
this.children = children;
}
+ public String getDeptNick() {
+ return deptNick;
+ }
+
+ public void setDeptNick(String deptNick) {
+ this.deptNick = deptNick;
+ }
+
+ public Integer getStaffCount() {
+ return staffCount;
+ }
+
+ public void setStaffCount(Integer staffCount) {
+ this.staffCount = staffCount;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -187,6 +210,7 @@
.append("parentId", getParentId())
.append("ancestors", getAncestors())
.append("deptName", getDeptName())
+ .append("staffCount", getStaffCount())
.append("orderNum", getOrderNum())
.append("leader", getLeader())
.append("phone", getPhone())
--
Gitblit v1.9.3