From 47281965d40588bcf9115beca102aa615c469513 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 13 Nov 2023 15:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SysConfigController.cs        | 35 +++++++++++++++----
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml       |  4 +--
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index e5cfab25..918dca8b 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -117,11 +117,21 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Route("GetOrg")]
-        public async Task<ResultList<ErpOrgDto>> GetOrg()
+        [Route("GetOrg/{name}")]
+        public async Task<ResultList<PullDownStrResponse>> GetOrg([FromRoute] string name)
         {
             var orgs_result = await _erpService.BillQueryForOrg();
-            return orgs_result;
+            List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
+            foreach (var c in orgs_result.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
+            {
+                pullList.Add(new PullDownStrResponse()
+                {
+                    Id = c.Id.ToString(),
+                    Name = c.Name,
+                    Code = c.Number
+                });
+            }
+            return ResultList<PullDownStrResponse>.ReSuccess(pullList);
         }
 
         /// <summary>
@@ -129,11 +139,22 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Route("GetSupplier")]
-        public async Task<ResultList<ErpSupplierDto>> GetSupplier()
+        [Route("GetSupplier/{name}")]
+        public async Task<ResultList<PullDownStrResponse>> GetSupplier([FromRoute] string name)
         {
             var supplier_result = await _erpService.BillQueryForSupplier();
-            return supplier_result;
+            List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
+            foreach (var c in supplier_result.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
+            {
+                pullList.Add(new PullDownStrResponse()
+                {
+                    Id = c.Id.ToString(),
+                    Name = c.Name,
+                    Code = c.Number
+                });
+            }
+
+            return ResultList<PullDownStrResponse>.ReSuccess(pullList);
         }
 
         /// <summary>
@@ -198,7 +219,7 @@ namespace WMS.Web.Api.Controllers
             var customers = await _erpService.BillQueryForCustomer();
             var orgs = await _erpService.BillQueryForOrg();
             List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
-            foreach (var c in customers.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%")))
+            foreach (var c in customers.Data.Where(w => EF.Functions.Like(w.Name, "%" + name + "%")))
             {
                 pullList.Add(new PullDownStrResponse()
                 {
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 218ed7ce..d79ccbfb 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -332,13 +332,13 @@
             <param name="name">仓库模糊匹配 不必填</param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetOrg">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetOrg(System.String)">
             <summary>
             获取组织-erp基础数据
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSupplier">
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSupplier(System.String)">
             <summary>
             获取供应商-erp基础数据
             </summary>