From fc05ef6dde9e1aad5374513ef19696766fb29061 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Mon, 13 Nov 2023 15:26:29 +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

---
 .../Controllers/OutStockTaskController.cs     |  2 +-
 .../OutStockTaskRepositories.cs               | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index c132045c..20a1dcff 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -100,7 +100,7 @@ namespace WMS.Web.Api.Controllers
                 return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             var res = await _repositories.GetOutStockTaskListByNo(billNo);
-            if (res == null) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
+            if (res == null || res.Count() == 0) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
             return ResultList<GetOutStockTaskByNoResponse>.ReSuccess(res);
         }
 
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 801658ef..8c36edcb 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core;
+using WMS.Web.Core.Dto.Erp;
 using WMS.Web.Core.Dto.OutStockTask;
 using WMS.Web.Core.Help;
 using WMS.Web.Domain.Entitys;
@@ -38,6 +39,7 @@ namespace WMS.Web.Repositories
             _singleDataService = singleDataService;
             _loginRepositories = loginRepositories;
             _erpService = erpService;
+            _erpBasicDataExtendService = erpBasicDataExtendService;
         }
         /// <summary>
         /// 新增
@@ -342,10 +344,13 @@ namespace WMS.Web.Repositories
                 return new GetOutStockTaskByNoResponse();
             var materials = materials_result.Data.ToList();
 
-            var list = await _context.OutStockTask.Include(x => x.Details)
-                .Where(f => f.BillNo.Equals(billNo) &&
-                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync();
-            var response = _mapper.Map<GetOutStockTaskByNoResponse>(list);
+            var entity = await _context.OutStockTask.Include(x => x.Details)
+                .FirstOrDefaultAsync(f => f.BillNo.Equals(billNo) &&
+                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait));
+
+            if (entity == null) return new GetOutStockTaskByNoResponse();
+
+            var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
             //获取物料信息 显示物料三件套
             foreach (var r in response.details)
             {
@@ -357,15 +362,15 @@ namespace WMS.Web.Repositories
         }
 
         /// <summary>
-        /// 根据来源单号搜索
+        /// 单号搜索
         /// </summary>
         /// <param name="sourceBillNos"></param>
         /// <returns></returns>
-        public async Task<List<OutStockTask>> GetListBySourceBillNo(List<string> sourceBillNos)
+        public async Task<List<OutStockTask>> GetListBySourceBillNo(List<string> billNos)
         {
             var entitys = await _context.OutStockTask
                  .Include(s => s.Details)
-                 .Where(w => sourceBillNos.Contains(w.SourceBillNo))
+                 .Where(w => billNos.Contains(w.BillNo))
                  .ToListAsync();
 
             return entitys.Clone();