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/stock/dto/FinishedProductTreeDto.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java b/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
index 9f78801..a17d163 100644
--- a/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
@@ -1,31 +1,45 @@
package com.ruoyi.stock.dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
+@ApiModel(value = "FinishedProductTreeDto", description = "鎴愬搧鏍戝舰DTO")
public class FinishedProductTreeDto {
- private Long id;
-
- private Long parentId;
-
- private String productName;
-
- private String label;
-
+ @ApiModelProperty(value = "浜у搧ID")
private Long productId;
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String productName;
+
+ @ApiModelProperty(value = "鏍囩/鏄剧ず鍚嶇О")
+ private String label;
+
+ @ApiModelProperty(value = "搴撳瓨ID")
+ private Long stockId;
+
+ @ApiModelProperty(value = "浜у搧鍨嬪彿ID")
private Long productModelId;
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
- private String materialCode;
-
+ @ApiModelProperty(value = "宸ュ簭绫诲埆")
private String processCategory;
+ @ApiModelProperty(value = "鐢靛帇")
private String voltage;
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty(value = "瀛愯妭鐐瑰垪琛�")
private List<FinishedProductTreeDto> children;
}
--
Gitblit v1.9.3