From 29f16e6ba28e199430144c799e13aed979cad4b5 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 15 Nov 2024 14:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 277406 -> 277406 bytes
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |   5 +++++
 .../Dto/InStockTask/InStockTaskBoxInfoDto.cs  |   5 ++++-
 .../InStockTaskRepositories.cs                |   4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 9ffb06c88e00d140b25364194cadf54359cc4f88..73ad28c7bd1a1b9cd157950a0759c761dfba6780 100644
GIT binary patch
delta 2864
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
AF8}}l

delta 3500
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

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 98db1f10..4201d621 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1962,6 +1962,11 @@
             任务箱信息
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.DetailId">
+            <summary>
+            明细Id
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBoxInfoDto.BoxId">
             <summary>
             箱ID
diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
index 51a5f1a3..c9a549d5 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskBoxInfoDto.cs
@@ -9,7 +9,10 @@ namespace WMS.Web.Core.Dto.InStockTask
     /// </summary>
     public class InStockTaskBoxInfoDto
     {
-
+        /// <summary>
+        /// 明细Id
+        /// </summary>
+        public string DetailId { get; set; }
         /// <summary>
         /// 箱ID
         /// </summary>
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index ad0d1510..5a695397 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -184,6 +184,7 @@ namespace WMS.Web.Repositories
                      .SelectMany(x => x.ts.DefaultIfEmpty(), (p, taskBox) => new { p.detail, p.order, p.box, p.taskDet, taskBox })
                      .Where(x => x.detail.TaskId == entity.Id).Select(x => new InStockTaskBoxInfoDto()
                      {
+                         DetailId = "instock_" + x.detail.Id,
                          BoxId = x.box.Id,
                          BoxBillNo = x.box.BoxBillNo,
                          SaleBillNo = x.taskDet.SaleBillNo,
@@ -202,6 +203,8 @@ namespace WMS.Web.Repositories
                          SerialNumbers = (string.Join(",", x.detail.SerialNumbers).TrimEnd(','))
 
                      }).ToListAsync();
+            //这里不知道为什么左连接会查出重复多余数据 需要去重
+            boxList = boxList.GroupBy(g => g.DetailId).Select(s => s.First()).ToList();
 
             var boxIds = boxList.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
 
@@ -214,6 +217,7 @@ namespace WMS.Web.Repositories
                         .SelectMany(x => x.ts.DefaultIfEmpty(), (p, taskDet) => new { p.detail, p.box, taskDet })
                         .Where(x => x.box.TaskId == entity.Id && !boxIds.Contains(x.box.BoxId)).Select(x => new InStockTaskBoxInfoDto()
                         {
+                            DetailId = "instocktask_" + x.detail.Id,
                             BoxId = x.box.BoxId,
                             BoxBillNo = x.box.BoxBillNo,
                             SaleBillNo = x.taskDet.SaleBillNo,