更改了非采购上架

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);