From c02a4651d0d321bd5730f565f5bc178c516a3026 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Fri, 30 May 2025 11:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=95=B0=E5=AD=97=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 279122 -> 279122 bytes src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 ++ .../SerialNumbers/SerialNumbersWmsResponse.cs | 6 ++ .../Services/SerialNumberService.cs | 53 ++++++++++++++---- 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index fa1f49aa262e3c564499aad8b9b022028701f57f..d035ba2a3b7451b824c2c47513def3b5375cc7be 100644 GIT binary patch delta 19040 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 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 3e509dee..5fd668ef 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -6450,6 +6450,11 @@ 第二个序列号 + + + 第二个数字序列号 + + 是否不参与记数 diff --git a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs index 16e7459c..369d6719 100644 --- a/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs +++ b/src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs @@ -35,6 +35,12 @@ namespace WMS.Web.Core.Dto.SerialNumbers /// 第二个序列号 /// public string TwoSerialNumber { get; set; } + + /// + /// 第二个数字序列号 + /// + public string TwoNumberCode { get; set; } + /// /// 是否不参与记数 /// diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index fc888d3e..9b8f729c 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -1,6 +1,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.Logging; using Newtonsoft.Json; +using NPOI.SS.UserModel; using System; using System.Collections.Generic; using System.Linq; @@ -644,22 +645,54 @@ namespace WMS.Web.Domain.Services //插入序列码信息 if (res.Data.IsTwo > 1) { - string[]serial= res.Data.TwoSerialNumber.Split(','); - for(int j=0;j=0) { - string isNotCount = "0"; - if (serial[j] != serialNumber) + //说明是数字序列号 + isNumberCode = true; + } + if (isNumberCode) + { + for (int j = 0; j < NumberCode.Length; j++) { - isNotCount = "1"; + string isNotCount = "0"; + if (NumberCode[j] != serialNumber) + { + isNotCount = "1"; + } + else + { + isNotCount = "0"; + } + SerialNumbers entity = new SerialNumbers(NumberCode[j], res.Data.MaterialNumber + , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount); + var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); + if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); } - else + + } + else + { + for (int j = 0; j < serial.Length; j++) { - isNotCount = "0"; - } + string isNotCount = "0"; + if (serial[j] != serialNumber) + { + isNotCount = "1"; + } + else + { + isNotCount = "0"; + } SerialNumbers entity = new SerialNumbers(serial[j], res.Data.MaterialNumber , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount); - var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); - if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + var isSuccess = await _serialNumbersRepositories.AddRange(new List() { entity }); + if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); + } } var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);