修改了第二个数字序列号

src/BarCode.Web.Repositories/SerialNumbersRepositories.cs

@@ -106,6 +106,12 @@ namespace BarCode.Web.Repositories
 
                     string s = GetTwoSerialNumber(entitys, item.SuitNumber);
                     item.GenerateTwoSerialNumber(s);
+
+
+                    string sNumberCode =  GetTwoNumberCode(entitys, item.SuitNumber);
+                    item.GenerateTwoNumberCode(sNumberCode);
+
+
                 }
 
                 await _context.SaveChangesAsync();
@@ -142,6 +148,33 @@ namespace BarCode.Web.Repositories
             }
             return strReturn;
         }
+        /// <summary>
+        /// 产生第二个数字序列码
+        /// </summary>
+        /// <param name="entitys"></param>
+        /// <param name="SuitNumber"></param>
+        public string GetTwoNumberCode(List<SerialNumbers> entitys, string SuitNumber)
+        {
+            string strReturn = "";
+            foreach (var item in entitys)
+            {
+
+                if (item.SuitNumber == SuitNumber)
+                {
+                    if (strReturn == "")
+                    {
+                        strReturn = item.NumberCode;
+                    }
+                    else
+                    {
+                        strReturn = strReturn + "," + item.NumberCode;
+                    }
+
+                }
+            }
+            return strReturn;
+        }
+
         /// <summary>
         /// 批量修改
         /// </summary>
@@ -396,7 +429,7 @@ namespace BarCode.Web.Repositories
 
             var query = _context.SerialNumbers.AsNoTracking()
               .OrderByDescending(o => o.CompleteCartonTime)//以装箱时间先后排序
-             .Where(f => f.BoxId == dto.BoxId && f.isNotCount!="1");
+             .Where(f => f.BoxId == dto.BoxId && f.IsNotCount!="1");
 
             int total = await query.CountAsync();
             var list = await query.Select(s => new SerialNumbersResponse()
@@ -681,8 +714,27 @@ namespace BarCode.Web.Repositories
             var entity = await _context.SerialNumbers.AsNoTracking()
                .FirstOrDefaultAsync(f => serialNumbers.Equals(f.SerialNumber) || serialNumbers.Equals(f.NumberCode));
             return entity;
+            //以上为以前的
+            //var entity = await _context.SerialNumbers.AsNoTracking()
+            //.FirstOrDefaultAsync(f => f.TwoSerialNumber.Contains(serialNumbers) || f.TwoNumberCode.Equals(serialNumbers));
+            //return entity;
         }
 
+        /// <summary>
+        /// wms系统查询序列码 支持数字序列码
+        /// </summary>
+        /// <param name="serialNumbers"></param>
+        /// <returns></returns>
+        public async Task<List<SerialNumbers>> GetEntityWmsBySuitNumber(string suitNumber)
+        {
+            return await _context.SerialNumbers.AsNoTracking()
+          .Where(f => f.TwoSerialNumber.Contains(suitNumber) || f.TwoNumberCode.Contains(suitNumber))
+          .ToListAsync();
+          
+        }
+
+
+
         public async Task<List<SerialNumbers>> GetEntityListContainNumber(List<string> serialNumbers)
         {
             return await _context.SerialNumbers.AsNoTracking()