Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(工单物料): 重构工单物料查询接口并支持分页

Browse Source 
- 新增WorkorderMaterialQueryDto作为统一查询参数模型
- 修改物料库存、可领料工单、成品库存和可出货订单查询接口，支持分页返回
- 优化RouteCode为10的工单编号生成逻辑，从101开始编号
- 调整采购订单出货数量计算方式，直接减扣出库数量
This commit is contained in:
git_rabbit
2026-03-02 19:19:23 +08:00
parent dc8cb4053d
commit 6418bb67b9
7 changed files with 235 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
DOAN.Admin.WebApi/Controllers/MES/Product/ProWorkorderController.cs
View File

@@ -525,30 +525,7 @@ namespace DOAN.Admin.WebApi.Controllers
}
}
/// <summary>
/// 根据工单号查询物料库存
/// </summary>
/// <param name="workorder">工单号</param>
/// <returns>物料库存信息列表</returns>
[HttpGet("GetMaterialInventoryList/{workorder}")]
[ActionPermissionFilter(Permission = "productManagement:proworkorder:query")]
public IActionResult GetMaterialInventoryList(string workorder)
{
try
{
if (string.IsNullOrEmpty(workorder))
{
return ToResponse(ApiResult.Error($"工单号不能为空"));
}
var response = _ProWorkorderMaterialService.GetMaterialInventoryList(workorder);
return SUCCESS(response);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// 领料接口
@@ -633,24 +610,53 @@ namespace DOAN.Admin.WebApi.Controllers
}
/// <summary>
/// 根据工单号获取可领料工单清单
/// 根据工单号查询物料库存
/// </summary>
/// <param name="query">带分页请求参数</param>
/// <param name="workorder">工单号</param>
/// <returns>可领料工单清单</returns>
[HttpGet("GetPickableWorkordersByWorkorder/{workorder}")]
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <param name="searchType">搜索方式</param>
/// <returns>物料库存信息列表</returns>
[HttpPost("GetMaterialInventoryList")]
[ActionPermissionFilter(Permission = "productManagement:proworkorder:query")]
public IActionResult GetPickableWorkordersByWorkorder(string workorder)
public IActionResult GetMaterialInventoryList([FromBody] WorkorderMaterialQueryDto query)
{
try
{
if (string.IsNullOrEmpty(workorder))
if (string.IsNullOrEmpty(query.Workorder))
{
return ToResponse(ApiResult.Error($"工单号不能为空"));
}
var response = _ProWorkorderMaterialService.GetPickableWorkordersByWorkorder(
workorder
);
var response = _ProWorkorderMaterialService.GetMaterialInventoryList(query);
return SUCCESS(response);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// 根据工单号获取可领料工单清单
/// </summary>
/// <param name="query">带分页请求参数</param>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <param name="searchType">查询范围 1-物料库 2-转用库</param>
/// <returns>可领料工单清单</returns>
[HttpPost("GetPickableWorkordersByWorkorder")]
[ActionPermissionFilter(Permission = "productManagement:proworkorder:query")]
public IActionResult GetPickableWorkordersByWorkorder([FromBody] WorkorderMaterialQueryDto query)
{
try
{
if (string.IsNullOrEmpty(query.Workorder))
{
return ToResponse(ApiResult.Error($"工单号不能为空"));
}
var response = _ProWorkorderMaterialService.GetPickableWorkordersByWorkorder(query);
return SUCCESS(response);
}
catch (Exception ex)
@@ -662,22 +668,22 @@ namespace DOAN.Admin.WebApi.Controllers
/// <summary>
/// 根据工单号获取可出货订单清单
/// </summary>
/// <param name="query">带分页请求参数</param>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <returns>可出货订单清单</returns>
[HttpGet("GetShippableOrdersByWorkorder/{workorder}")]
[HttpPost("GetShippableOrdersByWorkorder")]
[ActionPermissionFilter(Permission = "productManagement:proworkorder:query")]
public IActionResult GetShippableOrdersByWorkorder(string workorder)
public IActionResult GetShippableOrdersByWorkorder([FromBody] WorkorderMaterialQueryDto query)
{
try
{
if (string.IsNullOrEmpty(workorder))
if (string.IsNullOrEmpty(query.Workorder))
{
return ToResponse(ApiResult.Error($"工单号不能为空"));
}
var response = _ProWorkorderMaterialService.GetShippableOrdersByWorkorder(
workorder
);
var response = _ProWorkorderMaterialService.GetShippableOrdersByWorkorder(query);
return SUCCESS(response);
}
catch (Exception ex)
@@ -690,19 +696,20 @@ namespace DOAN.Admin.WebApi.Controllers
/// 根据工单号查询成品库存
/// </summary>
/// <param name="workorder">工单号</param>
/// <param name="isHideZero">是否隐藏为0记录</param>
/// <returns>成品库存信息列表</returns>
[HttpGet("GetProductInventoryList/{workorder}")]
[HttpPost("GetProductInventoryList")]
[ActionPermissionFilter(Permission = "productManagement:proworkorder:query")]
public IActionResult GetProductInventoryList(string workorder)
public IActionResult GetProductInventoryList([FromBody] WorkorderMaterialQueryDto query)
{
try
{
if (string.IsNullOrEmpty(workorder))
if (string.IsNullOrEmpty(query.Workorder))
{
return ToResponse(ApiResult.Error($"工单号不能为空"));
}
var response = _ProWorkorderMaterialService.GetProductInventoryList(workorder);
var response = _ProWorkorderMaterialService.GetProductInventoryList(query);
return SUCCESS(response);
}
catch (Exception ex)