From cbe206b92b676c7ea472a0e5e1e3a3d77ea0b4ab Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 21 Sep 2024 16:23:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BB=BB=E5=8A=A1=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=BA=93=E4=BF=A1=E6=81=AF?=
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     |  20 ++++++++++++++++++
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml       |   7 ++++++
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml    |   7 ++++++
 .../IOutStockTaskRepositories.cs              |   7 ++++++
 .../OutStockTaskRepositories.cs               |  15 +++++++++++++
 6 files changed, 56 insertions(+)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index b1dc2bd58f00ab3518639164fcee57f726fbf236..bd3d21726ba97b1c52664ea4ac1b4eaaa4d8e401 100644
GIT binary patch
delta 169
zcmW;Fu@QqX429tU1B6kqEK62HMHvc4kZpO6bS#uR=E;Q-s8Yq3=G|X??>fip9G|c5
z`&c5>M3aGs>;Rk>Cd^ti7bA*+th9=ijeJ{CpAkxQEUDn6%D3LjKCj&|ul;9ObYiNC
rod1+IjDku<KvG}<pOeXitx~&m#9}ezARrk~oNFBIw)KZ?!~OjOQ35by

delta 169
zcmWNJyAgvx3<V7oU`n~~lavq<nt&2?zdD@JkY}jJW0yeW$d~MFvU`2!>pMSR!|$;w
z)fxbyMm`xXV382f-Bd48nY>TgDujzG99eQvi8hzSR5;v5N5`@a=dz8TX{{izatlU~
pnyMJ)M6H*(!TN}7oDEt53nK*`K9M*}iqNyZ3rF3@v+mRV{Rb7tFj)Wq

diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
index 68f7c610..6a73de51 100644
--- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
+++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs
@@ -16,6 +16,7 @@ using WMS.Web.Domain.IService;
 using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Options;
 using WMS.Web.Domain.Values;
+using WMS.Web.Repositories;
 
 namespace WMS.Web.Api.Controllers
 {
@@ -294,5 +295,24 @@ namespace WMS.Web.Api.Controllers
 
             return await _outStockTaskService.GetInfo(id, loginInfo);
         }
+        /// <summary>
+        /// 出库任务单详情(根据订单号搜索)
+        /// </summary>
+        /// <param name="billNo"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetInfo/{billNo}")]
+        public async Task<Result<OutStockTaskInfoResponse>> GetInfoByNo([FromRoute] string billNo)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<OutStockTaskInfoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+            var entity = await _repositories.GetByBillNo(billNo);
+            if (entity == null)
+                return Result<OutStockTaskInfoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
+
+            return await _outStockTaskService.GetInfo(entity.Id, loginInfo);
+        }
     }
 }
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 44b32b1b..f453c529 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -574,6 +574,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.OutStockTaskController.GetInfoByNo(System.String)">
+            <summary>
+            出库任务单详情(根据订单号搜索)
+            </summary>
+            <param name="billNo"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.SerialNumberController.Get(System.String)">
             <summary>
             获取序列号信息
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 54678804..9b37c924 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -3414,6 +3414,13 @@
             <param name="billNos"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.GetByBillNo(System.String)">
+            <summary>
+            根据任务单号获取订单信息
+            </summary>
+            <param name="billNo"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IOutStockTaskRepositories.EditEntityList(System.Collections.Generic.List{WMS.Web.Domain.Entitys.OutStockTask},System.Boolean)">
             修改实体集合
         </member>
diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
index a3c51c70..58357474 100644
--- a/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IOutStockTaskRepositories.cs
@@ -38,6 +38,13 @@ namespace WMS.Web.Domain.Infrastructure
         /// <param name="billNos"></param>
         /// <returns></returns>
         Task<List<OutStockTask>> GetListByBillNo(List<string> billNos);
+        /// <summary>
+        /// 根据任务单号获取订单信息
+        /// </summary>
+        /// <param name="billNo"></param>
+        /// <returns></returns>
+        Task<OutStockTask> GetByBillNo(string billNo);
+        
         /// 修改实体集合
         Task<bool> EditEntityList(List<OutStockTask> entitys, bool isTransaction = true);
         //编辑
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 21da6a82..f900ac7d 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -607,5 +607,20 @@ namespace WMS.Web.Repositories
             if (names.Count() == 0) return "";
             return string.Join(",", names);
         }
+        /// <summary>
+        /// 获取订单信息
+        /// </summary>
+        /// <param name="billNo"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<OutStockTask> GetByBillNo(string billNo)
+        {
+            var entity = await _context.OutStockTask
+              .Include(s => s.Details)
+              .ThenInclude(s => s.ErpDetails)
+              .FirstOrDefaultAsync(w => billNo.Equals(w.BillNo));
+
+            return entity.Clone();
+        }
     }
 }