From cd2e23eccb12b6c045da7f09ccb70b23d965a1e6 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Mon, 30 Oct 2023 10:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Values/Single/SingleAction.cs        | 5 +++++
 src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs | 4 ++--
 src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs   | 4 ++--
 src/WMS.Web.Repositories/OutStockRepositories.cs        | 2 +-
 src/WMS.Web.Repositories/OutStockTaskRepositories.cs    | 2 +-
 src/WMS.Web.Repositories/TakeStockRepositories.cs       | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/WMS.Web.Domain/Values/Single/SingleAction.cs b/src/WMS.Web.Domain/Values/Single/SingleAction.cs
index 9b7e3c14..bdb4284d 100644
--- a/src/WMS.Web.Domain/Values/Single/SingleAction.cs
+++ b/src/WMS.Web.Domain/Values/Single/SingleAction.cs
@@ -100,6 +100,11 @@ namespace WMS.Web.Domain.Values.Single
         /// </summary>
         [EnumRemark("菜单")]
         Menus = 18,
+        /// <summary>
+        /// 仓位集合
+        /// </summary>
+        [EnumRemark("仓位")]
+        SubStocks = 19,
 
     }
 }
diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
index f2e6a1d7..223569ad 100644
--- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
@@ -96,8 +96,8 @@ namespace WMS.Web.Repositories
                 SerialNumber = "",
                 SrcBox = "",
                 DestBox = "",
-                SrcSubStock = "",
-                DestSubStock = "",
+                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SrcSubStockId),
+                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.DestSubStockId),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
                 CreateTime =s.CreateTime.DateToStringSeconds()
                 #endregion
diff --git a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
index 69f2c5c9..0e52eccf 100644
--- a/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
@@ -90,9 +90,9 @@ namespace WMS.Web.Repositories
             {
                 #region dto组装
                 Box = "",
-                SrcSubStock = "",
+                SrcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SrcSubStockId),
                 Specifications = "",
-                DestSubStock = "",
+                DestSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.DestSubStockId),
                 Qty = s.Qty,
                 Type = s.Type.GetRemark(),
                 Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.CreatorId),
diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs
index 36e9eb60..884c6bef 100644
--- a/src/WMS.Web.Repositories/OutStockRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockRepositories.cs
@@ -103,7 +103,7 @@ namespace WMS.Web.Repositories
                 SourceBillNo=s.detail.SourceBillNo,
                 SaleBillNo = s.detail.SaleBillNo,
                 DeliveryOrg = "",
-                ReceiptCustomer = "",
+                ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.detail.ReceiptCustomerId),
                 MaterialName = "",
                 MaterialNumber = "",
                 Specifications = "",
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 9cb5086a..50b1db01 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -186,7 +186,7 @@ namespace WMS.Web.Repositories
                 SourceBillNo = s.detail.SourceBillNo,
                 SaleBillNo = s.detail.SaleBillNo,
                 DeliveryOrg = "",
-                ReceiptCustomer = "",
+                ReceiptCustomer = _singleDataService.GetSingleData(SingleAction.Customers, _loginRepositories.CompanyId, s.detail.ReceiptCustomerId),
                 MaterialName = "",
                 MaterialNumber = "",
                 Specifications = ""
diff --git a/src/WMS.Web.Repositories/TakeStockRepositories.cs b/src/WMS.Web.Repositories/TakeStockRepositories.cs
index 6f90de23..370185ea 100644
--- a/src/WMS.Web.Repositories/TakeStockRepositories.cs
+++ b/src/WMS.Web.Repositories/TakeStockRepositories.cs
@@ -95,7 +95,7 @@ namespace WMS.Web.Repositories
                 BillNo = s.order.BillNo,
                 Unit = _singleDataService.GetSingleData(SingleAction.Units, _loginRepositories.CompanyId, s.detail.UnitId),
                 Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
-                SubStock = "",
+                SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
                 BeforeQty = s.detail.BeforeQty,
                 AfterQty = s.detail.AfterQty,
                 FinalQty = s.detail.FinalQty,