From 1aa92be4d194ac2de095335c88d46218cb186e75 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Mon, 7 Jul 2025 11:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs | 3 ++-
 src/WMS.Web.Domain/Entitys/InstockTaskDetails.cs             | 2 +-
 src/WMS.Web.Repositories/InStockTaskRepositories.cs          | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

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
         /// 是否作废
         /// </summary>
         [Column("是否作废")]
-        public bool IsRepeal { get; set; }
+        //  public bool IsRepeal { get; set; }
+        public string IsRepeal { get; set; }
 
         /// <summary>
         /// 销售订单号
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
         /// <summary>
         /// 是否作废
         /// </summary>
+        // public bool? IsRepeal { get; set; } = false;
         public bool? IsRepeal { get; set; } = false;
-
         /// <summary>
         /// 销售订单号
         /// </summary>
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();