diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs
index 94960172..63ad8ee5 100644
--- a/src/WMS.Web.Domain/Services/SerialNumberService.cs
+++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs
@@ -320,7 +320,14 @@ namespace WMS.Web.Domain.Services
         {
             //获取序列号信息
             var serialNumbers = inStock.Details.SelectMany(s => s.SerialNumbers).ToList();
+            var TwoserialNumbers = inStock.Details.SelectMany(s => s.TwoSerialNumbers).ToList();
+
+            ////开始添加
+            //var twoserialNumbers = inStock.Details.SelectMany(s => s.TwoSerialNumbers).ToList();
+            //serialNumbers.AddRange(twoserialNumbers);
+            ////add by yzh 
             var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
+            var TwoentityList = await _serialNumbersRepositories.GetEntityList(TwoserialNumbers);
             var boxIds = inStock.Details.Select(s => s.BoxId).ToList();
             var boxList = await _boxRepositories.GetEntityList(boxIds);
             var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
@@ -331,10 +338,12 @@ namespace WMS.Web.Domain.Services
             bool isRollback = false;
             bool isSuccess = true;
             List<SerialNumberOperate> sList = new List<SerialNumberOperate>();
+           //  boxId = 0;
+        
             foreach (var entity in entityList)
             {
-                var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
-                var box = boxList.FirstOrDefault(f => f.Id == boxId);
+                int boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
+                var   box = boxList.FirstOrDefault(f => f.Id == boxId);
                 var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
                 var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode);
                 //修改序列号和箱绑定关系
@@ -356,8 +365,43 @@ namespace WMS.Web.Domain.Services
                     + "\r\n" + "仓位号:" + subStock
                 };
                 sList.Add(op);
+
+
             }
+            //if (TwoentityList != null)
+            //{
+            //    foreach (var entity in TwoentityList)
+            //    {
+            //        var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
+            //        var box = boxList.FirstOrDefault(f => f.Id == boxId);
+            //        var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
+            //        var subStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, inStock.SubStockCode + inStock.StockCode + inStock.OrgCode);
+            //        //修改序列号和箱绑定关系
+            //        entity.InStock(instockDetail.SourceBillNo, inStock.Type);
+            //        entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
+
+            //        //记录序列号操作日志
+            //        SerialNumberOperate op = new SerialNumberOperate()
+            //        {
+            //            MaterialNumber = entity.MaterialNumber,
+            //            SerialNumber = entity.SerialNumber,
+            //            OrgId = box?.OrgId ?? 0,
+            //            SupplierId = box?.SupplierId ?? 0,
+            //            OperateTime = DateTime.Now,
+            //            OperateType = InStockTypeConvert(inStock.Type),
+            //            OperateUser = userName,
+            //            Remark = "来源单号:" + inStock.Details.First().SourceBillNo
+            //            + "\r\n" + "入库单号:" + inStock.BillNo
+            //            + "\r\n" + "仓位号:" + subStock
+            //        };
+            //        sList.Add(op);
+            //    }
+            //    isSuccess = await _serialNumbersRepositories.EditEntityList(TwoentityList, false);
+            //}
             isSuccess = await _serialNumbersRepositories.EditEntityList(entityList, false);
+
+           
+
             //序列号操作记录
             var res = await this.SerialNumberOperate(sList, false);
             //提交事务