From 8febb925af12a7f8d75609b28f1db0dc40d840f1 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Tue, 28 Jul 2026 17:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BB=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml                     | 5 +++++
 src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs    | 4 ++++
 .../Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs      | 2 ++
 src/WMS.Web.Domain/Services/OutStockTaskService.cs           | 1 +
 src/WMS.Web.Repositories/InStockTaskRepositories.cs          | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index b60ee1e1..eecbff78 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -2143,6 +2143,11 @@
             </summary>
         </member>
         <!-- Badly formed XML comment ignored for member "P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.RealityQty" -->
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.shelfSpace">
+            <summary>
+            入库仓位
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.SerialNumbers">
             <summary>
             序列号
diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
index c9a549d5..43e6312f 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
@@ -76,6 +76,10 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// 入库数量
         /// </summary>
         public decimal RealityQty { get; set; }
+        /// <summary>
+        /// 入库仓位
+        /// </summary>
+        public string shelfSpace { get; set; }
 
         /// <summary>
         /// 序列号
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs
index e87acef2..e94fed8c 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskInfoDetailsResponse.cs
@@ -88,5 +88,7 @@ namespace WMS.Web.Core.Dto.OutStockTask
 
         public int MaterialCount { get; set; } = 0;
 
+        public string position { get; set; }
+
     }
 }
diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
index 93f996aa..226185ea 100644
--- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs
@@ -655,6 +655,7 @@ namespace WMS.Web.Domain.Services
                     BoxHigh = b.BoxHigh,
                     BoxWeight = b.BoxWeight,
                     Qty = b.Qty,
+                    position=b.SubStockCode,
                     SerialNumbers = string.Join(",", b.SerialNumbers),
                     SerialNumberList = b.SerialNumbers,
                     Method = outStock.Method.GetRemark(),
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index fd9e3e48..b781b8d1 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -197,6 +197,7 @@ namespace WMS.Web.Repositories
                          RealityQty = x.detail.Qty,
                          ReceiveQty = x.detail.Qty,
                          ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                         shelfSpace=x.order.SubStockCode,
                          Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId),
                          Receiver = "",
                          ReceiveTime = "",
@@ -249,6 +250,7 @@ namespace WMS.Web.Repositories
                                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, boxdetail.MaterialNumber),
                                 ShelfTime = "",
                                 Shelfer = "",
+                                shelfSpace ="",
                                 ReceiveTime = boxd.CreateTime.HasValue ? boxd.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                                 Receiver = boxd.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, boxd.ReceiverId.Value) : "",
                                 SerialNumbers = boxdetail.SerialNumbers != null && boxdetail.SerialNumbers.Count() > 0 ? (string.Join(",", boxdetail.SerialNumbers).TrimEnd(',')) : "",
@@ -281,6 +283,7 @@ namespace WMS.Web.Repositories
                             Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.detail.MaterialNumber),
                             ShelfTime = "",
                             Shelfer = "",
+                            shelfSpace = "",
                             ReceiveTime = x.box.CreateTime.HasValue ? x.box.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                             Receiver = x.box.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.box.ReceiverId.Value) : "",
                             SerialNumbers = x.detail.SerialNumbers != null && x.detail.SerialNumbers.Count() > 0 ? (string.Join(",", x.detail.SerialNumbers).TrimEnd(',')) : "",