From d8e10d702977d817dd04f4aa3d2daf595c03904f Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Wed, 4 Jun 2025 16:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=BA=8F=E5=88=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BarCode.Web.Domain/Services/BoxService.cs | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs
index 3c8286a..74fc78d 100644
--- a/src/BarCode.Web.Domain/Services/BoxService.cs
+++ b/src/BarCode.Web.Domain/Services/BoxService.cs
@@ -470,17 +470,32 @@ namespace BarCode.Web.Domain.Services
                     {
                        var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
 
-
-
-                        sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse()
+                        if (sentity.TwoNumberCode.IndexOf(s) >= 0)
                         {
-                            SerialNumber = s,
-                            BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
-                            BarCreateTime = sentity == null ? null : sentity.CreateTime,
-                            IsTwo = sentity==null ? 1 :sentity.IsTwo,
-                            TwoSerialNumber = sentity == null ? s: sentity.TwoSerialNumber,
-                            IsNotCount = sentity == null ? "0":sentity.IsNotCount
-                        });
+
+                            sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse()
+                            {
+                                SerialNumber = s,
+                                BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
+                                BarCreateTime = sentity == null ? null : sentity.CreateTime,
+                                IsTwo = sentity == null ? 1 : sentity.IsTwo,
+                                TwoSerialNumber = sentity == null ? s : sentity.TwoNumberCode,
+                                IsNotCount = sentity == null ? "0" : sentity.IsNotCount
+                            });
+                        }
+                        else
+                        {
+                            sList.Add(new Core.Dto.Box.OpsSerialNumbersResponse()
+                            {
+                                SerialNumber = s,
+                                BarCereateUser = _singleDataService.GetSingleData(SingleAction.Users, box.CompanyId, sentity == null ? 0 : sentity.CreatorId),
+                                BarCreateTime = sentity == null ? null : sentity.CreateTime,
+                                IsTwo = sentity == null ? 1 : sentity.IsTwo,
+                                TwoSerialNumber = sentity == null ? s : sentity.TwoSerialNumber,
+                                IsNotCount = sentity == null ? "0" : sentity.IsNotCount
+                            });
+
+                        }
                         //以前是之前的
                         //// var sentity = serialList.FirstOrDefault(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));
                         ////  var sentity = serialList.GetEntityListBySuitNumber(f => f.SerialNumber.Equals(s) || f.NumberCode.Equals(s));