箱库存获取-修复

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

@@ -2997,6 +2997,21 @@
             序列号集
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxTaskGenerateDto">
+            <summary>
+            盘点-原来箱子
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxTaskGenerateDto.BoxId">
+            <summary>
+            箱子ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxTaskGenerateDto.InventoryInOutType">
+            <summary>
+            类型：1为入库，2为出库
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Inventory.InventoryDetailsGenerateDto">
             <summary>
             即时库存明细：生成dto

src/WMS.Web.Core/Dto/Inventory/BoxTaskGenerateDto.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Inventory
+{
+    /// <summary>
+    /// 盘点-原来箱子
+    /// </summary>
+    public class BoxTaskGenerateDto
+    {
+        /// <summary>
+        /// 箱子ID
+        /// </summary>
+        public int BoxId { get; set; }
+
+        /// <summary>
+        /// 类型：1为入库，2为出库
+        /// </summary>
+        public int InventoryInOutType { get; set; }
+    }
+}

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

@@ -1276,10 +1276,45 @@ namespace WMS.Web.Domain.Services
             return Result.ReSuccess();
         }
 
-        //private async Task<Result> ExeTaskBox(List<string> serNubs,bool isTransaction)
+        private async Task<Result> ExeTaskBox(List<BoxTaskGenerateDto> sourceBox,List<string> serNubs, bool isTransaction)
-        //{
+        {
+            //1.先通过序列号找到-序列号信息集合
+            var serialNumbers = await _serialNumbersRepositories.GetEntityList(serNubs);
+            //2.找到序列号对应的boxId
+            var destBoxIds = serialNumbers.GroupBy(x => x.BoxId).Select(x => x.Key).ToList();
+            //3.找到box对应的箱库存
+            var boxInventorys = await _boxInventoryRepositories.GetList(destBoxIds);
 
-        //}
+            var delete_ids = new List<int>();
+            var update_entitys = new List<BoxInventory>();
+
+            ////遍历
+            //foreach (var destBoxId in destBoxIds)
+            //{
+            //    var sourBox= sourceBox.Where(x => x.BoxId == destBoxId).FirstOrDefault();
+            //    var destBoxInvent= boxInventorys.Where(x => x.BoxId == destBoxId).FirstOrDefault();
+            //    if (sourBox==null && destBoxInvent!=null) 
+            //    {
+            //        if(destBoxInvent)
+            //        var updateEntity = boxInvent;
+            //        updateEntity.Details = boxInvent.Details;
+            //        //3.3序列号重新给值：已有的物料
+            //        updateEntity.Details.ForEach(x =>
+            //        {
+            //            foreach (var detItem in dto.Details)
+            //            {
+            //                if (x.MaterialId == detItem.MaterialId)
+            //                {
+            //                    x.Qty = x.Qty + detItem.Qty;
+            //                    x.SerialNumbers = detItem.SerialNumbers;
+            //                }
+            //            }
+            //        });
+            //    }
+            //}
+            return null;
+
+        }
 
         /// <summary>
         /// 入库单-箱库存变更

src/WMS.Web.Repositories/BoxInventoryRepositories.cs

@@ -139,14 +139,15 @@ namespace WMS.Web.Repositories
                 response.Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, response.StockCode + response.OrgCode);
                 response.SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, response.SubStockId);
                 response.Details = _mapper.Map<List<BoxInventoryDetailsResponse>>(entity.Details);
+                response.Details.ForEach(x =>
+                {
+                    x.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, x.MaterialId);
+                    x.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, x.MaterialId);
+                    x.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.MaterialId);
+                });
                 response.TotalQty = response.Details.Sum(x=>x.Qty);
             }
-            response.Details.ForEach(x => 
+            
-            {
-                x.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, x.MaterialId);
-                x.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, x.MaterialId);
-                x.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, x.MaterialId);
-            });
             return response;
         }