18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-14 16:30:39 +08:00
parent d3e7027adb d02668a871
commit 622e5d3b2b
19 changed files with 309 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
View File

@@ -1,17 +1,21 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -27,12 +31,17 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IChangeBoxRecordRepositories _repositories;
private readonly IChangeMoveBoxService _changeMoveBoxService;
public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories,
IChangeMoveBoxService changeMoveBoxService, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_changeMoveBoxService = changeMoveBoxService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -52,6 +61,28 @@ namespace WMS.Web.Api.Controllers
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] ChangeBoxRecordQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.ChangeBox.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<ChangeBoxRecordQueryInfoResponse, ChangeBoxRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.ChangeBox);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 改箱保存-PDA
/// </summary>
/// <param name="dto"></param>

34
src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
View File

@@ -1,18 +1,22 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Dto.MoveBoxRecord;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -25,12 +29,18 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IMoveBoxRecordRepositories _repositories;
private readonly IChangeMoveBoxService _changeMoveBoxService;
public MoveBoxRecordController(IMapper mapper, ILoginService loginService, IMoveBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public MoveBoxRecordController(IMapper mapper, ILoginService loginService, IMoveBoxRecordRepositories repositories,
IChangeMoveBoxService changeMoveBoxService
, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_changeMoveBoxService = changeMoveBoxService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -50,6 +60,28 @@ namespace WMS.Web.Api.Controllers
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] MoveBoxRecordQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.MoveBox.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<MoveBoxRecordQueryInfoResponse, MoveBoxRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.MoveBox);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 移箱下架保存-PDA
/// </summary>
/// <param name="dto"></param>

32
src/WMS.Web.Api/Controllers/OutStockController.cs
View File

@@ -1,16 +1,20 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.OutStock;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -26,13 +30,18 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IOutStockRepositories _repositories;
private readonly IOutStockService _outStockService;
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public OutStockController(IMapper mapper, ILoginService loginService,
IOutStockRepositories repositories, IOutStockService outStockService)
IOutStockRepositories repositories, IOutStockService outStockService
, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_outStockService = outStockService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -51,7 +60,28 @@ namespace WMS.Web.Api.Controllers
var result = ResultPagedList<OutStockQueryInfoResponse>.ReSuccess(list, count);
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] OutStockQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.OutStock.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<OutStockQueryInfoResponse, OutStockQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.OutStock);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 获取详情
/// </summary>

32
src/WMS.Web.Api/Controllers/TakeStockController.cs
View File

@@ -1,16 +1,20 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -26,13 +30,18 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly ITakeStockRepositories _repositories;
private readonly ITakeStockService _takeStockService;
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public TakeStockController(IMapper mapper, ILoginService loginService,
ITakeStockRepositories repositories, ITakeStockService takeStockService)
ITakeStockRepositories repositories, ITakeStockService takeStockService
, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_takeStockService = takeStockService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -51,7 +60,28 @@ namespace WMS.Web.Api.Controllers
var result = ResultPagedList<TakeStockQueryInfoResponse>.ReSuccess(list, count);
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] TakeStockQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.TakeStock.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<TakeStockQueryInfoResponse, TakeStockQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.TakeStock);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 盘点保存-PDA
/// </summary>

4
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -40,8 +40,8 @@ namespace WMS.Web.Api.Controllers
[Route("hj")]
public async Task<string> TestHJ()
{
//await _boxService.Sync();
var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
await _boxService.Sync();
//var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
//var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg();
var result = await this._erpService.BillQueryForMaterial();

28
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -42,6 +42,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Export(WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
<summary>
改箱保存-PDA
@@ -245,6 +252,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Export(WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Down_Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
<summary>
移箱下架保存-PDA
@@ -271,6 +285,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.Export(WMS.Web.Core.Dto.OutStock.OutStockQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.GetInfo(System.Int32)">
<summary>
获取详情
@@ -438,6 +459,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TakeStockController.Export(WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TakeStockController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest})">
<summary>
盘点保存-PDA

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -2850,6 +2850,11 @@
完成装箱时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CompleteCartonUser">
<summary>
完成装箱用户
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CreateUser">
<summary>
箱子创建用户

41
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -125,6 +125,11 @@
完成装箱时间
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.Box.CompleteCartonUser">
<summary>
完成装箱用户
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.Box.CreateUser">
<summary>
箱子创建用户
@@ -1218,15 +1223,15 @@
解绑
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String)">
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.OutStock(System.String,WMS.Web.Domain.Values.OutStockType)">
<summary>
出库
</summary>
<param name="outStockBillNo">出库单号</param>
</member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.InStock(System.String)">
<member name="M:WMS.Web.Domain.Entitys.SerialNumbers.InStock(System.String,WMS.Web.Domain.Values.InstockType)">
<summary>
出库
入库
</summary>
<param name="inStockBillNo">出库单号</param>
</member>
@@ -4044,6 +4049,36 @@
出库任务单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.OutStock">
<summary>
出库单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.InStockTask">
<summary>
入库任务单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.InStock">
<summary>
出库单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.ChangeBox">
<summary>
改箱
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.MoveBox">
<summary>
移箱
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.TakeStock">
<summary>
盘点
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.InstockStatus">
<summary>
入库状态