diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index fa1f49aa..d035ba2a 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
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);