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 16665d24..c0db2344 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
@@ -123,16 +123,21 @@ public class DepotItemController {
             List<MaterialVo4Unit> list = materialService.getMaterialByBarCode(barCode);
             if(list!=null && list.size()>0) {
                 MaterialVo4Unit materialVo4Unit = list.get(0);
-                stock = depotItemService.getStockByParam(depotId,materialVo4Unit.getId(),null,null);
-                String commodityUnit = materialVo4Unit.getCommodityUnit();
-                Long unitId = materialVo4Unit.getUnitId();
-                if(unitId!=null) {
-                    Integer ratio = 1;
-                    Unit unit = unitService.getUnit(unitId);
-                    if(commodityUnit.equals(unit.getOtherUnit())){
-                        ratio = unit.getRatio();
-                        if(ratio!=0) {
-                            stock = stock.divide(BigDecimal.valueOf(ratio),2,BigDecimal.ROUND_HALF_UP); //两位小数
+                BigDecimal skuStock = depotItemService.getSkuStockByParam(depotId,materialVo4Unit.getMeId(),null,null);
+                if(skuStock.compareTo(BigDecimal.ZERO)!=0){
+                    stock = skuStock;
+                } else {
+                    stock = depotItemService.getStockByParam(depotId,materialVo4Unit.getId(),null,null);
+                    String commodityUnit = materialVo4Unit.getCommodityUnit();
+                    Long unitId = materialVo4Unit.getUnitId();
+                    if(unitId!=null) {
+                        Integer ratio = 1;
+                        Unit unit = unitService.getUnit(unitId);
+                        if(commodityUnit.equals(unit.getOtherUnit())){
+                            ratio = unit.getRatio();
+                            if(ratio!=0) {
+                                stock = stock.divide(BigDecimal.valueOf(ratio),2,BigDecimal.ROUND_HALF_UP); //两位小数
+                            }
                         }
                     }
                 }
@@ -173,13 +178,19 @@ public class DepotItemController {
                     item.put("model", diEx.getMModel());
                     item.put("materialOther", getOtherInfo(mpArr, diEx));
                     Integer ratio = diEx.getRatio();
-                    BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null);
-                    if(ratio!=null){
-                        BigDecimal ratioDecimal = new BigDecimal(ratio.toString());
-                        if(ratioDecimal.compareTo(BigDecimal.ZERO)!=0){
-                            String otherUnit = diEx.getOtherUnit();
-                            if(otherUnit.equals(diEx.getMaterialUnit())) {
-                                stock = stock.divide(ratioDecimal,2,BigDecimal.ROUND_HALF_UP); //两位小数
+                    BigDecimal stock;
+                    BigDecimal skuStock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);
+                    if(skuStock.compareTo(BigDecimal.ZERO)!=0){
+                        stock = skuStock;
+                    } else {
+                        stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null);
+                        if(ratio!=null){
+                            BigDecimal ratioDecimal = new BigDecimal(ratio.toString());
+                            if(ratioDecimal.compareTo(BigDecimal.ZERO)!=0){
+                                String otherUnit = diEx.getOtherUnit();
+                                if(otherUnit.equals(diEx.getMaterialUnit())) {
+                                    stock = stock.divide(ratioDecimal,2,BigDecimal.ROUND_HALF_UP); //两位小数
+                                }
                             }
                         }
                     }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 07e07db8..227f3566 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -25,6 +25,7 @@
     </resultMap>
 
     <resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultAndUnitMap" type="com.jsh.erp.datasource.entities.MaterialVo4Unit">
+        <result column="meId" jdbcType="BIGINT" property="meId" />
         <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
         <result column="sku" jdbcType="VARCHAR" property="sku" />
     </resultMap>
@@ -303,7 +304,7 @@
     </select>
 
     <select id="getMaterialByBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
-        select m.*,u.name unit_name,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal,
+        select m.*,u.name unit_name, me.id meId,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal,
         me.wholesale_decimal, me.low_decimal, me.sku
         from jsh_material m
         left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'