非采购上架-箱库存

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

@@ -1280,6 +1280,11 @@
             来源单号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto.BoxId">
+            <summary>
+            箱ID
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto.Details">
             <summary>
             明细
@@ -1870,11 +1875,6 @@
             箱集合
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskDetails">
-            <summary>
-            入库任务单明细
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Details">
             <summary>
             入库单明细
@@ -1885,6 +1885,11 @@
             采购上架-请求对象
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest.BoxIds">
+            <summary>
+            箱IDS
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest.Details">
             <summary>
             明细
@@ -2100,6 +2105,97 @@
             是否是上架：true是上架，false是下架
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto">
+            <summary>
+            非采购上架-箱库存处理对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto.ShelfMethod">
+            <summary>
+            非采购上架方式
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto.StockCode" -->
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto.SubStockId">
+            <summary>
+            仓位ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto.BoxIds">
+            <summary>
+            箱IDS
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseDetailsGenerateDto">
+            <summary>
+            非采购上架明细-箱库存处理对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseDetailsGenerateDto.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseDetailsGenerateDto.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseDetailsGenerateDto.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto">
+            <summary>
+            采购上架-箱库存处理对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto.StockCode">
+            <summary>
+            仓库编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto.SubStockId">
+            <summary>
+            仓位ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto.BoxIds">
+            <summary>
+            箱IDS
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseDetailsGenerateDto">
+            <summary>
+            采购上架明细-箱库存处理对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseDetailsGenerateDto.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseDetailsGenerateDto.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseDetailsGenerateDto.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest">
             <summary>
             箱库存-查询请求对象

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

@@ -3099,6 +3099,22 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.InventoryService.GeneratePurchaseBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto},System.Boolean)">
+            <summary>
+            采购上架-箱库存变更
+            </summary>
+            <param name="dtoDatas"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.InventoryService.GenerateNoPurchaseBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryNoPurchaseGenerateDto},System.Boolean)">
+            <summary>
+            非采购上架-箱库存变更
+            </summary>
+            <param name="dtoDatas"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.OutStockService">
             <summary>
             出库服务

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

@@ -28,11 +28,6 @@ namespace WMS.Web.Core.Dto.InStock
         /// </summary>
         public List<UpdateInStockTaskBoxRequest> Boxs { get; set; } = new List<UpdateInStockTaskBoxRequest>();
 
-        /// <summary>
-        /// 入库任务单明细
-        /// </summary>
-        public List<UpdateInStockTaskDetailsRequest> TaskDetails { get; set; } = new List<UpdateInStockTaskDetailsRequest>();
-
         /// <summary>
         /// 入库单明细
         /// </summary>

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

@@ -9,6 +9,12 @@ namespace WMS.Web.Core.Dto.InStock
     /// </summary>
     public class PurchaseShelfRequest
     {
+
+        /// <summary>
+        /// 箱IDS
+        /// </summary>
+        public List<int> BoxIds { get; set; } = new List<int>();
+
         /// <summary>
         /// 明细
         /// </summary>

src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs

@@ -22,6 +22,12 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// </summary>
         public string SourceBillNo { get; set; }
 
+        /// <summary>
+        /// 箱ID
+        /// </summary>
+        public int BoxId { get; set; }
+
+
         /// <summary>
         /// 明细
         /// </summary>

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

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Inventory
+{
+    /// <summary>
+    /// 非采购上架-箱库存处理对象
+    /// </summary>
+    public class BoxInventoryNoPurchaseGenerateDto
+    {
+        /// <summary>
+        /// 非采购上架方式
+        /// </summary>
+        public int ShelfMethod { get; set; }
+
+        // <summary>
+        /// 仓库编码
+        /// </summary>
+        public string StockCode { get; set; }
+
+        /// <summary>
+        /// 仓位ID
+        /// </summary>
+        public int SubStockId { get; set; }
+
+        /// <summary>
+        /// 箱IDS
+        /// </summary>
+        public List<int> BoxIds { get; set; } = new List<int>();
+
+        /// <summary>
+        /// 明细
+        /// </summary>
+        public List<BoxInventoryNoPurchaseDetailsGenerateDto> Details { get; set; } = new List<BoxInventoryNoPurchaseDetailsGenerateDto>();
+    }
+
+    /// <summary>
+    /// 非采购上架明细-箱库存处理对象
+    /// </summary>
+    public class BoxInventoryNoPurchaseDetailsGenerateDto 
+    {
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int MaterialId { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        public List<string> SerialNumbers { get; set; } = new List<string>();
+    }
+}

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

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Inventory
+{
+    /// <summary>
+    /// 采购上架-箱库存处理对象
+    /// </summary>
+    public class BoxInventoryPurchaseGenerateDto
+    {        
+
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string StockCode { get; set; }
+
+        /// <summary>
+        /// 仓位ID
+        /// </summary>
+        public int SubStockId { get; set; }
+
+        /// <summary>
+        /// 箱IDS
+        /// </summary>
+        public List<int> BoxIds { get; set; } = new List<int>();
+
+        /// <summary>
+        /// 明细
+        /// </summary>
+        public List<BoxInventoryPurchaseDetailsGenerateDto> Details { get; set; } = new List<BoxInventoryPurchaseDetailsGenerateDto>();
+    }
+
+    /// <summary>
+    /// 采购上架明细-箱库存处理对象
+    /// </summary>
+    public class BoxInventoryPurchaseDetailsGenerateDto 
+    {
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        public int MaterialId { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 序列号集
+        /// </summary>
+        public List<string> SerialNumbers { get; set; } = new List<string>();
+    }
+}

src/WMS.Web.Domain/Mappers/InventoryMapper.cs

@@ -24,6 +24,14 @@ namespace WMS.Web.Domain.Mappers
             //出入库回退上下架映射
             CreateMap<BoxInventoryBackGenerateDto, BoxInventory>();
             CreateMap<BoxInventoryBackDetailsGenerateDto, BoxInventoryDetails>();
+
+            //采购上架映射
+            CreateMap<BoxInventoryPurchaseGenerateDto, BoxInventory>();
+            CreateMap<BoxInventoryPurchaseDetailsGenerateDto, BoxInventoryDetails>();
+
+            //采购上架映射
+            CreateMap<BoxInventoryNoPurchaseGenerateDto, BoxInventory>();
+            CreateMap<BoxInventoryNoPurchaseDetailsGenerateDto, BoxInventoryDetails>();
         }
     }
 }

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

@@ -159,6 +159,7 @@ namespace WMS.Web.Domain.Services
 
             //3.组装返回数据
             var result = _mapper.Map<InStockTaskInfoDto>(tast);
+            result.BoxId = box.Id;
             foreach (var item in tast.Details)
             {
                 //3.1判断当前物料是否相同
@@ -220,7 +221,15 @@ namespace WMS.Web.Domain.Services
             var updateInStockTaskRequest = new UpdateInStockTaskRequest();
             updateInStockTaskRequest.Id = dto.TaskId;
             updateInStockTaskRequest.Boxs = dto.Boxs;
-            updateInStockTaskRequest.Details = dto.TaskDetails;
+            updateInStockTaskRequest.Details =new List<UpdateInStockTaskDetailsRequest>();
+            foreach (var item in dto.Details)
+            {
+                var updateInStockTaskDetailsRequest = new UpdateInStockTaskDetailsRequest();
+                updateInStockTaskDetailsRequest.MaterialId = item.MaterialId;
+                updateInStockTaskDetailsRequest.ReceiveQty = item.Qty;
+                updateInStockTaskRequest.Details.Add(updateInStockTaskDetailsRequest);
+            }
+
             //2.修改后返回当前实体
             var update_result = await this.Update(updateInStockTaskRequest, loginInfo.UserInfo.StaffId, null, isTransaction, true);
             if (!update_result.IsSuccess)

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

@@ -66,6 +66,10 @@ namespace WMS.Web.Domain.Services
                     return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
 
                 var sour_update_entity = new BoxInventory();
+                sour_update_entity.Id = sour.Id;
+                sour_update_entity.BoxId = sour.BoxId;
+                sour_update_entity.StockCode = sour.StockCode;
+                sour_update_entity.SubStockId = sour.SubStockId;
                 sour_update_entity.Details = new List<BoxInventoryDetails>();
                 foreach (var dtoItem in dto.Details)
                 {
@@ -78,6 +82,9 @@ namespace WMS.Web.Domain.Services
                         return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
 
                     var s_update_entity_det = new BoxInventoryDetails();
+                    s_update_entity_det.Id = sour_ChangeDetail.Id;
+                    s_update_entity_det.Fid = sour_ChangeDetail.Fid;
+                    s_update_entity_det.MaterialId = sour_ChangeDetail.MaterialId;
                     s_update_entity_det.SerialNumbers = new List<string>();
                     s_update_entity_det.Qty = sour_ChangeDetail.Qty - dtoItem.Qty;
 
@@ -105,6 +112,10 @@ namespace WMS.Web.Domain.Services
                 else
                 {
                     var tag_update_entity = new BoxInventory();
+                    tag_update_entity.Id = tagBox.Id;
+                    tag_update_entity.BoxId = tagBox.BoxId;
+                    tag_update_entity.StockCode = tagBox.StockCode;
+                    tag_update_entity.SubStockId = tagBox.SubStockId;
                     tag_update_entity.Details = new List<BoxInventoryDetails>();
                     //2.2.1遍历改变的明细
                     foreach (var item in dto.Details)
@@ -113,7 +124,10 @@ namespace WMS.Web.Domain.Services
                         var tagChangeDetail = tagBox.Details.Where(x => x.MaterialId == item.MaterialId).FirstOrDefault();
                         if (tagChangeDetail != null)
                         {
-                            var update_entity_det = new BoxInventoryDetails();
+                            var update_entity_det = new BoxInventoryDetails();                            
+                            update_entity_det.Id = tagChangeDetail.Id;
+                            update_entity_det.Fid = tagChangeDetail.Fid;
+                            update_entity_det.MaterialId = tagChangeDetail.MaterialId;
                             update_entity_det.SerialNumbers = new List<string>();
                             update_entity_det.Qty = tagChangeDetail.Qty + item.Qty;
                             update_entity_det.SerialNumbers.AddRange(tagChangeDetail.SerialNumbers);
@@ -285,6 +299,10 @@ namespace WMS.Web.Domain.Services
                         return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
                     //3.2创建更新对象
                     var update_entity = new BoxInventory();
+                    update_entity.Id = boxInventory.Id;
+                    update_entity.BoxId = boxInventory.BoxId;
+                    update_entity.StockCode = boxInventory.StockCode;
+                    update_entity.SubStockId = boxInventory.SubStockId;
                     update_entity.Details = new List<BoxInventoryDetails>();
 
                     //3.3遍历dto明细
@@ -299,7 +317,9 @@ namespace WMS.Web.Domain.Services
                             return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
 
                         var update_entity_det = new BoxInventoryDetails();
-                        update_entity_det.SerialNumbers = new List<string>();
+                        update_entity_det.Id = updateDetail.Id;
+                        update_entity_det.Fid = updateDetail.Fid;
+                        update_entity_det.MaterialId = updateDetail.MaterialId;
                         update_entity_det.Qty = updateDetail.Qty - dtoItem.Qty;
 
                         //先把现有的序列号复制过来
@@ -309,6 +329,146 @@ namespace WMS.Web.Domain.Services
 
                         update_entity.Details.Add(update_entity_det);
                     }
+                    update_entitys.Add(update_entity);
+                }
+            }
+
+            var isSuccess = true;
+            //4.数据库更新操作:更新和添加
+            if (add_entitys.Count != 0)
+            {
+                isSuccess = await _boxInventoryRepositories.AddRange(add_entitys, isTransaction);
+                if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            if (update_entitys.Count != 0)
+            {
+                isSuccess = await _boxInventoryRepositories.UpdateRange(update_entitys, isTransaction);
+                if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            return Result.ReSuccess();
+        }
+
+        /// <summary>
+        /// 采购上架-箱库存变更
+        /// </summary>
+        /// <param name="dtoDatas"></param>
+        /// <param name="isTransaction"></param>
+        /// <returns></returns>
+        public async Task<Result> GeneratePurchaseBox(List<BoxInventoryPurchaseGenerateDto> dtoDatas, bool isTransaction) 
+        {
+            //1.判断来源数据是否存在
+            if (dtoDatas != null || dtoDatas.Count == 0)
+                return Result.ReFailure(ResultCodes.InventoryNoSourceError);
+
+            var add_entitys = new List<BoxInventory>();
+
+            //1.1通过箱IDS获取箱库存-正常情况下“采购上架”，箱对应的库存是没有的，这里是为了下一步的判断，防止错误数据进入箱库存里面
+            var boxIds = dtoDatas.SelectMany(x => x.BoxIds).ToList();
+            var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
+
+            //2.遍历：dto
+            foreach (var dto in dtoDatas) 
+            {
+                //3.1上架的时候：箱一定是不存在于箱库存当中的，有则返回提示“已有箱库存，不需要再扫上架”
+                var ishave = boxInventorys.Where(x =>dto.BoxIds.Contains(x.BoxId)).Any();
+                if (ishave)
+                    return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
+
+                //3.2组装要新增的箱库存信息：箱和明细和序列号
+                var addEntity = _mapper.Map<BoxInventory>(dto);
+                addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
+                add_entitys.Add(addEntity);
+            }
+
+            var isSuccess = true;
+            //4.数据库更新操作:更新和添加
+            if (add_entitys.Count != 0)
+            {
+                isSuccess = await _boxInventoryRepositories.AddRange(add_entitys, isTransaction);
+                if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
+            }
+            return Result.ReSuccess();
+        }
+
+        /// <summary>
+        /// 非采购上架-箱库存变更
+        /// </summary>
+        /// <param name="dtoDatas"></param>
+        /// <param name="isTransaction"></param>
+        /// <returns></returns>
+        public async Task<Result> GenerateNoPurchaseBox(List<BoxInventoryNoPurchaseGenerateDto> dtoDatas, bool isTransaction) 
+        {
+            //1.判断来源数据是否存在
+            if (dtoDatas != null || dtoDatas.Count == 0)
+                return Result.ReFailure(ResultCodes.InventoryNoSourceError);
+
+            var add_entitys = new List<BoxInventory>();
+            var update_entitys = new List<BoxInventory>();
+
+            //1.1通过箱IDS获取箱库存-正常情况下“采购上架”，箱对应的库存是没有的，这里是为了下一步的判断，防止错误数据进入箱库存里面
+            var boxIds = dtoDatas.SelectMany(x => x.BoxIds).ToList();
+            var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
+
+            //2.遍历：dto
+            foreach (var dto in dtoDatas)
+            {
+                //按箱上架
+                if (dto.ShelfMethod == (int)ShelfMethod.Box)
+                {
+                    //3.1上架的时候：箱一定是不存在于箱库存当中的，有则返回提示“已有箱库存，不需要再扫上架”
+                    var ishave = boxInventorys.Where(x => dto.BoxIds.Contains(x.BoxId)).Any();
+                    if (ishave)
+                        return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
+
+                    //3.2组装要新增的箱库存信息：箱和明细和序列号
+                    var addEntity = _mapper.Map<BoxInventory>(dto);
+                    addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
+                    add_entitys.Add(addEntity);
+                }
+                //按产品上架：
+                else 
+                {
+                    //按产品上架：箱只能是一个；箱可能存在库存（修改），也可能不存在库存（新增）
+                    var boxInventory = boxInventorys.Where(x => x.BoxId == dto.BoxIds.First()).FirstOrDefault();
+                    if (boxInventory == null)
+                    {
+                        //3.2组装要新增的箱库存信息：箱和明细和序列号
+                        var addEntity = _mapper.Map<BoxInventory>(dto);
+                        addEntity.Details = _mapper.Map<List<BoxInventoryDetails>>(dto.Details);
+                        add_entitys.Add(addEntity);
+                    }
+                    else 
+                    {
+                        //3.3创建更新对象
+                        var update_entity = new BoxInventory();
+                        update_entity.Id = boxInventory.Id;
+                        update_entity.BoxId = boxInventory.BoxId;
+                        update_entity.StockCode = boxInventory.StockCode;
+                        update_entity.SubStockId = boxInventory.SubStockId;
+                        update_entity.Details = new List<BoxInventoryDetails>();
+                        foreach (var dtoItem in dto.Details)
+                        {
+                            var update_entity_det = new BoxInventoryDetails();
+                            var updateDetail = boxInventory.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
+                            if (updateDetail == null)
+                            {
+                               
+                                update_entity_det.MaterialId = dtoItem.MaterialId;
+                                update_entity_det.SerialNumbers = dtoItem.SerialNumbers;
+                            }
+                            else 
+                            {
+                                update_entity_det.Id = updateDetail.Id;
+                                update_entity_det.Fid = updateDetail.Fid;
+                                update_entity_det.MaterialId = updateDetail.MaterialId;
+                                update_entity_det.SerialNumbers = updateDetail.SerialNumbers;
+                                update_entity_det.SerialNumbers.AddRange(dtoItem.SerialNumbers);
+                            }               
+                            update_entity_det.Qty = updateDetail.Qty + dtoItem.Qty;
+                            update_entity.Details.Add(update_entity_det);
+                        }
+                        update_entitys.Add(update_entity);
+                    }
                 }
             }