From 5d81fcc5768741323a2e343fc01f44e17e68b65b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 25 六月 2026 14:59:38 +0800
Subject: [PATCH] 1.库存入库新增质检流程 2.销售相关查询返回总合同号 3.采购相关查询返回总合同号
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 31a4188..34b0141 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,7 +2,7 @@
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 org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +15,7 @@
private String productName;
private String model;
private String unit;
+ private String batchNo;
//鍏ュ簱绫诲瀷
@@ -41,33 +42,51 @@
private BigDecimal unLockedQuantity;
- @ApiModelProperty("椤堕儴鐖朵骇鍝乮d")
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
private Long topParentProductId;
-
- @ApiModelProperty("搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
+
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
private String stockType;
-
- @ApiModelProperty("鍚堟牸搴撳瓨鏁伴噺")
+
+ @Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
private BigDecimal qualifiedQuantity;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樻暟閲�")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
private BigDecimal unQualifiedQuantity;
-
- @ApiModelProperty("鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
+
+ @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
private BigDecimal qualifiedLockedQuantity;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
private BigDecimal unQualifiedLockedQuantity;
-
- @ApiModelProperty("鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
+
+ @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
private BigDecimal qualifiedUnLockedQuantity;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
private BigDecimal unQualifiedUnLockedQuantity;
-
- @ApiModelProperty("鍚堟牸搴撳瓨ID")
+
+ @Schema(description = "鍚堟牸搴撳瓨寰呭鏍稿嚭搴撴暟閲忥紙涓嶅崰鐢ㄥ簱瀛樹絾宸茬敵璇峰嚭搴擄級")
+ private BigDecimal qualifiedPendingOutQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺緟瀹℃牳鍑哄簱鏁伴噺")
+ private BigDecimal unQualifiedPendingOutQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨ID")
private Long qualifiedId;
-
- @ApiModelProperty("涓嶅悎鏍煎簱瀛業D")
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛業D")
private Long unQualifiedId;
-}
\ No newline at end of file
+
+ @Schema(description = "浜у搧id")
+ private Long productId;
+
+ @Schema(description = "鍑哄簱鎵瑰彿")
+ private String outboundBatches;
+
+ @Schema(description = "鏄惁闇�瑕佽川妫�")
+ private Boolean needInspect;
+
+ @Schema(description = "璐ㄦ绫诲瀷锛�0-鍘熸潗鏂欐楠岋紝1-杩囩▼妫�楠�")
+ private Integer inspectType;
+}
--
Gitblit v1.9.3