From 06bd018e090192a6fc95a5122d04da03f2afb30d Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Fri, 9 May 2025 16:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=AD=98=E8=A3=85=E7=AE=B1?=
 =?UTF-8?q?=E5=AD=98=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BarCode.Web.Domain/Services/BoxService.cs   | 17 ++++++++++++++++-
 src/BarCode.Web.Repositories/BoxRepositories.cs |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs
index 35bdb6e..ceaaf24 100644
--- a/src/BarCode.Web.Domain/Services/BoxService.cs
+++ b/src/BarCode.Web.Domain/Services/BoxService.cs
@@ -120,17 +120,32 @@ namespace BarCode.Web.Domain.Services
             if (!resCarton.IsSuccess) return resCarton;
 
             var materialNumbers = dto.Details.GroupBy(g => g.MaterialNumber).Select(s => s.Key).ToList();
+            
             foreach (var m in materialNumbers)
             {
+                List<string> s=[null];
+                s.Clear();
                 var detail = box.Details.FirstOrDefault(f => f.MaterialNumber.Equals(m));
                 var serialNumbers = dto.Details.Where(w => w.MaterialNumber.Equals(m)).Select(s => s.SerialNumber).ToList();
+                for(int i=0;i<serialNumbers.Count;i++)
+                {
+                    //跟据serialNumbers 取得对应的serialNumber
+                 var   serialList2 = await _serialNumbersRepositories.GetEntityListBySuitNumber(serialNumbers[i]);
+                    for (int j = 0; j < serialList2.Count; j++)
+                    {
+                        s.Add( serialList2[j].SerialNumber);
+                    }
+
+                }
+
                 if (detail == null)
                 {
                     detail = new BoxDetails()
                     {
                         MaterialNumber = m,
                         Qty = serialNumbers.Count(),
-                        SerialNumbers = serialNumbers
+                        //SerialNumbers = serialNumbers
+                        SerialNumbers = s
                     };
                     box.Details.Add(detail);
                 }
diff --git a/src/BarCode.Web.Repositories/BoxRepositories.cs b/src/BarCode.Web.Repositories/BoxRepositories.cs
index b3025f4..a066d22 100644
--- a/src/BarCode.Web.Repositories/BoxRepositories.cs
+++ b/src/BarCode.Web.Repositories/BoxRepositories.cs
@@ -321,8 +321,10 @@ namespace BarCode.Web.Repositories
             {
                 if (i == 0)
                     str += $"SerialNumbers like '%\"{serialNumbers[i]}\"%'";
+                //str += $"twoSerialNumber like '%\"{serialNumbers[i]}\"%'";
                 else
                     str += $" or SerialNumbers like '%\"{serialNumbers[i]}\"%'";
+                //str += $" or twoSerialNumber like '%\"{serialNumbers[i]}\"%'";
             }
             var fs = FormattableStringFactory.Create(str);
             var list = _context.Set<BoxDetails>().FromSqlInterpolated(fs).ToList();