From 4edfd4f5e2b2fd7c67fb2e8ae9e7a98b4b30264a Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 3 Nov 2023 10:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/InStockTaskController.cs        | 2 +-
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml                    | 5 +++++
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml                  | 2 +-
 .../Infrastructure/IInStockTaskRepositories.cs              | 3 ++-
 src/WMS.Web.Repositories/InStockTaskRepositories.cs         | 6 +++++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
index 6ae29277..b508c96d 100644
--- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs
@@ -76,7 +76,7 @@ namespace WMS.Web.Api.Controllers
             if (loginInfo == null || loginInfo.UserInfo == null)
                 return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
-            var list= await _inStockTaskRepositories.GetListBy(code);
+            var list= await _inStockTaskRepositories.GetListBy(code, InstockType.Purchase);
             return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
         }
     }
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 093dab7a..e9f01845 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -850,6 +850,11 @@
             来源单号
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.StockCode">
+            <summary>
+            仓库编码（对应金蝶和单点）
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialId">
             <summary>
             物料ID
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index b89249c0..1100658b 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1189,7 +1189,7 @@
             <param name="sourceBillNos"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListBy(System.String)">
+        <member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListBy(System.String,System.Nullable{WMS.Web.Domain.Values.InstockType})">
             <summary>
             列表-根据来源单号模糊
             </summary>
diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
index b7d7dd76..4b41c28c 100644
--- a/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
@@ -6,6 +6,7 @@ using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.InStockTask;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Entitys;
+using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Domain.Infrastructure
 {
@@ -47,7 +48,7 @@ namespace WMS.Web.Domain.Infrastructure
         /// </summary>
         /// <param name="sourceBillNo"></param>
         /// <returns></returns>
-        Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo);
+        Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo, InstockType? type=null);
 
         /// <summary>
         /// 批量添加
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 058a872b..63bd4776 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -13,6 +13,7 @@ using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Entitys;
 using WMS.Web.Domain.Infrastructure;
 using WMS.Web.Domain.Mappers;
+using WMS.Web.Domain.Values;
 using WMS.Web.Repositories.Configuration;
 
 namespace WMS.Web.Repositories
@@ -150,13 +151,16 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="sourceBillNo"></param>
         /// <returns></returns>
-        public async Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo)
+        public async Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo, InstockType? type=null)
         {
             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 + "%"));
 
+            if(type.HasValue)
+                query = query.Where(w => w.order.Type == type.Value);
+
             var list = await query.Select(s => new InStockTaskBillNoQueryResponse()
             {
                 Id=s.detail.Id,