From e6aa55a45434952aa72f8be1903962fe4f1a694a Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 10 Nov 2023 11:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=92=8C=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SysConfigController.cs        | 26 +++++++++++++++++++
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml       | 12 +++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index ae437c47..94cb10aa 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -9,6 +9,8 @@ using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto;
 using WMS.Web.Core.Dto.Erp;
+using WMS.Web.Core.Dto.Erp.Org;
+using WMS.Web.Core.Dto.Erp.Supplier;
 using WMS.Web.Core.Dto.SingleData;
 using WMS.Web.Core.Internal.Results;
 using WMS.Web.Domain.Infrastructure;
@@ -107,6 +109,30 @@ namespace WMS.Web.Api.Controllers
             return ResultList<UcStockResponse>.ReSuccess(r);
         }
 
+        /// <summary>
+        /// 获取组织-erp基础数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetOrg")]
+        public async Task<ResultList<ErpOrgDto>> GetOrg() 
+        {
+            var orgs_result=await _erpService.BillQueryForOrg();
+            return orgs_result;
+        }
+
+        /// <summary>
+        /// 获取供应商-erp基础数据
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetSupplier")]
+        public async Task<ResultList<ErpSupplierDto>> GetSupplier()
+        {
+            var supplier_result = await _erpService.BillQueryForSupplier();
+            return supplier_result;
+        }
+
         /// <summary>
         /// 根据仓库获取仓位
         /// </summary>
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index d303c56d..ea1caf79 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -297,6 +297,18 @@
             <param name="name">仓库模糊匹配 不必填</param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetOrg">
+            <summary>
+            获取组织-erp基础数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSupplier">
+            <summary>
+            获取供应商-erp基础数据
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStock(System.Int32)">
             <summary>
             根据仓库获取仓位