盘点没有箱库存 可以盘进库存

src/WMS.Web.Domain/Entitys/TakeStockDetails.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 using WMS.Web.Core;
@@ -56,6 +57,12 @@ namespace WMS.Web.Domain.Entitys
         [Column("SubStockCode")]
         public string SubStockCode { get; set; }
         /// <summary>
+        /// 老仓位(如果更好了仓位 这里就是原有仓位)
+        /// 如果没有更换仓位 那老仓位和新仓位就是一样的值
+        /// </summary>
+        [Column("Old_SubStockCode")]
+        public string Old_SubStockCode { get; set; }
+        /// <summary>
         /// 子仓库(跟金蝶交互字段)
         /// </summary>
         [Column("Erp_SubStockCode")]

src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs

@@ -48,6 +48,8 @@ namespace WMS.Web.Domain.Infrastructure
         /// <param name="id"></param>
         /// <returns></returns>
         Task<BoxInventory> Get(int id);
+        // 新增
+        Task<BoxInventory> Add(BoxInventory entity, bool isTransaction = true);
         /// <summary>
         /// 批量添加
         /// </summary>

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

@@ -1324,8 +1324,22 @@ namespace WMS.Web.Domain.Services
                 {
                     //3.1入库的时候：盘点-箱一定是存在于库存
                     var boxInvent = boxInventorys.Where(x => x.BoxId == dto.BoxId).FirstOrDefault();
+                    //if (boxInvent == null)
+                    //    return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
+                    //v1.0.6版本 如果没有箱库存就添加
                     if (boxInvent == null)
-                        return Result.ReFailure(ResultCodes.BoxInventoryHaveInventoryError);
+                    {
+                        BoxInventory box_add = new BoxInventory()
+                        {
+                            BoxId = dto.BoxId,
+                            OrgCode = dto.OrgCode,
+                            StockCode = dto.StockCode,
+                            SubStockCode = dto.SubStockCode
+                        };
+                        boxInvent = await _boxInventoryRepositories.Add(box_add);
+                        if (boxInvent == null) return Result.ReFailure(ResultCodes.DateWriteError);
+                        boxInventorys.Add(boxInvent);
+                    }
 
                     //3.2组装要新增的箱库存信息：箱和明细和序列号
                     var updateEntity = boxInvent;

src/WMS.Web.Repositories/BoxInventoryRepositories.cs

@@ -193,6 +193,34 @@ namespace WMS.Web.Repositories
         {
             return await _context.BoxInventory.Include(x => x.Details).Where(x => x.BoxId == id).FirstOrDefaultAsync();
         }
+        /// <summary>
+        /// 添加及时库存
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="isTransaction"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<BoxInventory> Add(BoxInventory entity, bool isTransaction = true)
+        {
+            IDbContextTransaction _transaction = null;
+            if (isTransaction)
+                _transaction = _context.Database.BeginTransaction();
+            try
+            {
+                await _context.BoxInventory.AddAsync(entity);
+                await _context.SaveChangesAsync();
+
+                if (_transaction != null)
+                    _transaction.Commit();
+                return entity;
+            }
+            catch (Exception ex)
+            {
+                if (_transaction != null)
+                    _transaction.Rollback();
+                return null;
+            }
+        }
 
         /// <summary>
         /// 批量添加