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();