更改了非采购上架

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

@@ -2838,6 +2838,11 @@
             序列号集
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfDetailsRequest.TwoSerialNumbers">
+            <summary>
+            两件装序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest">
             <summary>
             采购上架-请求对象

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

@@ -902,6 +902,11 @@
             序列号集
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockDetails.TwoSerialNumbers">
+            <summary>
+            第二个序列号集
+            </summary>
+        </member>
         <member name="P:WMS.Web.Domain.Entitys.InStockDetails.IsHasSend">
             <summary>
             是否已发送
@@ -1349,6 +1354,11 @@
             序列号集
             </summary>
         </member>
+        <member name="P:WMS.Web.Domain.Entitys.InStockTotalDetails.TwoSerialNumbers">
+            <summary>
+            第二个序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Entitys.InventoryDetails">
             <summary>
             wms即时库存明细表

src/WMS.Web.Core/Dto/InStock/NoPurchaseShelfRequest.cs

@@ -104,5 +104,9 @@ namespace WMS.Web.Core.Dto.InStock
         /// 序列号集
         /// </summary>
         public List<string> SerialNumbers { get; set; } = new List<string>();
+        /// <summary>
+        /// 两件装序列号集
+        /// </summary>
+        public List<string> TwoSerialNumbers { get; set; } = new List<string>();
     }
 }

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

@@ -64,6 +64,14 @@ namespace WMS.Web.Domain.Entitys
         /// 物料编码
         /// </summary>
         public string MaterialNumber { get; set; }
+
+
+        ///// <summary>
+        ///// 物料编码测试
+        ///// </summary>
+        //public string MaterialNumber2 { get; set; }
+
+
         /// <summary>
         /// 数量
         /// </summary>
@@ -74,6 +82,13 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public List<string> SerialNumbers { get; set; } = new List<string>();
 
+        /// <summary>
+        /// 第二个序列号集
+        /// </summary>
+        [NotMapped]
+        public List<string> TwoSerialNumbers { get; set; } = new List<string>();
+
+
         /// <summary>
         /// 是否已发送
         /// </summary>

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

@@ -49,5 +49,12 @@ namespace WMS.Web.Domain.Entitys
         /// 序列号集
         /// </summary>
         public List<string> SerialNumbers { get; set; } = new List<string>();
+
+        /// <summary>
+        /// 第二个序列号集
+        /// </summary>
+        [NotMapped]
+        public List<string> TwoSerialNumbers { get; set; } = new List<string>();
+
     }
 }

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

@@ -566,8 +566,9 @@ namespace WMS.Web.Domain.Services
             //3.遍历：box信息,并拼装入库单明细
             foreach (var box in dto.Boxs)
             {
-                //3.1先数据映射
+               
-                var dets = _mapper.Map<List<InStockDetails>>(box.Details);
+                 //3.1先数据映射
+                 var dets = _mapper.Map<List<InStockDetails>>(box.Details);
                 //3.2遍历赋值：boxID和仓库和仓位和来源单和供应商和组织
                 dets.ForEach(item => 
                 {
@@ -577,9 +578,11 @@ namespace WMS.Web.Domain.Services
                 });
                 //3.3添加到临时集合中
                 temps.AddRange(dets);
+
             }
             //3.4给对象明细赋值
             entity.Details = temps;
+           
             //4.创建
             entity.Create(loginInfo.UserInfo.StaffId);
 
@@ -597,6 +600,12 @@ namespace WMS.Web.Domain.Services
                         var current_box_mat_serNums = current_box_serNums.Where(t => t.MaterialNumber == x.MaterialNumber).Select(t => t.SerialNumber).ToList();
                         x.SerialNumbers.AddRange(current_box_mat_serNums);
                     }
+                    if (x.TwoSerialNumbers != null)
+                    {
+                        x.SerialNumbers.AddRange(x.TwoSerialNumbers);
+                    }
+
+
                 });
             }
 
@@ -609,14 +618,16 @@ namespace WMS.Web.Domain.Services
             var totalDetails = dto.Boxs.SelectMany(x => x.Details).GroupBy(x => new { x.MaterialNumber })
                 .Select(x => new InStockTotalDetails
                 {
+      
                     InStockId = entity.Id,
                     TaskId = dto.TaskId,
                     SourceBillNo = task.SourceBillNo,
                     MaterialNumber = x.Key.MaterialNumber,
                     Qty = x.Sum(t => t.Qty),
-                    SerialNumbers = x.SelectMany(t => t.SerialNumbers).ToList()
+                    SerialNumbers = x.SelectMany(t => t.SerialNumbers).ToList(),
+                    TwoSerialNumbers = x.SelectMany(t => t.TwoSerialNumbers).ToList()
                 }).ToList();
-
+           
             var isSuccess = await _inStockRepositories.AddRangeTotalDetails(totalDetails, isTransaction);
             if (!isSuccess)
                 return Result.ReFailure(ResultCodes.DateWriteError);

src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs

@@ -227,6 +227,15 @@ namespace WMS.Web.Repositories.Configuration
                         (c1, c2) => c1.SequenceEqual(c2),
                         c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
                         c => (List<string>)c.ToList()));
+
+                ent.Property(f => f.TwoSerialNumbers).HasConversion(
+                  v => JsonConvert.SerializeObject(v),
+                  v => JsonConvert.DeserializeObject<List<string>>(v),
+                  new ValueComparer<List<string>>(
+                      (c1, c2) => c1.SequenceEqual(c2),
+                      c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v.GetHashCode())),
+                      c => (List<string>)c.ToList()));
+
             });
             builder.Entity<InStockErpDetails>(ent =>
             {

src/WMS.Web.Repositories/InStockRepositories.cs

@@ -1,6 +1,7 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
+using NPOI.POIFS.FileSystem;
 using Org.BouncyCastle.Crypto;
 using System;
 using System.Collections.Generic;
@@ -153,6 +154,25 @@ namespace WMS.Web.Repositories
             {
                 if (entitys != null && entitys.Count != 0)
                 {
+                    //  entitys[0].SerialNumbers = entitys[0].SerialNumbers.Add(entitys[0].TwoSerialNumbers);
+                    //List<InStockTotalDetails> entitys2=new List<InStockTotalDetails>();
+                    //for (int i = 0; i < entitys.Count; i++)
+                    //{
+
+                    //        entitys[i].SerialNumbers = entitys[i].SerialNumbers.AddRange();
+
+
+                    //}
+                    //赋值序列号
+                    entitys.ForEach(x =>
+                    {
+                       
+                        if (x.TwoSerialNumbers != null)
+                        {
+                            x.SerialNumbers.AddRange(x.TwoSerialNumbers);
+                        }
+                    });
+
                     await _context.InStockTotalDetails.AddRangeAsync(entitys);
                     await _context.SaveChangesAsync();
                 }