Merge branch 'v1.0.5' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api into v1.0.5
This commit is contained in:
@@ -163,7 +163,10 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.changeBox.CreateTime >= dto.CreateBeginDate);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.changeBox.CreateTime <= dto.CreateEndDate);
|
||||
{
|
||||
DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
|
||||
query = query.Where(w => w.changeBox.CreateTime <= dt_end);
|
||||
}
|
||||
//组装
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new ChangeBoxRecordQueryInfoResponse()
|
||||
|
||||
@@ -173,7 +173,10 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.moveBox.CreateTime >= dto.CreateBeginDate);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.moveBox.CreateTime <= dto.CreateEndDate);
|
||||
{
|
||||
DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
|
||||
query = query.Where(w => w.moveBox.CreateTime <= dt_end);
|
||||
}
|
||||
//组装
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new MoveBoxRecordQueryInfoResponse()
|
||||
|
||||
@@ -175,7 +175,10 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate);
|
||||
{
|
||||
DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
|
||||
query = query.Where(w => w.order.CreateTime <= dt_end);
|
||||
}
|
||||
//组装
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new OutStockQueryInfoResponse()
|
||||
|
||||
@@ -311,7 +311,10 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.OperateTime >= dto.CreateBeginDate);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.OperateTime <= dto.CreateEndDate);
|
||||
{
|
||||
DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
|
||||
query = query.Where(w => w.order.OperateTime <= dt_end);
|
||||
}
|
||||
//组装
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new OutStockTaskQueryInfoResponse()
|
||||
|
||||
@@ -249,7 +249,10 @@ namespace WMS.Web.Repositories
|
||||
if (dto.CreateBeginDate != null)
|
||||
query = query.Where(w => w.order.Date >= dto.CreateBeginDate);
|
||||
if (dto.CreateEndDate != null)
|
||||
query = query.Where(w => w.order.Date <= dto.CreateEndDate);
|
||||
{
|
||||
DateTime dt_end = ((DateTime)dto.CreateEndDate).AddDays(1);
|
||||
query = query.Where(w => w.order.Date <= dt_end);
|
||||
}
|
||||
//组装
|
||||
int total = await query.CountAsync();
|
||||
var list = await query.Select(s => new TakeStockQueryInfoResponse()
|
||||
|
||||
Reference in New Issue
Block a user