From b30c1c6410509556fc704d4aea603f5d1f5ceaaa Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 9 Oct 2024 17:07:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 275696 -> 275696 bytes
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |  10 ++++++++++
 .../OutStockTaskQueryInfoResponse.cs          |  10 ++++++++++
 .../OutStockTaskRepositories.cs               |   4 +++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 7928d256c699d32e06cc1a35f10f9b4e1676ba2e..2c8497f98ae30c9a297489c7525a44a9c5088ff3 100644
GIT binary patch
delta 176
zcmWN}F%H5o3;;k{KENl~9ouo@9Wi#`1*Ea_4z{k{*!lz}r2dDEtr8!g^GUaTPuutO
zcz5UF+Co&y<Z70(s^Um(#27p|pb*!>)PjsL8Gw%k9IKGIp~5cl(32kY+5I}2mZ4jh
zp?@7OF*lQlsWPFumTbZ*&AC*DU^Nsp0(T*>$P(OB02kE6k#i3FD${)H*ZFq5fBr+8
BGZX*-

delta 176
zcmWN}yAi@L3;<9P7GMc_Th=G;Im#4FfMv;Z(4|dBml3GA%RY2;xnlwH26)@|w0%#H
zcXuAIu_=@gt)-$NCe2n^2uf+j6ro84&ngj(%n^Mc$Hb+etD>nM`jig&+5NgSEn~MX
zWB)o{q(B-5Nm#WS3x-OuMrCnih0K&8i))imT>)LJ0q-*zYb7fC8m9Tyuk-DA|NH^?
Ck~Jy-

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index f39b9f45..a2cb2285 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -5474,6 +5474,16 @@
              调入仓库
             </summary> 
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.InStockCodes">
+             <summary>
+             调入仓库
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OrgCode">
+             <summary>
+             组织编码
+            </summary> 
+        </member>
         <member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockBeginTime">
              <summary>
              出库开始时间
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
index d3207290..167acf14 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
@@ -96,6 +96,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
         [Column("调入仓库")]
         public string InStock { get; set; }
         /// <summary>
+        /// 调入仓库
+        ///</summary> 
+        [Ignore]
+        public List<string> InStockCodes { get; set; } = new List<string>();
+        /// <summary>
+        /// 组织编码
+        ///</summary> 
+        [Ignore]
+        public string OrgCode { get; set; }
+        /// <summary>
         /// 出库开始时间
         ///</summary> 
         [Column("出库开始时间")]
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index f900ac7d..7f4c7989 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -393,7 +393,8 @@ namespace WMS.Web.Repositories
                 Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
                 Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
                 Remark = s.detail.Remark,
-                InStock = GetInStock(s.detail.ErpDetails.Select(s => s.InStockCode).ToList(), companyId, s.order.OrgCode)
+                InStockCodes= s.detail.ErpDetails.Select(s => s.InStockCode).ToList(),
+                OrgCode= s.order.OrgCode
                 #endregion
 
             }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
@@ -401,6 +402,7 @@ namespace WMS.Web.Repositories
             {
                 l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
                 l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
+                l.InStock = GetInStock(l.InStockCodes, companyId, l.OrgCode);
             }
             return (list, total);
         }