修改了序列号获取

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

@@ -5295,6 +5295,11 @@
             是否不参与记数
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.NumberCode">
+            <summary>
+            数字序列号
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialNumber">
             <summary>
             物料编码
@@ -6460,6 +6465,11 @@
             是否不参与记数
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.NumberCode">
+            <summary>
+            数字序列号
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.SingleData.IdRequest">
             <summary>
             ID请求对象

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

@@ -2364,6 +2364,11 @@
             是否不参与记数
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.SerialNumbers.NumberCode">
+            <summary>
+            数字序列号
+            </summary>
+        </member>
         <member name="M:WMS.Web.Domain.Entitys.SerialNumbers.Bind(System.Int32,System.DateTime)">
             <summary>
             操作(绑定箱信息)

src/WMS.Web.Core/Dto/OpsBoxResponse.cs

@@ -90,6 +90,13 @@ namespace WMS.Web.Core.Dto
         [JsonProperty("isNotCount")]
         public string IsNotCount { get; set; }
 
+        /// <summary>
+        /// 数字序列号
+        /// </summary>
+        [JsonProperty("NumberCode")]
+        public string NumberCode { get; set; }
+
+
 
 
     }

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

@@ -45,6 +45,10 @@ namespace WMS.Web.Core.Dto.SerialNumbers
         /// 是否不参与记数
         /// </summary>
         public string IsNotCount { get; set; }
+        /// <summary>
+        /// 数字序列号
+        /// </summary>
+        public string NumberCode { get; set; }
 
     }
 }

src/WMS.Web.Domain/Entitys/SerialNumbers.cs

@@ -17,7 +17,7 @@ namespace WMS.Web.Domain.Entitys
     public class SerialNumbers : EntityBase
     {
         public SerialNumbers() { }
-        public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount)
+        public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount,string numberCode)
         {
             this.SerialNumber = serialNumber;
             this.MaterialNumber = materialNumber;
@@ -29,6 +29,7 @@ namespace WMS.Web.Domain.Entitys
             this.IsTwo = isTwo;
             this.TwoSerialNumber = twoSerialNumber;
             this.IsNotCount = isNotCount;
+            this.NumberCode = numberCode;
         }
         /// <summary>
         /// 主键 订单编号
@@ -123,6 +124,11 @@ namespace WMS.Web.Domain.Entitys
         [Column("isNotCount")]
         public string IsNotCount { get; set; }= string.Empty;
 
+        /// <summary>
+        /// 数字序列号
+        /// </summary>
+        [Column("NumberCode")]
+        public string NumberCode { get; set; } = string.Empty;
 
         /// <summary>
         /// 操作(绑定箱信息)

src/WMS.Web.Domain/Services/BoxService.cs

@@ -111,7 +111,7 @@ namespace WMS.Web.Domain.Services
                         //SerialNumbers s = new SerialNumbers(serialList[i].SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime);
                         //sList.Add(s);
 
-                    SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount);
+                    SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount,sn.NumberCode);
                     sList.Add(s);
                     //序列号记录(序列号生成)
                     SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialNumber, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);

src/WMS.Web.Domain/Services/SerialNumberService.cs

@@ -538,7 +538,7 @@ namespace WMS.Web.Domain.Services
                 if (s_entity == null)
                 {
                     //序列号
-                    SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0");
+                    SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0","");
                     sList.Add(s_new);
                 }
                 else
@@ -669,7 +669,7 @@ namespace WMS.Web.Domain.Services
                             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);
+                                           , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount,res.Data.NumberCode);
                         var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
                         if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
                     }
@@ -689,7 +689,7 @@ namespace WMS.Web.Domain.Services
                             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);
+                                           , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount,res.Data.NumberCode);
                         var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
                         if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
                     }
@@ -715,7 +715,7 @@ namespace WMS.Web.Domain.Services
 
 
                 SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
-                    , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount);
+                    , 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount,res.Data.NumberCode);
                 var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
                 if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
 

src/WMS.Web.Repositories/SerialNumbersRepositories.cs

@@ -319,8 +319,16 @@ namespace WMS.Web.Repositories
             response.IsTwo = entity.serial.IsTwo;
             if (entity.serial.IsTwo > 1)
             {
+                
                 if (entity.serial.TwoSerialNumber != null)
                 {
+                   // bool isNumber = false;
+                    //if(entity.serial.TwoSerialNumber.IndexOf(serialNumber) >= 0) 
+                    //    {
+                    //    //  isNumber = true;//说明用的是数字序列号
+                    //  //  response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial., "").Replace(",", "");
+                    //}
+
                     response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber, "").Replace(",", "");
                     response.IsNotCount = entity.serial.IsNotCount;
                 }