From 7a585aff577c46454704a7e5bc722d8341d8d95e Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 5 Jan 2024 11:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=B1=E5=8F=B7=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
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/TakeStock/TakeStockQueryInfoResponse.cs | 4 ++++
 src/WMS.Web.Repositories/TakeStockRepositories.cs            | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 66833517..c783c5cc 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -4897,6 +4897,11 @@
             仓位
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.BoxBillNo">
+            <summary>
+            箱号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.Erp_SubStock">
             <summary>
             子仓库
diff --git a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs
index 5fcf0f0e..1c369d74 100644
--- a/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs
@@ -50,6 +50,10 @@ namespace WMS.Web.Core.Dto.TakeStock
         [Column("仓位")]
         public string SubStock { get; set; }
         /// <summary>
+        /// 箱号
+        /// </summary>
+        public string BoxBillNo { get; set; }
+        /// <summary>
         /// 子仓库
         /// </summary>
         [Column("子仓库")]
diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs
index 724eab14..3a8d841f 100644
--- a/src/WMS.Web.Repositories/TakeStockRepositories.cs
+++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs
@@ -216,6 +216,8 @@ namespace WMS.Web.Repositories
             var query = _context.TakeStockDetails
                .GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
                .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
+                .GroupJoin(_context.Box, d => d.detail.BoxId, box => box.Id, (d, box) => new { d, box })
+               .SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.d.detail,p.d.order, box })
                .OrderByDescending(o => o.detail.Id)
                .Where(adv => 1 == 1 && adv.detail.FinalQty > 0);
 
@@ -262,6 +264,7 @@ namespace WMS.Web.Repositories
                 BeforeQty = s.detail.BeforeQty,
                 AfterQty = s.detail.AfterQty,
                 FinalQty = s.detail.FinalQty,
+                BoxBillNo=s.box.BoxBillNo,
                 ResultType = s.order.ResultType.GetRemark(),
                 Remark = s.detail.Remark,
                 FailRemark = s.order.FailRemark,