From 807ada9ad918803b05477f36539d9b23e5399350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 16 Dec 2025 10:53:31 +0800
Subject: [PATCH] 1

---
 .../xujie/sys/modules/pms/entity/InventoryStockVoData.java | 4 ++++
 src/main/resources/mapper/pms/InventoryStockMapper.xml     | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/InventoryStockVoData.java b/src/main/java/com/xujie/sys/modules/pms/entity/InventoryStockVoData.java
index 66a180cf..fd0fd5a0 100644
--- a/src/main/java/com/xujie/sys/modules/pms/entity/InventoryStockVoData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/entity/InventoryStockVoData.java
@@ -3,6 +3,8 @@ package com.xujie.sys.modules.pms.entity;
 import com.xujie.sys.modules.pms.entity.vo.InventoryStockVo;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class InventoryStockVoData extends InventoryStockVo {
     private String username;
@@ -14,4 +16,6 @@ public class InventoryStockVoData extends InventoryStockVo {
     private String securityMethod;
 
     private String searchType;
+
+    private BigDecimal  estUseQty;
 }
diff --git a/src/main/resources/mapper/pms/InventoryStockMapper.xml b/src/main/resources/mapper/pms/InventoryStockMapper.xml
index f868f903..e3698459 100644
--- a/src/main/resources/mapper/pms/InventoryStockMapper.xml
+++ b/src/main/resources/mapper/pms/InventoryStockMapper.xml
@@ -55,7 +55,8 @@
         B.average_price,
         B.umid,
         (sum(isnull(A.qty_on_hand, 0)) * B.average_price) as totalCost,
-        dbo.get_bu_desc(A.site, A.citem_code) buDesc
+        dbo.get_bu_desc(A.site, A.citem_code) buDesc,
+        B.est_use_qty
         from inventory_stock A
         left join part_spare B on A.site = B.site and A.part_no = B.part_no and a.citem_code = b.bu_no
         <where>
@@ -107,10 +108,10 @@
         </where>
         GROUP BY
         <if test="query.groupType == 0">
-            A.site, A.part_no, B.part_description, A.batch_no, b.min_stock, b.max_stock, B.average_price, B.umid, a.citem_code
+            A.site, A.part_no, B.part_description, A.batch_no, b.min_stock, b.max_stock, B.average_price, B.umid, a.citem_code,B.est_use_qty
         </if>
         <if test="query.groupType == 1">
-            A.site, A.part_no, B.part_description, b.min_stock, b.max_stock, B.average_price, B.umid, a.citem_code
+            A.site, A.part_no, B.part_description, b.min_stock, b.max_stock, B.average_price, B.umid, a.citem_code,B.est_use_qty
         </if>
     </select>