修改提单管理,增加销售检索

dev
jianghaiqing 2 weeks ago
parent ac34f341eb
commit a7eb69976c

@ -101,5 +101,10 @@ namespace DS.WMS.Core.Op.Dtos
/// </summary> /// </summary>
public Nullable<long> Operator { get; set; } public Nullable<long> Operator { get; set; }
/// <summary>
/// 销售ID
/// </summary>
public Nullable<long> Sale { get; set; }
} }
} }

@ -238,7 +238,8 @@ namespace DS.WMS.Core.Op.Method
.WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode) .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
&& otherQueryCondition.Doc.HasValue, (l, r) => l.Doc == otherQueryCondition.Doc.Value) && 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) .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
&& otherQueryCondition.ETDStart.HasValue, (l, r) => l.ETD >= otherQueryCondition.ETDStart) && otherQueryCondition.ETDStart.HasValue, (l, r) => l.ETD >= otherQueryCondition.ETDStart)
.WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode) .WhereIF(otherQueryCondition != null && !string.IsNullOrWhiteSpace(otherQueryCondition.QueryTabCode)
@ -494,6 +495,14 @@ namespace DS.WMS.Core.Op.Method
whereList.Remove(t); 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))) if (whereList.Any(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase)))
{ {
var curList = whereList.Where(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase)).ToList(); var curList = whereList.Where(t => ((ConditionalModel)t).FieldName.Equals("etd", StringComparison.OrdinalIgnoreCase)).ToList();

Loading…
Cancel
Save