diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml index 80207e2..7c39673 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml @@ -894,12 +894,18 @@ 下载 - + + + 是否不参与计数,0和空代表参与计数,1代表不参与计数 + + + 装箱 + /// 是否不参与计数 diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs index 04ae230..67e5684 100644 --- a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs @@ -234,12 +234,20 @@ namespace BarCode.Web.Domain.Entitys this.DownLoadNumber++; this.DownLoadTime = DateTime.Now; } + + /// + /// 是否不参与计数,0和空代表参与计数,1代表不参与计数 + /// + [Column("isNotCount")] + public string? isNotCount { get; set; } = string.Empty; + /// /// 装箱 /// /// /// - public void CompleteBox(int boxId, string str) + /// /// 是否不参与计数 + public void CompleteBox(int boxId, string str,string isNotCount) { //每个序列码延时1毫秒来装箱 这样到时候获取序列码时就可以来排序 Thread.Sleep(1); @@ -247,6 +255,7 @@ namespace BarCode.Web.Domain.Entitys this.CompleteCartonTime = DateTime.Now; this.IsUse = true; this.IsUseNumber = this.NumberCode.Equals(str) ? true : false; + this.isNotCount= isNotCount; } /// /// 解绑箱 diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs index 1a5a0ff..fedf54b 100644 --- a/src/BarCode.Web.Domain/Services/BoxService.cs +++ b/src/BarCode.Web.Domain/Services/BoxService.cs @@ -166,11 +166,11 @@ namespace BarCode.Web.Domain.Services { if(serialList[i].SerialNumber.ToString() == d) { - serialList[i].CompleteBox(box.Id, d); + serialList[i].CompleteBox(box.Id, d,"0"); } else { - serialList[i].CompleteBox(0, d); + serialList[i].CompleteBox(box.Id, d,"1"); } } diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index 2c5cc2d..f75ec2f 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -396,7 +396,7 @@ namespace BarCode.Web.Repositories var query = _context.SerialNumbers.AsNoTracking() .OrderByDescending(o => o.CompleteCartonTime)//以装箱时间先后排序 - .Where(f => f.BoxId == dto.BoxId); + .Where(f => f.BoxId == dto.BoxId && f.isNotCount!="1"); int total = await query.CountAsync(); var list = await query.Select(s => new SerialNumbersResponse()