diff --git a/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs new file mode 100644 index 00000000..739a6d2b --- /dev/null +++ b/src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs @@ -0,0 +1,46 @@ +using AutoMapper; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.IService.Public; + +namespace WMS.Web.Api.Controllers +{ + /// + /// 改箱 + /// + [Route("api/[controller]")] + [ApiController] + public class ChangeBoxRecordController : ControllerBase + { + private readonly IMapper _mapper; + private readonly ILoginService _loginService; + private readonly IChangeBoxRecordRepositories _repositories; + public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories) + { + _mapper = mapper; + _loginService = loginService; + _repositories = repositories; + } + /// + /// 列表-组织间需求订单 + /// + /// + /// + [HttpPost] + [Route("list")] + public async Task> GetPagedList([FromBody] OrderOrgRequset 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; + } + } +} diff --git a/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs new file mode 100644 index 00000000..54ad230d --- /dev/null +++ b/src/WMS.Web.Core/Dto/ChangeBoxRecord/ChangeBoxRecordQueryRequest.cs @@ -0,0 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto +{ + public class ChangeBoxRecordQueryRequest + { + } +} diff --git a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs index 7bb3d13b..463e2af9 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockDetails.cs @@ -23,8 +23,8 @@ namespace WMS.Web.Domain.Entitys /// /// 单据头Id /// - [Column("FID")] - public int OutStockId { get; set; } + [Column("FId")] + public int FId { get; set; } /// /// 来源单号 /// diff --git a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs index b2a58a2f..f74d4264 100644 --- a/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs +++ b/src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs @@ -22,8 +22,8 @@ namespace WMS.Web.Domain.Entitys /// /// 单据头Id /// - [Column("FID")] - public int OutStockTaskId { get; set; } + [Column("FId")] + public int FId { get; set; } /// /// 来源单号 /// diff --git a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs index c8867daf..fb63b4cd 100644 --- a/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs +++ b/src/WMS.Web.Domain/Entitys/TakeStockDetails.cs @@ -23,8 +23,8 @@ namespace WMS.Web.Domain.Entitys /// /// 单据头Id /// - [Column("FID")] - public int TakeStockId { get; set; } + [Column("FId")] + public int FId { get; set; } /// /// 单据头Id /// diff --git a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs index d389c28c..dc5819bd 100644 --- a/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs +++ b/src/WMS.Web.Repositories/Configuration/RepositoryDbContext.cs @@ -52,7 +52,7 @@ namespace WMS.Web.Repositories.Configuration ent.HasMany(p => p.Details) .WithOne() - .HasForeignKey(p => p.OutStockId) + .HasForeignKey(p => p.FId) .OnDelete(DeleteBehavior.Cascade); }); builder.Entity(ent => @@ -70,7 +70,7 @@ namespace WMS.Web.Repositories.Configuration ent.HasMany(p => p.Details) .WithOne() - .HasForeignKey(p => p.OutStockTaskId) + .HasForeignKey(p => p.FId) .OnDelete(DeleteBehavior.Cascade); }); builder.Entity(ent => @@ -88,7 +88,7 @@ namespace WMS.Web.Repositories.Configuration ent.HasMany(p => p.Details) .WithOne() - .HasForeignKey(p => p.TakeStockId) + .HasForeignKey(p => p.FId) .OnDelete(DeleteBehavior.Cascade); }); builder.Entity(ent =>