From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index ec8f8b7..40de24a 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;
@@ -16,21 +17,17 @@
private String unit;
private String materialCode;
private String productModelName;
-
- //鍏ュ簱绫诲瀷
private String recordType;
-
- //鍏ュ簱绫诲瀷瀵瑰簲鐨刬d
private Long recordId;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate reportDate;
- //搴撳瓨鏈堟姤鏌ヨ瀛楁
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate startMonth;
+
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate endMonth;
@@ -38,9 +35,43 @@
private BigDecimal totalStockIn;
private BigDecimal totalStockOut;
private BigDecimal currentStock;
-
- private BigDecimal unLockedQuantity;
-
- //浜у搧id
+ private BigDecimal unLockedQuantity;
private Long productId;
+
+ @Schema(description = "椤剁骇鐖剁骇浜у搧ID")
+ private Long topParentProductId;
+
+ @Schema(description = "搴撳瓨绫诲瀷")
+ 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 = "鍚堟牸搴撳瓨ID")
+ private Long qualifiedId;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛業D")
+ private Long unQualifiedId;
+
+ @Schema(description = "鍚堟牸鎵规鍙�")
+ private String qualifiedBatchNo;
+
+ @Schema(description = "涓嶅悎鏍兼壒娆″彿")
+ private String unQualifiedBatchNo;
+
}
--
Gitblit v1.9.3