From de149ae8ac9ce48560fd96d76408167cb151dee6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 09 九月 2026 00:54:30 +0800
Subject: [PATCH] fix: 优化 1.修改用印管理返回的申请人 2.采购增加入库数量字段

---
 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml                        |    3 ++-
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java                          |    3 +++
 src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml |    2 +-
 3 files changed, 6 insertions(+), 2 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..0431081 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -171,6 +171,9 @@
     // 鍙敤鏁伴噺  quantity - returnQuality
     @TableField(exist = false)
     private BigDecimal availableQuality;
+    // 鍏ュ簱鏁伴噺
+    @TableField(exist = false)
+    private BigDecimal inputQuantity;
     @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
diff --git a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
index 53b2f3c..14fe3a5 100644
--- a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -6,7 +6,7 @@
     <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
         SELECT
         sam.*,
-        su.user_name AS create_user_name,
+        su.nick_name AS create_user_name,
 
         GROUP_CONCAT(DISTINCT d.dept_name ORDER BY d.dept_id SEPARATOR ',') AS department,
 
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index 6059825..cb9557f 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -46,7 +46,8 @@
          WHEN IFNULL(t4.approved_stock_in_num, 0) &lt;= 0 THEN '寰呭叆搴�'
          WHEN IFNULL(t4.approved_stock_in_num, 0) &gt;= IFNULL(T1.quantity, 0) THEN '瀹屽叏鍏ュ簱'
         ELSE '鍏ュ簱涓�'
-        END AS stock_in_approval_status
+        END AS stock_in_approval_status,
+        IFNULL(t4.approved_stock_in_num, 0) as input_quantity
         FROM
         sales_ledger_product T1
         LEFT JOIN (

--
Gitblit v1.9.3