From 918e4d203b9a7bada1a2f3e277719ec935696fc9 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 26 Oct 2023 15:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/ChangeBoxRecordController.cs | 10 ++--
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 12 ++++
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 60 +++++++++++++++++++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 7 ++-
src/WMS.Web.Core/Dto/PaginationResponseDto.cs | 24 --------
.../IChangeBoxRecordRepositories.cs | 2 +-
.../ChangeBoxRecordRepositories.cs | 2 +-
7 files changed, 85 insertions(+), 32 deletions(-)
delete mode 100644 src/WMS.Web.Core/Dto/PaginationResponseDto.cs
diff --git a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
index e8408e52..3edb9356 100644
--- a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
@@ -37,14 +37,14 @@ namespace WMS.Web.Api.Controllers
///
[HttpPost]
[Route("GetList")]
- public async Task>> GetPagedList([FromBody] ChangeBoxRecordQueryRequest dto)
+ public async Task> GetPagedList([FromBody] ChangeBoxRecordQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
- return Result>.ReFailure(ResultCodes.Token_Invalid_Error);
-
- var response = await _repositories.GetListAsync(dto);
- var result = Result>.ReSuccess(response);
+ return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error);
+
+ var (list, count) = await _repositories.GetListAsync(dto);
+ var result = ResultPagedList.ReSuccess(list,count);
return result;
}
}
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 4a7b6d62..f52ae928 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -4,6 +4,18 @@
WMS.Web.Api
+
+
+ 改箱
+
+
+
+
+ 列表
+
+
+
+
登录接口
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 51b40c53..20913220 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -85,6 +85,51 @@
+
+
+ 改箱列表请求
+
+
+
+
+ 原箱子ID
+
+
+
+
+ 目标箱子ID
+
+
+
+
+ 仓库
+
+
+
+
+ 原仓位ID
+
+
+
+
+ 现仓位ID
+
+
+
+
+ 操作人
+
+
+
+
+ 操作时间 开始
+
+
+
+
+ 操作时间 结束
+
+
ERP：单据查询-dto
@@ -480,6 +525,21 @@
用户类型：1为员工，2为供应商，3为客户
+
+
+ 组织Id(所有列表页都需要 全局)
+
+
+
+
+ 页数 不传默认为1
+
+
+
+
+ 每页条数 不传默认每页10 条
+
+
单点数据-请求统一对象
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 9c502eec..edaaaa7c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -814,7 +814,7 @@
备注
-
+
wms入库单-仓储接口
@@ -1710,6 +1710,11 @@
错误提示信息
+
+
+ 无效
+
+
对接单点的接口方法-枚举
diff --git a/src/WMS.Web.Core/Dto/PaginationResponseDto.cs b/src/WMS.Web.Core/Dto/PaginationResponseDto.cs
deleted file mode 100644
index 601ade98..00000000
--- a/src/WMS.Web.Core/Dto/PaginationResponseDto.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WMS.Web.Core.Dto
-{
- public class PaginationResponseDto
- {
- public PaginationResponseDto(List list, int? total)
- {
- this.List = list;
- this.Total = total;
- }
-
- ///
- /// 查询列表内容
- ///
- public List List { get; set; } = new List();
- ///
- /// 总条数
- ///
- public int? Total { get; set; }
- }
-}
diff --git a/src/WMS.Web.Domain/Infrastructure/IChangeBoxRecordRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IChangeBoxRecordRepositories.cs
index dc1a77e1..3d0811ee 100644
--- a/src/WMS.Web.Domain/Infrastructure/IChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IChangeBoxRecordRepositories.cs
@@ -14,6 +14,6 @@ namespace WMS.Web.Domain.Infrastructure
Task Add(ChangeBoxRecord entity, bool isTransaction = true);
// 获取销售列表
- Task> GetListAsync(ChangeBoxRecordQueryRequest dto);
+ Task<(List list,int total)> GetListAsync(ChangeBoxRecordQueryRequest dto);
}
}
diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
index fb206b1a..321ca5c5 100644
--- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
@@ -64,7 +64,7 @@ namespace WMS.Web.Repositories
///
///
///
- public Task> GetListAsync(ChangeBoxRecordQueryRequest dto)
+ public Task<(List list, int total)> GetListAsync(ChangeBoxRecordQueryRequest dto)
{
throw new NotImplementedException();
}