From 23ec64ed997fc206fba9f0d6a84975f7b36c47be Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 11 十月 2026 16:09:26 +0800
Subject: [PATCH] 天津-奇缘恒艺 录数据需求修改

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 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..a39f4ef 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -50,6 +50,11 @@
     private String productCategory;
 
     /**
+     * 鏉愯川锛堝凡搴熷純锛氬彴璐︿笉鍐嶅綍鍏ワ紝淇濈暀璇ュ垪浠ュ吋瀹瑰巻鍙叉暟鎹級
+     */
+    private String material;
+
+    /**
      * 瑙勬牸鍨嬪彿
      */
     @Excel(name = "瑙勬牸鍨嬪彿")
@@ -149,6 +154,10 @@
     /**
      * 浜у搧鐘舵��
      */
+    @TableField(exist = false)
+    @Schema(description = "鍏ュ簱瀹℃牳鐘舵��")
+    private String stockInApprovalStatus;
+
 //    @TableField(exist = false)
     @Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
     private Integer approveStatus;
@@ -160,11 +169,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 +186,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