From dbd7fd484b5c7ed00cb895f227645848c3677c08 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index a15270c..61c5d19 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
@@ -66,6 +66,19 @@
     @Schema(description = "闇�姹傛暟閲�")
     private BigDecimal demandedQuantity;
 
+    @Schema(description = "琛ユ枡鎬婚噺")
+    private BigDecimal  feedingQty;
+
+    @Schema(description = "閫�鏂欐暟閲�")
+    private BigDecimal  returnQty;
+
+    @Schema(description = "瀹為檯鏁伴噺")
+    private BigDecimal  actualQty;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    @TableField("is_returned")
+    private Boolean returned;
+
     @Schema(description = "鏄惁bom棰嗘枡")
     @TableField("is_bom")
     private Boolean bom;

--
Gitblit v1.9.3