出库-箱库存变更

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

@@ -2241,6 +2241,46 @@
             序列号集
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockGenerateDto">
+            <summary>
+            出库-箱库存变更请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockGenerateDto.InOutInventoryMethod">
+            <summary>
+            出入库存-方式(详情见枚举值)
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockGenerateDto.BoxId">
+            <summary>
+            箱ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockGenerateDto.Details">
+            <summary>
+            明细
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockDetailsGenerateDto">
+            <summary>
+            出库明细-箱库存变更请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockDetailsGenerateDto.MaterialId">
+            <summary>
+            物料ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockDetailsGenerateDto.Qty">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockDetailsGenerateDto.SerialNumbers">
+            <summary>
+            序列号集
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.Inventory.BoxInventoryPurchaseGenerateDto">
             <summary>
             采购上架-箱库存处理对象

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

@@ -3241,6 +3241,14 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.InventoryService.GenerateOutStockBox(System.Collections.Generic.List{WMS.Web.Core.Dto.Inventory.BoxInventoryOutStockGenerateDto},System.Boolean)">
+            <summary>
+            出库下架-箱库存变更
+            </summary>
+            <param name="dtoDatas"></param>
+            <param name="isTransaction"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Services.OutStockService">
             <summary>
             出库服务
@@ -4256,6 +4264,21 @@
             出入库回退上下架
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Values.InOutInventoryMethod">
+            <summary>
+            出入库存-方式
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.InOutInventoryMethod.Box">
+            <summary>
+            按箱
+            </summary>
+        </member>
+        <member name="F:WMS.Web.Domain.Values.InOutInventoryMethod.Product">
+            <summary>
+            按产品
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.InstockStatus">
             <summary>
             入库状态

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

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Inventory
+{
+    /// <summary>
+    /// 出库-箱库存变更请求对象
+    /// </summary>
+    public class BoxInventoryOutStockGenerateDto
+    {
+        /// <summary>
+        /// 出入库存-方式(详情见枚举值)
+        /// </summary>
+        public int InOutInventoryMethod { get; set; }
+
+        /// <summary>
+        /// 箱ID
+        /// </summary>
+        public int BoxId { get; set; }
+
+        /// <summary>
+        /// 明细
+        /// </summary>
+        public List<BoxInventoryOutStockDetailsGenerateDto> Details { get; set; } = new List<BoxInventoryOutStockDetailsGenerateDto>();
+    }
+    /// <summary>
+    /// 出库明细-箱库存变更请求对象
+    /// </summary>
+    public class BoxInventoryOutStockDetailsGenerateDto 
+    {
+        /// <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/Services/InventoryService.cs

@@ -370,7 +370,7 @@ namespace WMS.Web.Domain.Services
             foreach (var dto in dtoDatas) 
             {
                 //3.1上架的时候：箱一定是不存在于箱库存当中的，有则返回提示“已有箱库存，不需要再扫上架”
-                var ishave = boxInventorys.Where(x =>dto.BoxIds.Contains(x.BoxId)).Any();
+                var ishave = dto.BoxIds.All(x => boxInventorys.Any(t => t.BoxId == x));////代码意义：当前dto中的BoxIds是否全部等于箱库存中的boxId;dto中有一个boxID不等于箱库存中的，就失败
                 if (ishave)
                     return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
 
@@ -416,8 +416,8 @@ namespace WMS.Web.Domain.Services
                 if (dto.ShelfMethod == (int)ShelfMethod.Box)
                 {
                     //3.1上架的时候：箱一定是不存在于箱库存当中的，有则返回提示“已有箱库存，不需要再扫上架”
-                    var ishave = boxInventorys.Where(x => dto.BoxIds.Contains(x.BoxId)).Any();
+                    var isAllTrueHave = dto.BoxIds.All(x => boxInventorys.Any(t => t.BoxId == x));//代码意义：当前dto中的BoxIds是否全部等于箱库存中的boxId;dto中有一个boxID不等于箱库存中的，就失败
-                    if (ishave)
+                    if (isAllTrueHave)
                         return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
 
                     //3.2组装要新增的箱库存信息：箱和明细和序列号
@@ -486,5 +486,89 @@ namespace WMS.Web.Domain.Services
             }
             return Result.ReSuccess();
         }
+
+        /// <summary>
+        /// 出库下架-箱库存变更
+        /// </summary>
+        /// <param name="dtoDatas"></param>
+        /// <param name="isTransaction"></param>
+        /// <returns></returns>
+        public async Task<Result> GenerateOutStockBox(List<BoxInventoryOutStockGenerateDto> dtoDatas, bool isTransaction)
+        {
+            //1.判断来源数据是否存在
+            if (dtoDatas != null || dtoDatas.Count == 0)
+                return Result.ReFailure(ResultCodes.InventoryNoSourceError);
+
+            var delete_entitys_ids = new List<int>();
+            var update_entitys = new List<BoxInventory>();
+
+            //1.1通过箱IDS获取箱库存
+            var boxIds = dtoDatas.Select(x => x.BoxId).ToList();
+            var boxInventorys = await _boxInventoryRepositories.GetList(boxIds);
+
+            //2.遍历：dto
+            foreach (var dto in dtoDatas) 
+            {
+                //3.1出库的时候：箱一定是存在于箱库存当中的，没有则返回提示“箱库存数据不存在，请稍候再试！”
+                //   获取箱库存
+                var boxInventory = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
+                if (boxInventory==null)
+                    return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
+
+                //按箱：出库
+                if (dto.InOutInventoryMethod == (int)InOutInventoryMethod.Box)
+                {
+                    //直接添加要删除的箱
+                    delete_entitys_ids.Add(boxInventory.Id);
+                }
+                //按产品：出库
+                else 
+                {
+                    //3.3创建更新对象
+                    var update_entity = boxInventory;
+                    update_entity.Details = boxInventory.Details;
+
+                    //3.2.遍历：dto明细
+                    foreach (var dtoItem in dto.Details)
+                    {
+                        //3.3.找到当前明细物料：没有则返回失败；提示：“该箱物料库存不存在”
+                        var update_entityDetail = update_entity.Details.Where(x => x.MaterialId == dtoItem.MaterialId).FirstOrDefault();
+                        if (update_entityDetail == null)
+                            return Result.ReFailure(ResultCodes.BoxInventoryMaterialNoDataError);
+                        //3.4判断库存数量是否不足
+                        if (update_entityDetail.Qty < dtoItem.Qty)
+                            return Result.ReFailure(ResultCodes.BoxInventoryNoInventoryError);
+
+                        //3.5物料库存数量变更：减库存
+                        update_entityDetail.Qty = update_entityDetail.Qty - dtoItem.Qty;
+                        //3.6移除要出库的序列号
+                        update_entityDetail.SerialNumbers.RemoveAll(x => dtoItem.SerialNumbers.Contains(x));
+
+                    }
+                    //4.1判断要修改的箱库存对象：是否所有的物料库存的数量都为0，“是”则删除该箱库存,"否"则修改；
+                    var isAllNoInventory = update_entity.Details.All(x => x.Qty == 0);
+                    if (isAllNoInventory)
+                        delete_entitys_ids.Add(update_entity.Id);
+                    else
+                        //4.2添加要更新的箱库存实体
+                        update_entitys.Add(update_entity);
+                }
+                
+            }
+
+            //4.数据库更新操作:更新和删除
+            var isSuccess = true;
+            if (delete_entitys_ids.Count != 0)
+            {
+                isSuccess = await _boxInventoryRepositories.DeleteRange(delete_entitys_ids, 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();
+        }
     }
 }

src/WMS.Web.Domain/Values/InOutInventoryMethod.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using WMS.Web.Core;
+
+namespace WMS.Web.Domain.Values
+{
+    /// <summary>
+    /// 出入库存-方式
+    /// </summary>
+    public enum InOutInventoryMethod
+    {
+        /// <summary>
+        /// 按箱
+        /// </summary>
+        [EnumRemark("按箱")]
+        Box =1,
+        /// <summary>
+        /// 按产品
+        /// </summary>
+        [EnumRemark("按产品")]
+        Product =2
+    }
+}

src/WMS.Web.Domain/Values/ResultCodes.cs

@@ -48,6 +48,7 @@ namespace WMS.Web.Domain.Values
         public static ValueTuple<int, string> AdjustError = (80009, "与金蝶校准发生错误，请稍候再试！");
         public static ValueTuple<int, string> InventoryNoSourceError = (800010, "来源数据不存在，请稍候再试！");
         public static ValueTuple<int, string> BoxInventoryNoDataError = (800011, "箱库存数据不存在，请稍候再试！");
+        public static ValueTuple<int, string> BoxInventoryMaterialNoDataError = (800041, "箱物料库存数据不存在，请稍候再试！");
         public static ValueTuple<int, string> BoxInventoryNoInventoryError = (800012, "箱库存物料数量不足，请核对后再试！");
         public static ValueTuple<int, string> BoxInventoryHaveInventoryError = (800013, "该箱库存已经存在，请核对后再试！");