diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index c54969ce..e4af88f7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -354,7 +354,10 @@ namespace Tnb.WarehouseMgr { if (!input.material_id.IsNullOrWhiteSpace()) { - filterExp = (a, b, c) => b.material_id == input.material_id; + filterExp = (a, b, c) => a.wh_id == input.warehouse_id + && b.material_id == input.material_id + && a.is_type == ((int)EnumLocationType.存储库位).ToString() + && c.is_lock == 0; } } break; @@ -362,7 +365,10 @@ namespace Tnb.WarehouseMgr { if (input.regionIds?.Count > 0) { - filterExp = (a, b, c) => input.regionIds.Contains(a.region_id); + filterExp = (a, b, c) => a.wh_id == input.warehouse_id + && input.regionIds.Contains(a.region_id) + && a.is_type == ((int)EnumLocationType.存储库位).ToString() + && c.is_lock == 0; } } break;