diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs index 7063e6a5..7a67cb10 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs @@ -137,7 +137,8 @@ namespace WMS.Web.Core.Dto /// 是否作废 /// [Column("是否作废")] - public bool IsRepeal { get; set; } + // public bool IsRepeal { get; set; } + public string IsRepeal { get; set; } /// /// 销售订单号 diff --git a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs index f110cfee..05d73648 100644 --- a/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs @@ -76,8 +76,8 @@ namespace WMS.Web.Domain.Entitys /// /// 是否作废 /// + // public bool? IsRepeal { get; set; } = false; public bool? IsRepeal { get; set; } = false; - /// /// 销售订单号 /// diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index b7ae3fc3..40994223 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -971,7 +971,8 @@ namespace WMS.Web.Repositories 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"), Remark = s.detail.Remark, - IsRepeal = s.detail.IsRepeal ?? false, + // IsRepeal = s.detail.IsRepeal ?? false, + IsRepeal = (bool)s.detail.IsRepeal ? "已作废": "未作废", SaleBillNo = s.detail.SaleBillNo, }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();