From 228b4fe942f70ee4dbe28ffd451bfd854c648c85 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 17:09:32 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 18 +++++++++++++-----
1 files changed, 13 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 d9f8eff..9bcbd07 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -164,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 = "鍒涘缓鐢ㄦ埛")
@@ -187,6 +183,18 @@
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