1
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using MiniExcelLibs;
|
||||
using ZR.Admin.WebApi.Extensions;
|
||||
using ZR.Admin.WebApi.Filters;
|
||||
using ZR.Model.MES.wms;
|
||||
@@ -31,7 +32,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("list")]
|
||||
[ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")]
|
||||
// [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")]
|
||||
public IActionResult QueryWmOneTimeInventory([FromQuery] WmOneTimeInventoryQueryDto parm)
|
||||
{
|
||||
var response = _WmOneTimeInventoryService.GetList(parm);
|
||||
@@ -44,7 +45,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
/// <param name="Id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("{Id}")]
|
||||
[ActionPermissionFilter(Permission = "business:wmonetimeinventory:query")]
|
||||
// [ActionPermissionFilter(Permission = "business:wmonetimeinventory:query")]
|
||||
public IActionResult GetWmOneTimeInventory(string Id)
|
||||
{
|
||||
var response = _WmOneTimeInventoryService.GetInfo(Id);
|
||||
@@ -58,7 +59,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[ActionPermissionFilter(Permission = "business:wmonetimeinventory:add")]
|
||||
// [ActionPermissionFilter(Permission = "business:wmonetimeinventory:add")]
|
||||
[Log(Title = "一次合格品仓库", BusinessType = BusinessType.INSERT)]
|
||||
public IActionResult AddWmOneTimeInventory([FromBody] WmOneTimeInventoryDto parm)
|
||||
{
|
||||
@@ -74,7 +75,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPut]
|
||||
[ActionPermissionFilter(Permission = "business:wmonetimeinventory:edit")]
|
||||
// [ActionPermissionFilter(Permission = "business:wmonetimeinventory:edit")]
|
||||
[Log(Title = "一次合格品仓库", BusinessType = BusinessType.UPDATE)]
|
||||
public IActionResult UpdateWmOneTimeInventory([FromBody] WmOneTimeInventoryDto parm)
|
||||
{
|
||||
@@ -89,7 +90,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpDelete("{ids}")]
|
||||
[ActionPermissionFilter(Permission = "business:wmonetimeinventory:delete")]
|
||||
// [ActionPermissionFilter(Permission = "business:wmonetimeinventory:delete")]
|
||||
[Log(Title = "一次合格品仓库", BusinessType = BusinessType.DELETE)]
|
||||
public IActionResult DeleteWmOneTimeInventory(string ids)
|
||||
{
|
||||
@@ -104,21 +105,7 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
return ToResponse(response);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 一次合格品仓库数据导出
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("export")]
|
||||
[Log(Title = "一次合格品仓库数据导出", BusinessType = BusinessType.EXPORT)]
|
||||
public IActionResult Export([FromQuery] WmOneTimeInventoryQueryDto parm)
|
||||
{
|
||||
parm.PageNum = 1;
|
||||
parm.PageSize = 10000;
|
||||
var list = _WmOneTimeInventoryService.GetExportList(parm);
|
||||
var result = ExportExcelMini(list, "wm_one_time_inventory", "一次合格品仓库数据");
|
||||
return ExportExcel(result.Item2, result.Item1);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 一次合格品手动入库
|
||||
@@ -191,5 +178,55 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
var response = _WmOneTimeInventoryService.GetPartNumber();
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 抛光导入模板下载
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpGet("importTemplate")]
|
||||
[Log(Title = "一次合格模板", BusinessType = BusinessType.EXPORT, IsSaveRequestData = true, IsSaveResponseData = false)]
|
||||
[AllowAnonymous]
|
||||
public IActionResult ImportTemplateExcel()
|
||||
{
|
||||
string fileName = "一次合格仓库盘点模板";
|
||||
(string, string) result = DownloadImportTemplate(fileName);
|
||||
return ExportExcel(result.Item2, result.Item1);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 导入
|
||||
/// </summary>
|
||||
/// <param name="formFile">使用IFromFile必须使用name属性否则获取不到文件</param>
|
||||
/// <returns></returns>
|
||||
[HttpPost("importData")]
|
||||
[Log(Title = "一次合格盘点导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = true)]
|
||||
[AllowAnonymous]
|
||||
public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
|
||||
{
|
||||
List<WmOneTimeInventoryExportDto> importList = new();
|
||||
using (var stream = formFile.OpenReadStream())
|
||||
{
|
||||
importList = stream.Query<WmOneTimeInventoryExportDto>(startCell: "A1").ToList();
|
||||
}
|
||||
|
||||
return SUCCESS(_WmOneTimeInventoryService.ImportExcel(importList));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 一次合格品仓库数据导出
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("export")]
|
||||
[Log(Title = "一次合格品仓库数据导出", BusinessType = BusinessType.EXPORT)]
|
||||
public IActionResult Export([FromQuery] WmOneTimeInventoryQueryDto parm)
|
||||
{
|
||||
parm.PageNum = 1;
|
||||
parm.PageSize = 10000;
|
||||
var list = _WmOneTimeInventoryService.GetExportList(parm);
|
||||
var result = ExportExcelMini(list, "wm_one_time_inventory", "一次合格品仓库数据");
|
||||
return ExportExcel(result.Item2, result.Item1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user