18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化条件

Browse Source
This commit is contained in:
tongfei
2024-01-27 17:51:07 +08:00
parent 1780e84ee4
commit 129a866235
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WMS.Web.Repositories/BoxMarkRepositories.cs
View File

@@ -87,15 +87,20 @@ namespace WMS.Web.Repositories
var endNo = Convert.ToInt32(dto.EndBillNo.Substring(8)); var endNo = Convert.ToInt32(dto.EndBillNo.Substring(8));
query = query.Where(w => w.FirstBillNo >= begYMD && w.FirstBillNo <= endYMD && w.LastBillNo >= begNo && w.LastBillNo <= endNo); query = query.Where(w => w.FirstBillNo >= begYMD && w.FirstBillNo <= endYMD && w.LastBillNo >= begNo && w.LastBillNo <= endNo);
} }
else
query = query.Where(w => w.BillNo == dto.BeginBillNo || w.BillNo == dto.EndBillNo);
} }
else else if (!string.IsNullOrEmpty(dto.BeginBillNo))
query = query.Where(w => w.BillNo == dto.BeginBillNo || w.BillNo == dto.EndBillNo); query = query.Where(w => w.BillNo == dto.BeginBillNo);
else if (!string.IsNullOrEmpty(dto.EndBillNo))
query = query.Where(w => w.BillNo == dto.EndBillNo);
//订单号查询 //订单号查询
if (!string.IsNullOrEmpty(dto.OrderBillNos)) if (!string.IsNullOrEmpty(dto.OrderBillNos))
{ {
var orderBNS = dto.OrderBillNos.Replace("，", ","); var orderBNS = dto.OrderBillNos.Replace("，", ",");
var orderBillNoList= orderBNS.Split(",").Where(x => !string.IsNullOrEmpty(x)).ToList(); var orderBillNoList = orderBNS.Split(",").Where(x => !string.IsNullOrEmpty(x)).ToList();
if (orderBillNoList != null && orderBillNoList.Count != 0) if (orderBillNoList != null && orderBillNoList.Count != 0)
{ {
query = query.Where(w => orderBillNoList.Contains(w.OrderBillNo)); query = query.Where(w => orderBillNoList.Contains(w.OrderBillNo));