From 94ec4e9e9214cb5dc28aef4a7f38be462cfda728 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 16:50:09 +0800
Subject: [PATCH] fix(product): 产品型号复制功能的进行勾选复制
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 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..7dcddf7 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,34 +2,35 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
+@EqualsAndHashCode(callSuper = true)
@Data
public class StockInventoryDto extends StockInventory {
private String productName;
private String model;
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;
@@ -37,6 +38,45 @@
private BigDecimal totalStockIn;
private BigDecimal totalStockOut;
private BigDecimal currentStock;
+ private BigDecimal unLockedQuantity;
+ private Long productId;
- private String unLockedQuantity;
+ @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;
+
+ @ApiModelProperty("搴撳瓨id")
+ private Long stockId;
}
--
Gitblit v1.9.3