From 1f6f25b5e48718fc8fb69de70799e9e0c9a0c517 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Mon, 13 Nov 2023 16:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/OutStockTaskController.cs     | 20 ++++++++++++++++++-
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml       |  9 ++++++++-
 .../IOutStockTaskRepositories.cs              |  2 ++
 .../OutStockTaskRepositories.cs               | 10 ++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index 20a1dcff..e6f4198a 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -87,7 +87,7 @@ namespace WMS.Web.Api.Controllers
         }
 
         /// <summary>
-        /// 根据出库单任务编号模糊搜索-PDA出库
+        /// 根据出库单任务编号模糊搜索
         /// </summary>
         /// <param name="billNo"></param>
         /// <returns></returns>
@@ -104,6 +104,24 @@ namespace WMS.Web.Api.Controllers
             return ResultList<GetOutStockTaskByNoResponse>.ReSuccess(res);
         }
 
+        /// <summary>
+        /// 根据出库单任务编号模糊搜索下拉-PDA出库
+        /// </summary>
+        /// <param name="billNo"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetOutStockTaskNosByNo/{billNo}")]
+        public async Task<ResultList<string>> GetOutStockTaskNosByNo([FromRoute] string billNo)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultList<string>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var res = await _repositories.GetOutStockTaskNosByNo(billNo);
+            if (res == null || res.Count() == 0) return ResultList<string>.ReFailure(ResultCodes.OutStockTaskNoData);
+            return ResultList<string>.ReSuccess(res);
+        }
+
         /// <summary>
         /// 根据出库单任务编号精确搜索(并且同步金蝶数据)-PDA出库
         /// </summary>
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index d79ccbfb..555fc28c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -295,7 +295,14 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetOutStockTaskListByNo(System.String)">
             <summary>
-            根据出库单任务编号模糊搜索-PDA出库
+            根据出库单任务编号模糊搜索
+            </summary>
+            <param name="billNo"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetOutStockTaskNosByNo(System.String)">
+            <summary>
+            根据出库单任务编号模糊搜索下拉-PDA出库
             </summary>
             <param name="billNo"></param>
             <returns></returns>
diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
index 4365fed1..5bf69f66 100644
--- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
@@ -38,6 +38,8 @@ namespace WMS.Web.Domain.Infrastructure
         Task<OutStockTask> Get(int id);
         //根据订单号获取订单信息
         Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskListByNo(string billNo);
+        //模糊搜索订单号
+        Task<List<string>> GetOutStockTaskNosByNo(string billNo);
         //根据订单号获取订单信息
         Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo);
     }
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 8c36edcb..177976bd 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -411,5 +411,15 @@ namespace WMS.Web.Repositories
                 return false;
             }
         }
+
+        public async Task<List<string>> GetOutStockTaskNosByNo(string billNo)
+        {
+            return await _context.OutStockTask.Include(x => x.Details)
+                .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
+                EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) &&
+                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait))
+                .Select(s => s.BillNo)
+                .ToListAsync();
+        }
     }
 }