diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/inOrderAbnormal/InOrderAbnormalApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/inOrderAbnormal/InOrderAbnormalApplicationService.java
index a9547a025..16738fa25 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/inOrderAbnormal/InOrderAbnormalApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/inOrderAbnormal/InOrderAbnormalApplicationService.java
@@ -37,8 +37,14 @@ public class InOrderAbnormalApplicationService {
             if (topOrganizationId != null && topOrganizationId != 1){
                 inOrderAbnormalDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
             }
-            AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-            inOrderAbnormalDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
+            // 请求未带 warehouseId 时用用户关联仓库；带了则以请求为准（与出库异常一致）
+            if (inOrderAbnormalDO.getWarehouseId() == null) {
+                AssociationWarehouseCacheDO cache =
+                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+                if (cache != null && cache.getWarehouseId() != null) {
+                    inOrderAbnormalDO.setWarehouseId(cache.getWarehouseId());
+                }
+            }
         }
         return inOrderAbnormalDomainService.queryList(inOrderAbnormalDO);
     }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/outOrderAbnormal/OutOrderAbnormalApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/outOrderAbnormal/OutOrderAbnormalApplicationService.java
index fa7ea2f63..0fb1aa5e6 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/outOrderAbnormal/OutOrderAbnormalApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/outOrderAbnormal/OutOrderAbnormalApplicationService.java
@@ -1,6 +1,8 @@
 package com.mhd.wms.application.service.outOrderAbnormal;
 
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
+import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.outOrderAbnormal.repository.po.OutOrderAbnormalPO;
 import com.mhd.wms.domain.outOrderAbnormal.repository.todo.OutOrderAbnormalDO;
@@ -35,6 +37,14 @@ public class OutOrderAbnormalApplicationService {
             if (topOrganizationId != null && topOrganizationId != 1){
                 outOrderAbnormalDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
             }
+            // 请求未带 warehouseId 时用用户关联仓库；带了则以请求为准（与入库异常一致）
+            if (outOrderAbnormalDO.getWarehouseId() == null) {
+                AssociationWarehouseCacheDO cache =
+                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
+                if (cache != null && cache.getWarehouseId() != null) {
+                    outOrderAbnormalDO.setWarehouseId(cache.getWarehouseId());
+                }
+            }
         }
         return outOrderAbnormalDomainService.queryList(outOrderAbnormalDO);
     }
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inOrderAbnormal/InOrderAbnormalDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inOrderAbnormal/InOrderAbnormalDTO.java
index 7f3b04279..ca738269b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inOrderAbnormal/InOrderAbnormalDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inOrderAbnormal/InOrderAbnormalDTO.java
@@ -82,6 +82,8 @@ public class InOrderAbnormalDTO extends BaseVOEntity {
     @Excel(name = "备注")
     private String remark;
 
+    @ApiModelProperty("仓库id（列表筛选，关联 stock_in_order）")
+    private Long warehouseId;
 
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outOrderAbnormal/OutOrderAbnormalDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outOrderAbnormal/OutOrderAbnormalDTO.java
index 3048e6c1c..30f15c850 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outOrderAbnormal/OutOrderAbnormalDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outOrderAbnormal/OutOrderAbnormalDTO.java
@@ -78,6 +78,14 @@ public class OutOrderAbnormalDTO extends BaseVOEntity {
     @Excel(name = "备注")
     private String remark;
 
+    @ApiModelProperty("仓库id（列表筛选，关联 stock_out_order）")
+    private Long warehouseId;
+
+    @ApiModelProperty("货主id（列表筛选，关联 stock_out_order）")
+    private Long shipperId;
+
+    @ApiModelProperty("出库单类型编码（列表筛选，关联 stock_out_order）")
+    private String orderTypeCode;
 
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;
diff --git a/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml b/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml
index c40d0fb1d..1244b2790 100644
--- a/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml
@@ -92,14 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="joinStockOutOrderPoWhere">
-        <if test="warehouseId != null and warehouseId != '' ">
+        <if test="warehouseId != null">
             and b.warehouse_id = #{warehouseId}
         </if>
-        <if test="shipperId != null  and shipperId != ''">
+        <if test="shipperId != null">
             and b.shipper_id = #{shipperId}
         </if>
         <if test="orderTypeCode != null  and orderTypeCode != ''">
-            and a.order_type_code = #{orderTypeCode}
+            and b.order_type_code = #{orderTypeCode}
         </if>
         <choose>
             <when test="delFlag != null"> and b.del_flag = #{delFlag} </when>