diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
index f82194b3c..52a4c5311 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java
@@ -345,4 +345,7 @@ public class PickingMaterialDetailPO extends BaseVOEntity {
     private String bondInvtNoGw;
     private String whNoGw;
     private String seatNoGw;
+    @ApiModelProperty("库存数量")
+    @Excel(name = "库存数量")
+    private BigDecimal inventoryQuantity;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
index 2333f93c2..e2fd31cd5 100644
--- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml
@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.organization_id like concat('%', #{organizationId}, '%')
         </if>
         <if test="orgId != null and orgId != '' ">
-            and a.org_id like concat('%', #{orgId}, '%')
+            and (a.org_id like concat('%', #{orgId}, '%') or a.organization_id like concat('%', #{orgId}, '%'))
         </if>
         <if test="materialBaseInfoId != null and materialBaseInfoId != ''">
             and a.material_base_info_id = #{materialBaseInfoId}
diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
index 51312da2e..4aa6ac0a8 100644
--- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml
@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="whNoGw"    column="wh_no_gw"    />
         <result property="seatNoGw"    column="seat_no_gw"    />
         <result property="inOrderNumberGw"    column="in_order_number_gw"    />
+        <result property="inventoryQuantity"    column="INVENTORY_QUANTITY"    />
     </resultMap>
 
 
@@ -114,7 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    a.invt_row_gw,
    a.bond_invt_no_gw,
    a.wh_no_gw,
-   a.seat_no_gw
+   a.seat_no_gw,
+        c.INVENTORY_QUANTITY
     </sql>
 
     <sql id="selectPickingMaterialDetailPo1">
@@ -225,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectPickingMaterialDetailPo"/>
         from picking_material_detail a
         left join out_material_detail omd on a.out_unique_id = omd.unique_id and omd.del_flag = 1 and a.del_flag = 1
+        left join (select SUM(INVENTORY_QUANTITY) as INVENTORY_QUANTITY,MATERIAL_BASE_INFO_ID from MATERIAL_INVENTORY GROUP BY MATERIAL_BASE_INFO_ID) c on a.MATERIAL_BASE_INFO_ID=c.MATERIAL_BASE_INFO_ID
         <where>
             <include refid="selectPickingMaterialDetailPo1"/>
         </where>