列表时间查询
This commit is contained in:
@@ -330,12 +330,12 @@
|
|||||||
操作人
|
操作人
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.BeginDate">
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.CreateBeginDate">
|
||||||
<summary>
|
<summary>
|
||||||
生成开始时间
|
生成开始时间
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.EndDate">
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.CreateEndDate">
|
||||||
<summary>
|
<summary>
|
||||||
生成结束时间
|
生成结束时间
|
||||||
</summary>
|
</summary>
|
||||||
|
|||||||
@@ -37,10 +37,10 @@ namespace WMS.Web.Core.Dto
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 生成开始时间
|
/// 生成开始时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime? BeginDate { get; set; } = null;
|
public DateTime? CreateBeginDate { get; set; } = null;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 生成结束时间
|
/// 生成结束时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime? EndDate { get; set; } = null;
|
public DateTime? CreateEndDate { get; set; } = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -758,7 +758,7 @@ namespace WMS.Web.Domain.Services
|
|||||||
FormId = FormIdParam.PUR_PurchaseOrder.ToString(),
|
FormId = FormIdParam.PUR_PurchaseOrder.ToString(),
|
||||||
TargetFormId = FormIdParam.STK_InStock.ToString(),
|
TargetFormId = FormIdParam.STK_InStock.ToString(),
|
||||||
DetailsId = s.ErpDetailId.ToString(),
|
DetailsId = s.ErpDetailId.ToString(),
|
||||||
IsDraftWhenSaveFail = true
|
IsDraftWhenSaveFail = true//是否需要暂存
|
||||||
};
|
};
|
||||||
//下推金蝶
|
//下推金蝶
|
||||||
var res = await this.Push(erpDto, s, entity.BillNo, sc_erpService, sc_inStockRepositories);
|
var res = await this.Push(erpDto, s, entity.BillNo, sc_erpService, sc_inStockRepositories);
|
||||||
|
|||||||
@@ -100,9 +100,9 @@ namespace WMS.Web.Repositories
|
|||||||
query = query.Where(w => ids.Contains(w.order.CreatorId));
|
query = query.Where(w => ids.Contains(w.order.CreatorId));
|
||||||
|
|
||||||
if (dto.CreateBeginDate != null)
|
if (dto.CreateBeginDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
|
query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value);
|
||||||
if (dto.CreateEndDate != null)
|
if (dto.CreateEndDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
|
query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value);
|
||||||
|
|
||||||
int total = await query.CountAsync();
|
int total = await query.CountAsync();
|
||||||
var list = await query.Select(s => new BackRecordQueryResponse()
|
var list = await query.Select(s => new BackRecordQueryResponse()
|
||||||
|
|||||||
@@ -119,10 +119,10 @@ namespace WMS.Web.Repositories
|
|||||||
|
|
||||||
if (!string.IsNullOrEmpty(dto.Creator))
|
if (!string.IsNullOrEmpty(dto.Creator))
|
||||||
query = query.Where(w => cr_ids.Contains(w.order.CreatorId));
|
query = query.Where(w => cr_ids.Contains(w.order.CreatorId));
|
||||||
if (dto.BeginDate != null)
|
if (dto.CreateBeginDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime.Date >= dto.BeginDate.Value);
|
query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value);
|
||||||
if (dto.EndDate != null)
|
if (dto.CreateEndDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime.Date <= dto.EndDate.Value);
|
query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value);
|
||||||
|
|
||||||
int total = await query.CountAsync();
|
int total = await query.CountAsync();
|
||||||
var list = await query.Select(s => new BoxMarkQueryResponse()
|
var list = await query.Select(s => new BoxMarkQueryResponse()
|
||||||
|
|||||||
@@ -348,9 +348,9 @@ namespace WMS.Web.Repositories
|
|||||||
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
||||||
|
|
||||||
if (dto.CreateBeginDate != null)
|
if (dto.CreateBeginDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime >= dto.CreateBeginDate.Value);
|
query = query.Where(w => w.order.CreateTime.Date >= dto.CreateBeginDate.Value);
|
||||||
if (dto.CreateEndDate != null)
|
if (dto.CreateEndDate != null)
|
||||||
query = query.Where(w => w.order.CreateTime <= dto.CreateEndDate.Value);
|
query = query.Where(w => w.order.CreateTime.Date <= dto.CreateEndDate.Value);
|
||||||
|
|
||||||
if (dto.SuccessSync.HasValue)
|
if (dto.SuccessSync.HasValue)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user