diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index ad7a8c77..ec6efc2b 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -158,7 +158,7 @@ public class DepotItemController {
                 if(StringUtil.isNotEmpty(materialVo4Unit.getSku())){
                     stock = depotItemService.getSkuStockByParam(depotId,materialVo4Unit.getMeId(),null,null);
                 } else {
-                    stock = depotItemService.getStockByParam(depotId,materialVo4Unit.getId(),null,null);
+                    stock = depotItemService.getCurrentStockByParam(depotId, materialVo4Unit.getId());
                     if(materialVo4Unit.getUnitId()!=null) {
                         Unit unit = unitService.getUnit(materialVo4Unit.getUnitId());
                         String commodityUnit = materialVo4Unit.getCommodityUnit();
@@ -228,7 +228,7 @@ public class DepotItemController {
                     if(StringUtil.isNotEmpty(diEx.getSku())){
                         stock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);
                     } else {
-                        stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null);
+                        stock = depotItemService.getCurrentStockByParam(diEx.getDepotId(),diEx.getMaterialId());
                         if (StringUtil.isNotEmpty(unitInfo.getName())) {
                             stock = unitService.parseStockByUnit(stock, unitInfo, materialUnit);
                         }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
index 26c00389..f23c0e96 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -258,7 +258,7 @@ public class MaterialController {
                     if(StringUtil.isNotEmpty(material.getSku())){
                         stock = depotItemService.getSkuStockByParam(depotId,material.getMeId(),null,null);
                     } else {
-                        stock = depotItemService.getStockByParam(depotId,material.getId(),null,null);
+                        stock = depotItemService.getCurrentStockByParam(depotId, material.getId());
                         if (material.getUnitId()!=null){
                             String commodityUnit = material.getCommodityUnit();
                             stock = unitService.parseStockByUnit(stock, unit, commodityUnit);
@@ -546,7 +546,7 @@ public class MaterialController {
         if (StringUtil.isNotEmpty(mvo.getSku())) {
             stock = depotItemService.getSkuStockByParam(mvo.getDepotId(), mvo.getMeId(), null, null);
         } else {
-            stock = depotItemService.getStockByParam(mvo.getDepotId(), mvo.getId(), null, null);
+            stock = depotItemService.getCurrentStockByParam(mvo.getDepotId(), mvo.getId());
             if (mvo.getUnitId() != null) {
                 Unit unit = unitService.getUnit(mvo.getUnitId());
                 String commodityUnit = mvo.getCommodityUnit();
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
index 83e5bf74..f43e664a 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
@@ -611,7 +611,7 @@ public class DepotItemService {
                 }
                 //出库时判断库存是否充足
                 if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){
-                    BigDecimal stock = getStockByParam(depotItem.getDepotId(),depotItem.getMaterialId(),null,null);
+                    BigDecimal stock = getCurrentStockByParam(depotItem.getDepotId(),depotItem.getMaterialId());
                     if(StringUtil.isNotEmpty(depotItem.getSku())) {
                         //对于sku商品要换个方式计算库存
                         stock = getSkuStockByParam(depotItem.getDepotId(),depotItem.getMaterialExtendId(),null,null);
@@ -1146,7 +1146,7 @@ public class DepotItemService {
                     if(StringUtil.isNotEmpty(m.getSku())){
                         stock = getSkuStockByParam(null, m.getMeId(),null,null);
                     } else {
-                        stock = depotItemMapperEx.getCurrentStockByParam(null, m.getId());
+                        stock = getCurrentStockByParam(null, m.getId());
                     }
                     item.put("stock", stock);
                     item.put("unit", m.getCommodityUnit());
@@ -1214,4 +1214,9 @@ public class DepotItemService {
         }
         return depotItemMapperEx.getLastUnitPriceByParam(organId, meId, type, subType);
     }
+
+    public BigDecimal getCurrentStockByParam(Long depotId, Long mId) {
+        return depotItemMapperEx.getCurrentStockByParam(depotId, mId);
+    }
+
 }