feat(hjgl): 完善焊接任务与质量管理流程

This commit is contained in:
2026-08-19 17:13:33 +08:00
parent 08792e0dc8
commit 679e9f6cec
68 changed files with 2481 additions and 1170 deletions
@@ -269,6 +269,27 @@ namespace WebAPI.Controllers
return responeData;
}
/// <summary>
/// 按类型获取焊接耗材。
/// </summary>
/// <param name="consumablesType">焊材类型:1焊丝,2焊条</param>
/// <returns>焊接耗材列表</returns>
public Model.ResponeData GetWeldingConsumables(string consumablesType)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = BLL.APIBaseInfoService.GetWeldingConsumables(consumablesType);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 获取探伤类型
/// </summary>
@@ -1369,5 +1390,29 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
/// <summary>
/// 分页查询入库条码明细。
/// </summary>
[HttpGet]
public Model.ResponeData GetInputDetailBarCodes(string barCodeKeyword, int pageIndex = 1, int pageSize = 20)
{
var responeData = new Model.ResponeData();
try
{
pageIndex = pageIndex < 1 ? 1 : pageIndex;
pageSize = pageSize < 1 ? 20 : Math.Min(pageSize, 200);
var result = APIBaseInfoService.GetInputDetailBarCodes(barCodeKeyword, pageIndex, pageSize);
int totalCount = result.Item2;
int pageCount = totalCount == 0 ? 0 : (int)Math.Ceiling(totalCount / (double)pageSize);
responeData.data = new { pageCount, totalCount, getDataList = result.Item1 };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
}