diff --git a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
index 739a6d2b..e8408e52 100644
--- a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
+++ b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
@@ -5,8 +5,12 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.ChangeBoxRecord;
+using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
+using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
{
@@ -27,19 +31,20 @@ namespace WMS.Web.Api.Controllers
_repositories = repositories;
}
///
- /// 列表-组织间需求订单
+ /// 列表
///
///
///
[HttpPost]
- [Route("list")]
- public async Task> GetPagedList([FromBody] OrderOrgRequset dto)
+ [Route("GetList")]
+ 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 _organizationOrderRepositories.GetPagedListAsync(dto, loginInfo.UserInfo.CompanyId);
- var result = Result.ReSuccess(response);
+ return Result>.ReFailure(ResultCodes.Token_Invalid_Error);
+
+ var response = await _repositories.GetListAsync(dto);
+ var result = Result>.ReSuccess(response);
return result;
}
}
diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs
index 54ad230d..20391543 100644
--- a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs
+++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs
@@ -2,9 +2,44 @@
using System.Collections.Generic;
using System.Text;
-namespace WMS.Web.Core.Dto
+namespace WMS.Web.Core.Dto.ChangeBoxRecord
{
- public class ChangeBoxRecordQueryRequest
+ ///
+ /// 改箱列表请求
+ ///
+ public class ChangeBoxRecordQueryRequest: PaginationBaseRequestDto
{
+ ///
+ /// 原箱子ID
+ ///
+ public string SrcBox { get; set; }
+ ///
+ /// 目标箱子ID
+ ///
+ public string DestBox { get; set; }
+ ///
+ /// 仓库
+ ///
+ public int StockId { get; set; }
+ ///
+ /// 原仓位ID
+ ///
+ public int SrcSubStockId { get; set; }
+ ///
+ /// 现仓位ID
+ ///
+ public int DestSubStockId { get; set; }
+ ///
+ /// 操作人
+ ///
+ public string Creator { get; set; }
+ ///
+ /// 操作时间 开始
+ ///
+ public DateTime? CreateBeginDate { get; set; }
+ ///
+ /// 操作时间 结束
+ ///
+ public DateTime? CreateEndDate { get; set; }
}
}
diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs
new file mode 100644
index 00000000..b828cbc3
--- /dev/null
+++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryResponse.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.ChangeBoxRecord
+{
+ public class ChangeBoxRecordQueryInfoResponse
+ {
+
+ }
+}
diff --git a/src/WMS.Web.Core/Dto/PaginationRequestDto.cs b/src/WMS.Web.Core/Dto/PaginationRequestDto.cs
new file mode 100644
index 00000000..e0cb2c75
--- /dev/null
+++ b/src/WMS.Web.Core/Dto/PaginationRequestDto.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace WMS.Web.Core.Dto
+{
+ public class PaginationRequestDto: PaginationBaseRequestDto
+ {
+ ///
+ /// 组织Id(所有列表页都需要 全局)
+ ///
+ [Required(ErrorMessage = "组织不能为空")]
+ public virtual int OrgId { get; set; }
+ }
+
+ public class PaginationBaseRequestDto
+ {
+ ///
+ /// 页数 不传默认为1
+ ///
+ public int PageNo { get; set; } = 1;
+ ///
+ /// 每页条数 不传默认每页10 条
+ ///
+ public int PageSize { get; set; } = 10;
+ }
+}
diff --git a/src/WMS.Web.Core/Dto/PaginationResponseDto.cs b/src/WMS.Web.Core/Dto/PaginationResponseDto.cs
new file mode 100644
index 00000000..601ade98
--- /dev/null
+++ b/src/WMS.Web.Core/Dto/PaginationResponseDto.cs
@@ -0,0 +1,24 @@
+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 797c2e2e..dc1a77e1 100644
--- a/src/WMS.Web.Domain/Infrastructure/IChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Domain/Infrastructure/IChangeBoxRecordRepositories.cs
@@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Domain.Entitys;
namespace WMS.Web.Domain.Infrastructure
@@ -10,5 +12,8 @@ namespace WMS.Web.Domain.Infrastructure
{
// 新增
Task Add(ChangeBoxRecord entity, bool isTransaction = true);
+
+ // 获取销售列表
+ Task> GetListAsync(ChangeBoxRecordQueryRequest dto);
}
}
diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs
index c79223f3..8d7222ff 100644
--- a/src/WMS.Web.Domain/Values/ResultCodes.cs
+++ b/src/WMS.Web.Domain/Values/ResultCodes.cs
@@ -12,5 +12,9 @@ namespace WMS.Web.Domain.Values
public static ValueTuple Erp_Login_Error = (1001, "Erp登录返回错误");
public static ValueTuple Erp_BillQuery_Error = (1002, "Erp单据查询返回错误");
+ ///
+ /// 无效
+ ///
+ public static ValueTuple Token_Invalid_Error = (401, "验证Token无效,请重新登录");
}
}
diff --git a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
index 6aa37b38..fb206b1a 100644
--- a/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
+++ b/src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
@@ -4,6 +4,8 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
+using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Repositories.Configuration;
@@ -23,7 +25,12 @@ namespace WMS.Web.Repositories
_mapper = mapper;
_serviceProvider = serviceProvider;
}
-
+ ///
+ /// 新增
+ ///
+ ///
+ ///
+ ///
public async Task Add(ChangeBoxRecord entity, bool isTransaction = true)
{
IDbContextTransaction _transaction = null;
@@ -52,5 +59,14 @@ namespace WMS.Web.Repositories
}
}
+ ///
+ /// 列表
+ ///
+ ///
+ ///
+ public Task> GetListAsync(ChangeBoxRecordQueryRequest dto)
+ {
+ throw new NotImplementedException();
+ }
}
}