From 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 03 六月 2026 10:12:23 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 08bb128..d9f8eff 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -149,6 +149,10 @@
     /**
      * 浜у搧鐘舵��
      */
+    @TableField(exist = false)
+    @Schema(description = "鍏ュ簱瀹℃牳鐘舵��")
+    private String stockInApprovalStatus;
+
 //    @TableField(exist = false)
     @Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
     private Integer approveStatus;
@@ -181,4 +185,8 @@
     @TableField(exist = false)
     @Schema(description = "寰呭彂璐ф暟閲�")
     private BigDecimal noQuantity;
+
+    @TableField(exist = false)
+    @Schema(description = "瀹℃壒涓暟閲�")
+    private BigDecimal pendingApprovalQuantity;
 }

--
Gitblit v1.9.3