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/dto/WordDateDto.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/dto/WordDateDto.java b/src/main/java/com/ruoyi/dto/WordDateDto.java
index c316d2d..09bd0be 100644
--- a/src/main/java/com/ruoyi/dto/WordDateDto.java
+++ b/src/main/java/com/ruoyi/dto/WordDateDto.java
@@ -15,18 +15,34 @@
private String qmoth; // 绛捐鏃ユ湡-鏈堬紙娉ㄦ剰鍘熸枃妗ｆ嫾鍐欙細qmoth=month锛�
private String qday; // 绛捐鏃ユ湡-鏃�
- private String syear; // 鍚堝悓寮�濮嬪勾
- private String smoth; // 鍚堝悓寮�濮嬫湀
- private String sday; // 鍚堝悓寮�濮嬫棩
- private String eyear; // 鍚堝悓缁撴潫骞达紙浠匒绫诲瀷闇�瑕侊級
- private String emoth; // 鍚堝悓缁撴潫鏈堬紙浠匒绫诲瀷闇�瑕侊級
- private String eday; // 鍚堝悓缁撴潫鏃ワ紙浠匒绫诲瀷闇�瑕侊級
+ private String syear = ""; // 鍚堝悓寮�濮嬪勾
+ private String smoth = ""; // 鍚堝悓寮�濮嬫湀
+ private String sday = ""; // 鍚堝悓寮�濮嬫棩
+ private String eyear = ""; // 鍚堝悓缁撴潫骞达紙浠匒绫诲瀷闇�瑕侊級
+ private String emoth = ""; // 鍚堝悓缁撴潫鏈堬紙浠匒绫诲瀷闇�瑕侊級
+ private String eday = ""; // 鍚堝悓缁撴潫鏃ワ紙浠匒绫诲瀷闇�瑕侊級
// 璇曠敤鏈熺浉鍏�
- private String styear; // 璇曠敤鏈熷紑濮嬪勾
- private String stmoth; // 璇曠敤鏈熷紑濮嬫湀
- private String stday; // 璇曠敤鏈熷紑濮嬫棩
- private String seyear; // 璇曠敤鏈熺粨鏉熷勾
- private String semoth; // 璇曠敤鏈熺粨鏉熸湀
- private String seday; // 璇曠敤鏈熺粨鏉熸棩
+ private String styear = ""; // 璇曠敤鏈熷紑濮嬪勾
+ private String stmoth = ""; // 璇曠敤鏈熷紑濮嬫湀
+ private String stday = ""; // 璇曠敤鏈熷紑濮嬫棩
+ private String seyear = ""; // 璇曠敤鏈熺粨鏉熷勾
+ private String semoth = ""; // 璇曠敤鏈熺粨鏉熸湀
+ private String seday = ""; // 璇曠敤鏈熺粨鏉熸棩
+
+ private String bsyear = ""; // 鍚堝悓寮�濮嬪勾
+ private String bsmoth = ""; // 鍚堝悓寮�濮嬫湀
+ private String bsday = ""; // 鍚堝悓寮�濮嬫棩
+
+ // 璇曠敤鏈熺浉鍏�
+ private String bstyear = ""; // 璇曠敤鏈熷紑濮嬪勾
+ private String bstmoth = ""; // 璇曠敤鏈熷紑濮嬫湀
+ private String bstday = ""; // 璇曠敤鏈熷紑濮嬫棩
+ private String bseyear = ""; // 璇曠敤鏈熺粨鏉熷勾
+ private String bsemoth = ""; // 璇曠敤鏈熺粨鏉熸湀
+ private String bseday = ""; // 璇曠敤鏈熺粨鏉熸棩
+
+ private String csyear = ""; // 鍚堝悓寮�濮嬪勾
+ private String csmoth = ""; // 鍚堝悓寮�濮嬫湀
+ private String csday = ""; // 鍚堝悓寮�濮嬫棩
}
--
Gitblit v1.9.3