From a7eb69976c78ff1069d49a059d25a54c778c09d7 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 11 Nov 2024 09:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=94=80=E5=94=AE=E6=A3=80?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Op/Dtos/BLIssueManage/BLIssueMangeQueryExtDto.cs | 5 +++++ .../Op/Method/BLIssueManage/BLIssueManageService.cs | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueMangeQueryExtDto.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueMangeQueryExtDto.cs index c30d2f2c..11b93485 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueMangeQueryExtDto.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueMangeQueryExtDto.cs @@ -101,5 +101,10 @@ namespace DS.WMS.Core.Op.Dtos /// public Nullable Operator { get; set; } + /// + /// 销售ID + /// + public Nullable Sale { get; set; } + } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs index 66b4fa75..17cc987e 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs @@ -238,7 +238,8 @@ namespace DS.WMS.Core.Op.Method .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode) && otherQueryCondition.Doc.HasValue, (l, r) => l.Doc == otherQueryCondition.Doc.Value) - + .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode) + && otherQueryCondition.Sale.HasValue, (l, r) => l.SaleId == otherQueryCondition.Sale.Value) .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode) && otherQueryCondition.ETDStart.HasValue, (l, r) => l.ETD >= otherQueryCondition.ETDStart) .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode) @@ -494,6 +495,14 @@ namespace DS.WMS.Core.Op.Method whereList.Remove(t); } + if (whereList.Any(t => ((ConditionalModel)t).FieldName.Equals("sale", StringComparison.OrdinalIgnoreCase))) + { + var t = whereList.FirstOrDefault(t => ((ConditionalModel)t).FieldName.Equals("sale", StringComparison.OrdinalIgnoreCase)); + queryExt.Sale = long.Parse(((ConditionalModel)t).FieldValue); + + whereList.Remove(t); + } + if (whereList.Any(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase))) { var curList = whereList.Where(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase)).ToList();