From 62514703b90b07438787403ff344320b15edc7bf Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Mon, 11 Dec 2023 14:43:43 +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

---
 src/WMS.Web.Api/Controllers/SysConfigController.cs    | 6 +++---
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml               | 4 ++--
 src/WMS.Web.Repositories/SerialNumbersRepositories.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 6102cdd1..8719f032 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -357,13 +357,13 @@ namespace WMS.Web.Api.Controllers
         }
 
         /// <summary>
-        /// 根据序列号或规格型号搜索物料信息-PDA
+        /// 根据序列号或规格型号,物料编码搜索物料信息-PDA
         /// </summary>
-        /// <param name="serialNumber">序列号或规格型号</param>
+        /// <param name="serialNumber">序列号或规格型号或无聊编码</param>
         /// <returns></returns>
         [HttpGet]
         [Route("GetMaterial/{serialNumber}")]
-        public async Task<Result<MaterialResponse>> GetMaterial([FromRoute] string serialNumber)
+        public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 9b767d07..8a39cd50 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -519,9 +519,9 @@
         </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetMaterial(System.String)">
             <summary>
-            根据序列号或规格型号搜索物料信息-PDA
+            根据序列号或规格型号,物料编码搜索物料信息-PDA
             </summary>
-            <param name="serialNumber">序列号或规格型号</param>
+            <param name="serialNumber">序列号或规格型号或无聊编码</param>
             <returns></returns>
         </member>
         <member name="T:WMS.Web.Api.Controllers.TakeStockController">
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 1fd9d577..1d86964a 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -186,7 +186,7 @@ namespace WMS.Web.Repositories
                 return response;
             var materials = materials_result.Data.ToList();
 
-            var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber));
+            var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber)|| f.MaterialNumber.Equals(serialNumber));
             if (material != null)
             {
                 response.MaterialId = material.MaterialId;