From 32e4f30a848e159081986f93d189f0e80fa56a77 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 29 五月 2026 18:03:52 +0800
Subject: [PATCH] 采购手动入库

---
 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 9cc1fe6..e6ae203 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -15,6 +15,7 @@
     private String productName;
     private String model;
     private String unit;
+    private String batchNo;
 
 
     //鍏ュ簱绫诲瀷
@@ -43,31 +44,61 @@
 
     @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;
-}
\ No newline at end of file
+
+    @Schema(description = "浜у搧id")
+    private Long productId;
+
+    @Schema(description = "鍚堟牸搴撳瓨鏉ユ簮")
+    private String qualifiedSource;
+
+    @Schema(description = "鍚堟牸搴撳瓨鏉ユ簮鏂囨湰")
+    private String qualifiedSourceText;
+
+    @Schema(description = "涓嶅悎鏍煎簱瀛樻潵婧�")
+    private String unQualifiedSource;
+
+    @Schema(description = "涓嶅悎鏍煎簱瀛樻潵婧愭枃鏈�")
+    private String unQualifiedSourceText;
+
+    @Schema(description = "鏄惁鍚按")
+    private Boolean isContainsWater;
+
+    @Schema(description = "鍚按閲�")
+    private BigDecimal waterContent;
+
+    @Schema(description = "鐞嗚鍏ュ簱鏁伴噺")
+    private BigDecimal theoryStockInNum;
+}

--
Gitblit v1.9.3