From b396c980b048bc3856f3e148c5137a3164c8387c Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 9 Nov 2023 14:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=8D=95=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2-=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/InStockTaskController.cs        | 17 +++++++++++++++++
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml         |  7 +++++++
 .../InStockTaskRepositories.cs                  |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
index aa5c4455..ded6fb28 100644
--- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
@@ -80,6 +80,23 @@ namespace WMS.Web.Api.Controllers
             return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
         }
 
+        /// <summary>
+        /// 来源单-编号模糊查询-pad
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("InStockTask/{code}")]
+        public async Task<ResultList<InStockTaskBillNoQueryResponse>> InStockTask([FromRoute] string code)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var list = await _inStockTaskRepositories.GetListBy(code);
+            return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
+        }
+
         /// <summary>
         /// 采购订单物料明细和箱物料明细-对比-pad
         /// </summary>
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 54e963e2..5940d92e 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -115,6 +115,13 @@
             <param name="code"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.InStockTaskController.InStockTask(System.String)">
+            <summary>
+            来源单-编号模糊查询-pad
+            </summary>
+            <param name="code"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.InStockTaskController.Contrast(WMS.Web.Core.Dto.InStockTask.ContrastMaterialsRequest)">
             <summary>
             采购订单物料明细和箱物料明细-对比-pad
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 168a37e7..ff6b2e05 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -236,10 +236,11 @@ namespace WMS.Web.Repositories
             if (materials_result.IsSuccess)
                 materials = materials_result.Data.ToList();
 
+            //这里只查状态为：部分入库和等待收货
             var query = _context.InStockTaskDetails
                  .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
                  .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
-                 .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + sourceBillNo + "%"));
+                 .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + sourceBillNo + "%") && (w.order.Status== InstockStatus.Part || w.order.Status==InstockStatus.Wait));
 
             if(type.HasValue)
                 query = query.Where(w => w.order.Type == type.Value);