From 6788ae39bf708b94326bec6e8648a4f16bc648b7 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Mon, 6 Nov 2023 13:43:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/SysConfigController.cs | 6 +--
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 44 ++++++++++++++++++-
.../InStockTask/InStockTaskDetailsInfoDto.cs | 9 +++-
.../Dto/SingleData/UcSubStockResponse.cs | 43 ++++++++++++++++++
.../Infrastructure/IBasicsRepositories.cs | 2 +-
.../BasicsRepositories.cs | 4 +-
6 files changed, 98 insertions(+), 10 deletions(-)
create mode 100644 src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs
diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs
index c22d3a09..d8e08f66 100644
--- a/src/WMS.Web.Api/Controllers/SysConfigController.cs
+++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs
@@ -119,13 +119,13 @@ namespace WMS.Web.Api.Controllers
///
[HttpGet]
[Route("GetSubUcStockByName/{name}")]
- public async Task>> GetSubUcStockByName([FromRoute] string 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);
+ return Result>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
- return Result>.ReSuccess(r);
+ return Result>.ReSuccess(r);
}
///
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index fee29185..e52b42f5 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -960,9 +960,14 @@
ID
-
+
- 单据ID(等同-入库任务单ID)
+ 供应商Id
+
+
+
+
+ 组织ID
@@ -2745,6 +2750,41 @@
是否禁用：true为禁用，false为启用
+
+
+ 仓位响应对象
+
+
+
+
+ id
+
+
+
+
+ 仓库ID
+
+
+
+
+ 仓库名称
+
+
+
+
+ 仓库code
+
+
+
+
+ 名称
+
+
+
+
+ 编码
+
+
盘点单明细
diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs
index 4483f88b..a2d8f422 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs
@@ -13,10 +13,15 @@ namespace WMS.Web.Core.Dto.InStockTask
/// ID
///
public int Id { get; set; }
+
///
- /// 单据ID(等同-入库任务单ID)
+ /// 供应商Id
///
- public int Fid { get; set; }
+ public int SupplierId { get; set; }
+ ///
+ /// 组织ID
+ ///
+ public int OrgId { get; set; }
///
/// 物料ID
diff --git a/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs b/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs
new file mode 100644
index 00000000..69a2dd1a
--- /dev/null
+++ b/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.SingleData
+{
+ ///
+ /// 仓位响应对象
+ ///
+ public class UcSubStockResponse
+ {
+ ///
+ /// id
+ ///
+ public int Id { get; set; }
+
+ ///
+ /// 仓库ID
+ ///
+ public int StockId { get; set; }
+
+ ///
+ /// 仓库名称
+ ///
+ public string StockName { get; set; }
+
+ ///
+ /// 仓库code
+ ///
+ public string StockCode { get; set; }
+
+
+ ///
+ /// 名称
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// 编码
+ ///
+ public string Code { get; set; }
+ }
+}
diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
index 9b0e4e69..6aa79d15 100644
--- a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
@@ -31,7 +31,7 @@ namespace WMS.Web.Domain.Infrastructure
///
///
///
- Task> GetSubUcStockAsync(string systemCode, string name, int companyId);
+ Task> GetSubUcStockAsync(string systemCode, string name, int companyId);
///
/// 获取仓库
///
diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs
index a000ff25..b3b04df5 100644
--- a/src/WMS.Web.Repositories/BasicsRepositories.cs
+++ b/src/WMS.Web.Repositories/BasicsRepositories.cs
@@ -60,9 +60,9 @@ namespace WMS.Web.Repositories
return result.Data.ToList();
}
- public async Task> GetSubUcStockAsync(string systemCode, string name, int companyId)
+ public async Task> GetSubUcStockAsync(string systemCode, string name, int companyId)
{
- var result = await _singleDataService.GetSysConfigData, SystemCodeRequest>
+ var result = await _singleDataService.GetSysConfigData, SystemCodeRequest>
(new SystemCodeRequest(systemCode, name, companyId),
SysConfigAction.GetWmsSubWarehouseBySystemCodeAndNameAndCompany);
if (!result.Success)