diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs
index 56e1668..012666a 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmInventoryController.cs
@@ -39,7 +39,6 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
return SUCCESS(response);
}
-
///
/// 查询库存表详情
///
@@ -50,7 +49,7 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
public IActionResult GetMmInventory(int Id)
{
var response = _MmInventoryService.GetInfo(Id);
-
+
var info = response.Adapt();
return SUCCESS(info);
}
@@ -93,7 +92,7 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
[HttpPost("delete/{ids}")]
[ActionPermissionFilter(Permission = "mminventory:delete")]
[Log(Title = "删除库存", BusinessType = BusinessType.DELETE)]
- public IActionResult DeleteMmInventory([FromRoute]string ids)
+ public IActionResult DeleteMmInventory([FromRoute] string ids)
{
var idArr = Tools.SplitAndConvert(ids);
@@ -111,6 +110,7 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
return SUCCESS(response);
}
+
///
/// 获取库位下拉数据
///
@@ -122,6 +122,7 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
return SUCCESS(response);
}
+
///
/// 获取出/入库操作类型下拉数据
///
@@ -146,7 +147,7 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
try
{
string response = _MmInventoryService.CreateInboundReceipt(parm);
- if(response == "ok")
+ if (response == "ok")
{
return ToResponse(new ApiResult(200, "ok"));
}
@@ -157,10 +158,8 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
}
catch (Exception)
{
-
throw;
}
-
}
///
@@ -186,10 +185,8 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
}
catch (Exception)
{
-
throw;
}
-
}
///
@@ -198,7 +195,12 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
/// 使用IFromFile必须使用name属性否则获取不到文件
///
[HttpPost("importData")]
- [Log(Title = "库存管理导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = true)]
+ [Log(
+ Title = "库存管理导入",
+ BusinessType = BusinessType.IMPORT,
+ IsSaveRequestData = false,
+ IsSaveResponseData = true
+ )]
[ActionPermissionFilter(Permission = "mminventory:import")]
public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
{
@@ -207,7 +209,10 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
{
return SUCCESS(null);
}
- ImportResultDto response = _MmInventoryService.ImportInventory(formFile, HttpContext.GetName());
+ ImportResultDto response = _MmInventoryService.ImportInventory(
+ formFile,
+ HttpContext.GetName()
+ );
return SUCCESS(response);
}
@@ -250,11 +255,11 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM
///
///
[HttpPost("GetInOrOutRecord")]
- public IActionResult GetInOrOutRecord(MmInventoryRecordQueryDto parm)
+ public IActionResult GetInOrOutRecord([FromBody] MmInventoryRecordQueryDto parm)
{
var response = _MmInventoryService.GetInOrOutRecord(parm);
return SUCCESS(response);
}
}
-}
\ No newline at end of file
+}