From 5c566a9e47cb1f38737a7603da099bffb232ea45 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 27 Jul 2024 11:34:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=87=BA=E5=BA=93=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 275060 -> 275060 bytes
 .../Controllers/OutStockTaskController.cs     |   2 +-
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |   5 +++++
 .../GetOutStockTaskNosByNoRequest.cs          |   4 ++++
 .../IOutStockTaskRepositories.cs              |   2 +-
 .../OutStockTaskRepositories.cs               |   6 +++---
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 141962fcba9e50fed7a5195b865dc4a82f9f5fc0..138b493fa9fe8d9049d44977a19bb0a2eaedf777 100644
GIT binary patch
delta 181
zcmWN}y=}r!5CCBCTYx?lQU>tdd%m+pi&9w;E8OoCDd=1?LsmdC`@jeYr3?dn-}AA1
zK6dBp_Io~#ASTfO*x7&>n|rh*Cqb+Y#VseTmBAHwqTX<9HET6$q#&CPVY$rP^)h$&
za?HxAqLM>^IFgM+N`&=_o{SM8&O`c}n@&L^X*Sk@B*6NJch{ENsatQS^6|UwzshG>
J|6b+i@DD}`IU)c6

delta 194
zcmWm8EpEd=5I|wuD-|aS3o8iU+5b^-jI1aucz0&@3Lyn$K7tPrUR23P2+JvQ1gk2n
z10VX{^4u)X&DT$R8jj8tpHc-$k(d%k@c~207OS=fiC<B3(K?Gnj<uv9Qi2iZd?aXE
zY;elg&W`t?o$o{Ut$L#^#N<davrb^x3wcDTrjm^gObxJ7A)`&qBw%A$T>_0dtOrd8
drrA&1OS>B%=Wc$S)!S`;@6|!gf4}PU;~(-WI)4BF

diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index e9b177f1..472da580 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -209,7 +209,7 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultPagedList<string>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo);
+            var res = await _repositories.GetOutStockTaskNosByNo(dto.BillNo,dto.StockCode);
             int total = res.Count();
             res = res.OrderByDescending(o => o).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToList();
 
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 0b7689f7..7a0542df 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -4954,6 +4954,11 @@
             单号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskNosByNoRequest.StockCode">
+            <summary>
+            仓库编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.OutStockTask.OutStockTaskInfoDetailsResponse">
             <summary>
             出库任务单对应出库明细
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs
index a07ca2b3..aca793e9 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskNosByNoRequest.cs
@@ -13,5 +13,9 @@ namespace WMS.Web.Core.Dto.OutStockTask
         /// 单号
         /// </summary>
         public string BillNo { get; set; }
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string StockCode { get; set; }
     }
 }
diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
index 5663c7a0..15a1ee6e 100644
--- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
@@ -47,7 +47,7 @@ namespace WMS.Web.Domain.Infrastructure
         //根据订单号获取订单信息
         Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo(string billNo);
         //模糊搜索订单号
-        Task<List<string>> GetOutStockTaskNosByNo(string billNo);
+        Task<List<string>> GetOutStockTaskNosByNo(string billNo, string stockCode);
         //根据订单号获取订单信息
         Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo);
     }
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 89c3707e..d0852250 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -520,18 +520,18 @@ namespace WMS.Web.Repositories
             }
         }
 
-        public async Task<List<string>> GetOutStockTaskNosByNo(string billNo)
+        public async Task<List<string>> GetOutStockTaskNosByNo(string billNo, string stockCode)
         {
             var res = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails)
                 .Where(f => EF.Functions.Like(f.BillNo, "%" + billNo + "%") &&
-                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
+                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(stockCode))
                 .OrderByDescending(o => o.Id)
                 .Select(s => s.BillNo)
                 .ToListAsync();
 
             var ress = await _context.OutStockTask.Include(x => x.Details.Where(w => w.IsRepeal != true)).ThenInclude(s => s.ErpDetails)
                   .Where(f => (f.Details.SelectMany(s => s.ErpDetails).Where(w => EF.Functions.Like(w.SourceBillNo, "%" + billNo + "%")).Any()) &&
-                  (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
+                  (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait) && f.StockCode.Equals(stockCode))
                   .OrderByDescending(o => o.Id)
                   .Select(s => s.BillNo)
                   .ToListAsync();