修改了删除

src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml

@@ -591,6 +591,11 @@
             序列号
             </summary>
         </member>
+        <member name="P:BarCode.Web.Core.Dto.Box.DeleteBoxSerialNumberRequest.TwoSerialNumber">
+            <summary>
+            第二个序列号
+            </summary>
+        </member>
         <member name="T:BarCode.Web.Core.Dto.Box.GenerateBoxRequest">
             <summary>
             生成箱码

src/BarCode.Web.Core/Dto/Box/DeleteBoxSerialNumberRequest.cs

@@ -27,5 +27,10 @@ namespace BarCode.Web.Core.Dto.Box
         /// </summary>
         [Required(ErrorMessage = "序列号不能为空")]
         public string SerialNumber { get; set; } = string.Empty;
+        /// <summary>
+        /// 第二个序列号
+        /// </summary>
+        public string? TwoSerialNumber { get; set; } = string.Empty;
+
     }
 }

src/BarCode.Web.Domain/Entitys/BoxDetails.cs

@@ -40,6 +40,11 @@ namespace BarCode.Web.Domain.Entitys
         /// </summary>
         [Column("SerialNumbers")]
         public List<string> SerialNumbers { get; set; } = new List<string>();
+        ///// <summary>
+        ///// 是否计数
+        ///// </summary>
+        //[Column("IsNotCount")]
+        //public string? IsNotCount { get; set; }
         
     }
 }

src/BarCode.Web.Domain/Services/BoxService.cs

@@ -17,6 +17,7 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Npoi.Mapper;
 using NPOI.SS.Formula.Functions;
+using Quartz;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
@@ -294,7 +295,7 @@ namespace BarCode.Web.Domain.Services
                 return Result.ReFailure(ResultCodes.BoxNoDataError);
             if (box.Status == BoxStatus.Complete)
                 return Result.ReFailure(ResultCodes.CartonCompleteError);
-
+           
             var sList = await _serialNumbersRepositories.GetEntityList(new List<string>() { dto.SerialNumber });
             var s = sList.FirstOrDefault(f => f.SerialNumber.Equals(dto.SerialNumber));
             if (s == null)
@@ -309,6 +310,24 @@ namespace BarCode.Web.Domain.Services
             //sList.ForEach(f => f.UnBox());
             s.UnBox();//解绑
 
+
+            if (dto.TwoSerialNumber != null)
+            {
+                var TwosList = await _serialNumbersRepositories.GetEntityList(new List<string>() { dto.TwoSerialNumber });
+                var Twos = sList.FirstOrDefault(f => f.SerialNumber.Equals(dto.TwoSerialNumber));
+                if (Twos == null)
+                    return Result.ReFailure(ResultCodes.SerialNumberNoDateError);
+                //判断使用的是数字序列码还是序列码
+                var TwosStr = s.IsUseNumber == true ? s.TwoNumberCode : s.TwoSerialNumber;
+
+                var TworesUn = box.UnSerialNumber(TwosStr, dto.MaterialNumber);
+                if (!TworesUn.IsSuccess) return TworesUn;
+
+                //var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List<string>() { dto.SerialNumber });
+                //sList.ForEach(f => f.UnBox());
+                Twos.UnBox();//解绑
+            }
+
             IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
             bool res_Rollback = false;
             bool isSuccess = true;

src/BarCode.Web.Domain/Services/SerialNumberService.cs

@@ -454,7 +454,7 @@ namespace BarCode.Web.Domain.Services
 
             foreach (var sg in sGList)
             {
-                int number = sGSNumberList.Where(w => w.GenerateRecordId == sg.Id && w.BoxId > 0).Count();
+                int number = sGSNumberList.Where(w => w.GenerateRecordId == sg.Id && w.BoxId > 0 && w.IsNotCount!="1").Count();
                 sg.Use(number);
             }