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/staff/dto/StaffLeaveDto.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
index d615c7f..3685410 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
@@ -1,11 +1,8 @@
package com.ruoyi.staff.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffLeave;
import lombok.Data;
-
-import java.util.Date;
@Data
public class StaffLeaveDto extends StaffLeave {
@@ -45,48 +42,61 @@
/**
* 宀椾綅
*/
- @Excel(name = "宀椾綅",sort = 7)
+ @Excel(name = "閮ㄩ棬",sort = 7)
+ private String deptName;
+
+ /**
+ * 宀椾綅
+ */
+ @Excel(name = "宀椾綅",sort = 8)
private String postName;
/**
* 绗竴瀛﹀巻
*/
- @Excel(name = "绗竴瀛﹀巻", sort = 8)
+ @Excel(name = "绗竴瀛﹀巻", sort = 9)
private String firstStudy;
/**
* 涓撲笟
*/
- @Excel(name = "涓撲笟", sort = 9)
+ @Excel(name = "涓撲笟", sort = 10)
private String profession;
/**
* 韬唤璇佸彿鐮�
*/
- @Excel(name = "韬唤璇佸彿鐮�", sort = 10)
+ @Excel(name = "韬唤璇佸彿鐮�", sort = 11)
private String identityCard;
/**
* 骞撮緞
*/
- @Excel(name = "骞撮緞", sort = 11)
+ @Excel(name = "骞撮緞", sort = 12)
private String age;
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽", sort = 12)
+ @Excel(name = "鑱旂郴鐢佃瘽", sort = 13)
private String phone;
/**
* 绱ф�ヨ仈绯讳汉
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 13)
+ @Excel(name = "绱ф�ヨ仈绯讳汉", sort = 14)
private String emergencyContact;
/**
* 绱ф�ヨ仈绯讳汉鐢佃瘽
*/
- @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 14)
+ @Excel(name = "绱ф�ヨ仈绯讳汉鐢佃瘽", sort = 15)
private String emergencyContactPhone;
+
+ private int count;
+
+ /**
+ * 绂昏亴鍘熷洜鏂囨湰
+ */
+ private String reasonText;
}
--
Gitblit v1.9.3