From 4f5133a1aa9ae7842fa808be6d082a036e408f12 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 17:09:20 +0800
Subject: [PATCH] 采购退货时,对应批次库存已被销售发货出去一批(比如销售发货时,选择的采购入库的批次库存,剩下38个,但采购退货时,可退货数量还是显示150个。)

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 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..9bcbd07 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;
@@ -160,11 +164,7 @@
     @TableField(exist = false)
     private Integer hasSufficientStock;
 
-    // 閫�璐ф暟閲�
-    @TableField(exist = false)
-    private BigDecimal returnQuality;
-
-    // 鍙敤鏁伴噺  quantity - returnQuality
+    // 鍙敤鏁伴噺  quantity - returnQuantity
     @TableField(exist = false)
     private BigDecimal availableQuality;
     @Schema(description = "鍒涘缓鐢ㄦ埛")
@@ -181,4 +181,20 @@
     @TableField(exist = false)
     @Schema(description = "寰呭彂璐ф暟閲�")
     private BigDecimal noQuantity;
+
+    @TableField(exist = false)
+    @Schema(description = "閫�璐ф暟閲�")
+    private BigDecimal returnQuantity;
+
+    @TableField(exist = false)
+    @Schema(description = "閿�鍞彂璐ф暟閲�")
+    private BigDecimal shippedQuantity;
+
+    @TableField(exist = false)
+    @Schema(description = "宸插鏍稿叆搴撴暟閲�")
+    private BigDecimal approvedStockInNum;
+
+    @TableField(exist = false)
+    @Schema(description = "瀹℃壒涓暟閲�")
+    private BigDecimal pendingApprovalQuantity;
 }

--
Gitblit v1.9.3