From 73894a00e084d9fa6cbd30355bc89455ea324cd1 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Wed, 4 Jun 2025 14:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E5=AD=97=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.Api/Controllers/WmsBoxController.cs | 13 +++++++++---- src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml | 5 +++++ .../Dto/SerialNumbers/SerialNumbersWmsResponse.cs | 6 ++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs index d3fe2f0..e0030aa 100644 --- a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs +++ b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs @@ -123,9 +123,12 @@ namespace BarCode.Web.Api.Controllers CreateTime = entity.CreateTime, Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId), IsTwo = entity.IsTwo, - TwoSerialNumber = entity.TwoSerialNumber, + // TwoSerialNumber = entity.TwoSerialNumber, + TwoSerialNumber = entity.TwoNumberCode, TwoNumberCode = entity.TwoNumberCode, - IsNotCount = entity.IsNotCount + IsNotCount = entity.IsNotCount, + NumberCode=entity.NumberCode + }; var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]); entity2.WmsGet(s[i]); @@ -147,7 +150,8 @@ namespace BarCode.Web.Api.Controllers IsTwo = entity.IsTwo, TwoSerialNumber = entity.TwoSerialNumber, TwoNumberCode = entity.TwoNumberCode, - IsNotCount = entity.IsNotCount + IsNotCount = entity.IsNotCount, + NumberCode = entity.NumberCode }; var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]); entity2.WmsGet(s[i]); @@ -168,7 +172,8 @@ namespace BarCode.Web.Api.Controllers IsTwo = entity.IsTwo, TwoSerialNumber = entity.TwoSerialNumber, TwoNumberCode = entity.TwoNumberCode, - IsNotCount = entity.IsNotCount + IsNotCount = entity.IsNotCount, + NumberCode = entity.NumberCode }; entity.WmsGet(dto.SerialNumber); list.Add(entity); diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml index 1ddabd8..ffc38b4 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml @@ -3340,6 +3340,11 @@ 是否不参与记数 + + + 是否不参与记数 + + 序列号生成记录列表返回参数 diff --git a/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs index 6b87b4c..26718bc 100644 --- a/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs +++ b/src/BarCode.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs @@ -48,6 +48,12 @@ namespace BarCode.Web.Core.Dto.SerialNumbers public string? IsNotCount { get; set; } ="0"; + /// + /// 是否不参与记数 + /// + public string? NumberCode { get; set; } = string.Empty; + + }