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/StockInRecordDto.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 9f47fd6..ede69a2 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,29 +1,41 @@
package com.ruoyi.stock.dto;
import com.ruoyi.stock.pojo.StockInRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
-
+@EqualsAndHashCode(callSuper = true)
@Data
public class StockInRecordDto extends StockInRecord {
- /**
- * 浜у搧鍚嶇О
- */
+
+ @Schema(description = "浜у搧鍚嶇О")
private String productName;
- /**
- * 浜у搧瑙勬牸
- */
+
+ @Schema(description = "浜у搧鍨嬪彿")
private String model;
- /**
- * 浜у搧鍗曚綅
- */
+
+ @Schema(description = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ @Schema(description = "鍗曚綅")
private String unit;
+ @Schema(description = "鏃堕棿瀛楃涓�")
private String timeStr;
+ @Schema(description = "鍒涘缓浜�")
private String createBy;
- //鐜板瓨閲�
+ @Schema(description = "褰撳墠搴撳瓨")
private String currentStock;
+ @Schema(description = "璁㈠崟缂栧彿")
+ private String npsNo;
+
+ @Schema(description = "宸ュ崟缂栧彿")
+ private String workOrderNo;
+
+ @Schema(description = "椤剁骇鐖剁骇浜у搧ID")
+ private Long topParentProductId;
}
--
Gitblit v1.9.3