This commit is contained in:
2024-11-15 18:51:05 +08:00
parent 8155905cb4
commit caee66b131
11 changed files with 184 additions and 79 deletions

View File

@@ -39,7 +39,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:list")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:list")]
public IActionResult QueryWmPolishInventory([FromQuery] WmPolishInventoryQueryDto parm)
{
var response = _WmPolishInventoryService.GetList(parm);
@@ -52,7 +52,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:query")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:query")]
public IActionResult GetWmPolishInventory(string Id)
{
var response = _WmPolishInventoryService.GetInfo(Id);
@@ -66,7 +66,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:add")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:add")]
[Log(Title = "抛光 库存表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmPolishInventory([FromBody] WmPolishInventoryDto parm)
{
@@ -82,7 +82,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
[Log(Title = "抛光 库存表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmPolishInventory([FromBody] WmPolishInventoryDto parm)
{
@@ -97,7 +97,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:delete")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:delete")]
[Log(Title = "抛光 库存表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmPolishInventory(string ids)
{
@@ -112,22 +112,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] WmPolishInventoryQueryDto parm)
{
parm.PageNum = 1;
parm.PageSize = 10000;
var list = _WmPolishInventoryService.GetExportList(parm);
var result = ExportExcelMini(list, "wm_polish_inventory", "抛光仓库数据");
return ExportExcel(result.Item2, result.Item1);
}
/// <summary>
/// 物料下拉菜单查看
@@ -152,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost("doWmPolishWarehousing")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
[Log(Title = "抛光手动入库", BusinessType = BusinessType.UPDATE)]
public IActionResult DoWmPolishWarehousing([FromBody] WmPolishInventoryDto parm)
{
@@ -173,7 +158,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost("doWmPolishRetrieval")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
[Log(Title = "抛光手动出库", BusinessType = BusinessType.UPDATE)]
public IActionResult DoWmPolishRetrieval([FromBody] WmPolishInventoryDto parm)
{
@@ -194,7 +179,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost("doWmPolishStocktaking")]
[ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
// [ActionPermissionFilter(Permission = "business:wmpolishinventory:edit")]
[Log(Title = "抛光仓库盘点", BusinessType = BusinessType.INSERT)]
public IActionResult DoWmPolishStocktaking([FromBody] WmPolishInventoryDto parm)
{
@@ -255,5 +240,22 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(_WmPolishInventoryService.ImportExcel(importList));
}
/// <summary>
/// 抛光仓库数据导出
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("export")]
[Log(Title = "抛光仓库数据导出", BusinessType = BusinessType.EXPORT)]
public IActionResult Export([FromQuery] WmPolishInventoryQueryDto parm)
{
parm.PageNum = 1;
parm.PageSize = 10000;
var list = _WmPolishInventoryService.GetExportList(parm);
var result = ExportExcelMini(list, "wm_polish_inventory", "抛光仓库数据");
return ExportExcel(result.Item2, result.Item1);
}
}
}