From 3188c0023bc602c39d7b54d7b7c15da23a74d630 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Fri, 1 Aug 2025 17:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E7=A0=81=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SerialNumberController.cs     |  3 ++-
 .../wwwroot/BarCode.Web.Core.xml              |  5 ++++
 .../OperateSerialNumberRequest.cs             |  5 ++++
 .../Services/SerialNumberService.cs           | 23 ++++++++++++++++++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/BarCode.Web.Api/Controllers/SerialNumberController.cs b/src/BarCode.Web.Api/Controllers/SerialNumberController.cs
index 0b2031e..bcc084f 100644
--- a/src/BarCode.Web.Api/Controllers/SerialNumberController.cs
+++ b/src/BarCode.Web.Api/Controllers/SerialNumberController.cs
@@ -160,7 +160,8 @@ namespace BarCode.Web.Api.Controllers
                 {
                     GenerateRecordIds = new List<int>() { dto.GenerateRecordId },
                     IsAll = false,
-                    SerialNumbers = dto.SerialNumbers
+                    SerialNumbers = dto.SerialNumbers,
+                    IsTwo=dto.isTwo
                 }).GetAwaiter().GetResult();
             }
             else
diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
index 823b338..8daae1e 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
@@ -2914,6 +2914,11 @@
             如果是部分操作(序列号) 全部操作的话可不传
             </summary>
         </member>
+        <member name="P:BarCode.Web.Core.Dto.SerialNumbers.OperateSerialNumberRequest.IsTwo">
+            <summary>
+            是否为两件件
+            </summary>
+        </member>
         <member name="T:BarCode.Web.Core.Dto.SerialNumbers.TransferSNOneTwoTwoRequest">
             <summary>
             操作序列号请求接口(打印 下载)
diff --git a/src/BarCode.Web.Core/Dto/SerialNumbers/OperateSerialNumberRequest.cs b/src/BarCode.Web.Core/Dto/SerialNumbers/OperateSerialNumberRequest.cs
index 7a544d4..8cf11f3 100644
--- a/src/BarCode.Web.Core/Dto/SerialNumbers/OperateSerialNumberRequest.cs
+++ b/src/BarCode.Web.Core/Dto/SerialNumbers/OperateSerialNumberRequest.cs
@@ -23,6 +23,11 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
         /// 如果是部分操作(序列号) 全部操作的话可不传
         /// </summary>
         public List<string> SerialNumbers { get; set; } = new List<string>();
+        /// <summary>
+        /// 是否为两件件
+        /// </summary>
+        public int IsTwo { get; set; }
+
     }
 
     /// <summary>
diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
index c4dffd8..c0b60a4 100644
--- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs
+++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
@@ -16,6 +16,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using NPOI.HPSF;
+using NPOI.HSSF.Record;
 using NPOI.OpenXmlFormats.Wordprocessing;
 using Org.BouncyCastle.Crypto;
 using System;
@@ -297,7 +298,27 @@ namespace BarCode.Web.Domain.Services
                 olist = snGRList;
             else
             {
-                olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList();
+                if (dto.IsTwo == 2)//说明为两件装
+                {
+                   var olistTmp=snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList();
+                    List<string> s = new List<string>();
+                    for (var i = 0; i < olistTmp.Count; i++)
+                    {
+                        
+                        string[] y= olistTmp[i].TwoSerialNumber.Split(',');
+                        s.Add(y[0]);
+                        s.Add(y[1]);
+                    }
+                    s.Distinct();
+                    var snGRList2 = await _serialNumbersRepositories.GetEntityList(s);
+                    olist=snGRList2;
+                }
+                else
+                { 
+
+                    olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.SerialNumber)).ToList();
+                }
+                //olist = snGRList.Where(w => dto.SerialNumbers.Contains(w.TwoSerialNumber)).ToList();
             }
             olist.ForEach(f => f.DownLoad());