From cdfa0bc7df08e2279f11d490b56684a8529de7a3 Mon Sep 17 00:00:00 2001 From: mahao Date: Sun, 23 Apr 2023 09:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtherZll/OtherZllService.cs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/WmsWebApi.Application/OtherZll/OtherZllService.cs b/src/WmsWebApi.Application/OtherZll/OtherZllService.cs index b2ff81f..52e73d8 100644 --- a/src/WmsWebApi.Application/OtherZll/OtherZllService.cs +++ b/src/WmsWebApi.Application/OtherZll/OtherZllService.cs @@ -100,16 +100,6 @@ public class OtherZllService : ApplicationService, IOtherZllService return result; } - if (_dtoList != null && _dtoList.Count() > 0) - { - if (_otherZllConfigOptions.IsEnableErnamFilter == true) - { - //根据配置文件过滤ERNAM - List ernamFilters = _otherZllConfigOptions.ErnamFilters; - _dtoList = _dtoList.FindAll(e => ernamFilters.Contains(e.ERNAM)); - } - } - if (_dtoList == null || _dtoList.Count() <= 0) { bErr = true; @@ -126,6 +116,17 @@ public class OtherZllService : ApplicationService, IOtherZllService if (_dtoList[0].ZDJLX == "20") { var _dtoDetails = _dtoList.Where(p => p.WERKS == "1000").ToList(); + + if (_dtoDetails != null || _dtoDetails.Count() > 0) + { + if (_otherZllConfigOptions.IsEnableErnamFilter == true) + { + //根据配置文件过滤ERNAM + List ernamFilters = _otherZllConfigOptions.ErnamFilters; + _dtoDetails = _dtoDetails.FindAll(e => ernamFilters.Contains(e.ERNAM)); + } + } + if (_dtoDetails == null || _dtoDetails.Count() == 0) { bErr = true;