From ec8b9efe961755e79cc7d7eee42f41d1362f1740 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Tue, 14 Nov 2023 09:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B3=E6=97=B6=E5=BA=93=E5=AD=98-=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |  4 ++--
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    | 14 ++++++++++--
 .../Dto/Inventory/BoxInventoryQueryRequest.cs |  4 ++--
 src/WMS.Web.Domain/Entitys/BoxInventory.cs    |  4 ++--
 .../IService/IInventoryService.cs             | 13 +++++++++++
 .../Services/InventoryService.cs              | 22 +++++++++++++++++++
 .../BoxInventoryRepositories.cs               |  6 ++---
 .../DependencyInjection/AppBuilder.cs         |  1 +
 8 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 src/WMS.Web.Domain/IService/IInventoryService.cs
 create mode 100644 src/WMS.Web.Domain/Services/InventoryService.cs

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index ee500e1c..4c0bfac7 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1875,9 +1875,9 @@
             箱库存-查询请求对象
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.StockId">
+        <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.StockCode">
             <summary>
-            仓库ID
+            仓库编码
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.Inventory.BoxInventoryQueryRequest.SubStockId">
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index a8178ecb..2b450c57 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -180,9 +180,9 @@
             箱子ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Domain.Entitys.BoxInventory.StockId">
+        <member name="P:WMS.Web.Domain.Entitys.BoxInventory.StockCode">
             <summary>
-            仓库ID
+            仓库编码
             </summary>
         </member>
         <member name="P:WMS.Web.Domain.Entitys.BoxInventory.SubStockId">
@@ -1871,6 +1871,11 @@
             <param name="billNos"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Domain.IService.IInventoryService">
+            <summary>
+            即时库存-服务接口
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.IService.IOutStockService">
             <summary>
             出库服务
@@ -2841,6 +2846,11 @@
             <param name="isTransaction"></param>
             <returns></returns>
         </member>
+        <member name="T:WMS.Web.Domain.Services.InventoryService">
+            <summary>
+            即时库存-服务
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Services.OutStockService">
             <summary>
             出库服务
diff --git a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryRequest.cs b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryRequest.cs
index 340b5446..61e65e3e 100644
--- a/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryRequest.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/BoxInventoryQueryRequest.cs
@@ -10,9 +10,9 @@ namespace WMS.Web.Core.Dto.Inventory
     public class BoxInventoryQueryRequest : PaginationBaseRequestDto
     {
         /// <summary>
-        /// 仓库ID
+        /// 仓库编码
         /// </summary>
-        public int? StockId { get; set; }
+        public string StockCode { get; set; }
 
         /// <summary>
         /// 仓位
diff --git a/src/WMS.Web.Domain/Entitys/BoxInventory.cs b/src/WMS.Web.Domain/Entitys/BoxInventory.cs
index 3eef4853..f48217dc 100644
--- a/src/WMS.Web.Domain/Entitys/BoxInventory.cs
+++ b/src/WMS.Web.Domain/Entitys/BoxInventory.cs
@@ -21,9 +21,9 @@ namespace WMS.Web.Domain.Entitys
         /// </summary>
         public int BoxId { get; set; }
         /// <summary>
-        /// 仓库ID
+        /// 仓库编码
         /// </summary>
-        public int StockId { get; set; }
+        public string StockCode { get; set; }
         /// <summary>
         /// 仓库ID
         /// </summary>
diff --git a/src/WMS.Web.Domain/IService/IInventoryService.cs b/src/WMS.Web.Domain/IService/IInventoryService.cs
new file mode 100644
index 00000000..ba0011b2
--- /dev/null
+++ b/src/WMS.Web.Domain/IService/IInventoryService.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Domain.IService
+{
+    /// <summary>
+    /// 即时库存-服务接口
+    /// </summary>
+    public interface IInventoryService
+    {
+    }
+}
diff --git a/src/WMS.Web.Domain/Services/InventoryService.cs b/src/WMS.Web.Domain/Services/InventoryService.cs
new file mode 100644
index 00000000..c0379cf8
--- /dev/null
+++ b/src/WMS.Web.Domain/Services/InventoryService.cs
@@ -0,0 +1,22 @@
+using AutoMapper;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using WMS.Web.Domain.IService;
+
+namespace WMS.Web.Domain.Services
+{
+    /// <summary>
+    /// 即时库存-服务
+    /// </summary>
+    public class InventoryService: IInventoryService
+    {
+        private readonly IMapper _mapper;
+        public InventoryService(IMapper mapper) 
+        {
+            _mapper = mapper;
+        }
+
+
+    }
+}
diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
index 2bb5c8e6..1edceaa3 100644
--- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
+++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs
@@ -74,8 +74,8 @@ namespace WMS.Web.Repositories
             if (!string.IsNullOrEmpty(dto.BoxBillNo))
                 query = query.Where(w => EF.Functions.Like(w.box.BoxBillNo, "%" + dto.BoxBillNo + "%"));
 
-            if (dto.StockId.HasValue)
-                query = query.Where(w => w.order.StockId == dto.StockId.Value);
+            if (!string.IsNullOrEmpty(dto.StockCode))
+                query = query.Where(w => w.order.StockCode == dto.StockCode);
 
             if (dto.SubStockId.HasValue)
                 query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
@@ -92,7 +92,7 @@ namespace WMS.Web.Repositories
                 MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
                 MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
-                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockId),
+                Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId),
                 Qty = s.detail.Qty,
             }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
index c308db73..1842957d 100644
--- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
+++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
@@ -263,6 +263,7 @@ namespace WMS.Web.Repositories.DependencyInjection
             Services.AddTransient<IInStockTaskService, InStockTaskService>();
             Services.AddTransient<IOutStockTaskService, OutStockTaskService>();
             Services.AddTransient<ISerialNumberService, SerialNumberService>();
+            Services.AddTransient<IInventoryService, InventoryService>();
         }
     }
 }