From b793758098e1475d02569a20bede0ef27d0efaf0 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 2 Nov 2023 15:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E4=BB=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/SysConfigController.cs | 17 +++++++-
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 6 +++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 42 ++++++++++++++-----
.../Infrastructure/IBasicsRepositories.cs | 9 ++++
.../Values/Single/SysConfigAction.cs | 5 +++
.../BasicsRepositories.cs | 10 +++++
6 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index 46d87bc1..e61790d0 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -100,7 +100,6 @@ namespace WMS.Web.Api.Controllers
/// 根据仓库获取仓位
///
/// 仓库id
- /// 仓库模糊匹配 不必填
///
[HttpGet]
[Route("GetSubUcStock/{id}")]
@@ -113,6 +112,22 @@ namespace WMS.Web.Api.Controllers
return Result>.ReSuccess(r);
}
+ ///
+ /// 根据仓库获取仓位
+ ///
+ /// 仓库模糊匹配 不必填
+ ///
+ [HttpGet]
+ [Route("GetSubUcStock/{name}")]
+ public async Task>> GetSubUcStockByName([FromRoute] string name)
+ {
+ var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+ if (loginInfo == null || loginInfo.UserInfo == null)
+ return Result>.ReFailure(ResultCodes.Token_Invalid_Error);
+ var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
+ return Result>.ReSuccess(r);
+ }
+
///
/// 根据箱号获取箱信息
///
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 18630b52..6c033761 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -246,6 +246,12 @@
根据仓库获取仓位
仓库id
+
+
+
+
+ 根据仓库获取仓位
+
仓库模糊匹配 不必填
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 034d885c..75ec28ae 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1080,6 +1080,15 @@
仓库id
+
+
+ 获取仓位：根据name模糊，和系统code和公司
+
+
+
+
+
+
获取仓库
@@ -2030,18 +2039,12 @@
-
+
- 盘盈
+ 同步数据(保存提交审核)
-
-
-
-
-
- 盘亏
-
-
+
+
@@ -2407,6 +2410,20 @@
+
+
+ 盘盈
+
+
+
+
+
+
+ 盘亏
+
+
+
+
出入库回退类型
@@ -3087,6 +3104,11 @@
获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填
+
+
+ 获取仓库:：根据管理系统code和仓位名称和公司ID，备注系统code和公司ID是必填
+
+
盘点单类型
diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
index 461d6a5e..9b0e4e69 100644
--- a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
@@ -23,6 +23,15 @@ namespace WMS.Web.Domain.Infrastructure
/// 仓库id
///
Task> GetSubUcStockAsync(int stockId);
+
+ ///
+ /// 获取仓位：根据name模糊，和系统code和公司
+ ///
+ ///
+ ///
+ ///
+ ///
+ Task> GetSubUcStockAsync(string systemCode, string name, int companyId);
///
/// 获取仓库
///
diff --git a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
index 7eff3c32..32695fec 100644
--- a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
+++ b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
@@ -187,5 +187,10 @@ namespace WMS.Web.Domain.Values.Single
/// 获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填
///
GetWmsWarehouseBySystemCodeAndNameAndCompany=43,
+
+ ///
+ /// 获取仓库:：根据管理系统code和仓位名称和公司ID，备注系统code和公司ID是必填
+ ///
+ GetWmsSubWarehouseBySystemCodeAndNameAndCompany = 44,
}
}
diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs
index a90fb896..a000ff25 100644
--- a/src/WMS.Web.Repositories/BasicsRepositories.cs
+++ b/src/WMS.Web.Repositories/BasicsRepositories.cs
@@ -60,6 +60,16 @@ namespace WMS.Web.Repositories
return result.Data.ToList();
}
+ public async Task> GetSubUcStockAsync(string systemCode, string name, int companyId)
+ {
+ var result = await _singleDataService.GetSysConfigData, SystemCodeRequest>
+ (new SystemCodeRequest(systemCode, name, companyId),
+ SysConfigAction.GetWmsSubWarehouseBySystemCodeAndNameAndCompany);
+ if (!result.Success)
+ return null;
+ return result.Data.ToList();
+ }
+
public async Task> GetUcStockAsync(string systemCode, string name, int companyId)
{
var result = await _singleDataService.GetSysConfigData, SystemCodeRequest>