改了导出
This commit is contained in:
@@ -137,7 +137,8 @@ namespace WMS.Web.Core.Dto
|
|||||||
/// 是否作废
|
/// 是否作废
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("是否作废")]
|
[Column("是否作废")]
|
||||||
public bool IsRepeal { get; set; }
|
// public bool IsRepeal { get; set; }
|
||||||
|
public string IsRepeal { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 销售订单号
|
/// 销售订单号
|
||||||
|
|||||||
@@ -76,8 +76,8 @@ namespace WMS.Web.Domain.Entitys
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 是否作废
|
/// 是否作废
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
// public bool? IsRepeal { get; set; } = false;
|
||||||
public bool? IsRepeal { get; set; } = false;
|
public bool? IsRepeal { get; set; } = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 销售订单号
|
/// 销售订单号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -971,7 +971,8 @@ namespace WMS.Web.Repositories
|
|||||||
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
|
||||||
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
Remark = s.detail.Remark,
|
Remark = s.detail.Remark,
|
||||||
IsRepeal = s.detail.IsRepeal ?? false,
|
// IsRepeal = s.detail.IsRepeal ?? false,
|
||||||
|
IsRepeal = (bool)s.detail.IsRepeal ? "已作废": "未作废",
|
||||||
SaleBillNo = s.detail.SaleBillNo,
|
SaleBillNo = s.detail.SaleBillNo,
|
||||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user