From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 3d5856f..33b7599 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,6 +15,7 @@
private String productName;
private String model;
private String unit;
+ private String batchNo;
//鍏ュ簱绫诲瀷
@@ -38,5 +40,44 @@
private BigDecimal totalStockOut;
private BigDecimal currentStock;
- private String unLockedQuantity;
+ private BigDecimal unLockedQuantity;
+
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+ private Long topParentProductId;
+
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
+ private String stockType;
+
+ @Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
+ private BigDecimal unQualifiedQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
+ private BigDecimal qualifiedLockedQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
+ private BigDecimal unQualifiedLockedQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
+ private BigDecimal qualifiedUnLockedQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
+ private BigDecimal unQualifiedUnLockedQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨寰呭鏍稿嚭搴撴暟閲忥紙涓嶅崰鐢ㄥ簱瀛樹絾宸茬敵璇峰嚭搴擄級")
+ private BigDecimal qualifiedPendingOutQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺緟瀹℃牳鍑哄簱鏁伴噺")
+ private BigDecimal unQualifiedPendingOutQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨ID")
+ private Long qualifiedId;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛業D")
+ private Long unQualifiedId;
+
+ @Schema(description = "浜у搧id")
+ private Long productId;
}
--
Gitblit v1.9.3