扫数字序列号

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

@@ -6450,6 +6450,11 @@
             第二个序列号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.TwoNumberCode">
+            <summary>
+            第二个数字序列号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.IsNotCount">
             <summary>
             是否不参与记数

src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs

@@ -35,6 +35,12 @@ namespace WMS.Web.Core.Dto.SerialNumbers
         /// 第二个序列号
         /// </summary>
         public string TwoSerialNumber { get; set; }
+
+        /// <summary>
+        /// 第二个数字序列号
+        /// </summary>
+        public string TwoNumberCode { get; set; }
+
         /// <summary>
         /// 是否不参与记数
         /// </summary>

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,8 +645,39 @@ namespace WMS.Web.Domain.Services
             //插入序列码信息
             if (res.Data.IsTwo > 1)
             {
-                string[]serial= res.Data.TwoSerialNumber.Split(',');
+                string[] serial = res.Data.TwoSerialNumber.Split(',');
-               for(int j=0;j<serial.Length;j++)
+
+                string[] NumberCode = res.Data.TwoNumberCode.Split(',');
+
+                bool isNumberCode = false;
+                if(res.Data.TwoNumberCode.IndexOf(serialNumber)>=0)
+                {
+                    //说明是数字序列号
+                    isNumberCode = true;
+                }
+                if (isNumberCode)
+                {
+                    for (int j = 0; j < NumberCode.Length; j++)
+                    {
+                        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<SerialNumbers>() { entity });
+                        if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
+                    }
+
+                }
+                else
+                {
+                    for (int j = 0; j < serial.Length; j++)
                     {
                         string isNotCount = "0";
                         if (serial[j] != serialNumber)
@@ -661,6 +693,7 @@ namespace WMS.Web.Domain.Services
                         var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
                         if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
                     }
+                }
                 
                 var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
                 if (res_s == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);