Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

检验完成

Browse Source
This commit is contained in:
qianhao.xu
2024-01-29 16:55:45 +08:00
parent 641e9c198a
commit a2295ee36d
7 changed files with 635 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
View File

@@ -34,26 +34,45 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC
/// <summary>
/// 获取 检测项 填充
/// 获取 检测项 填充 (首检)
/// </summary>
/// <returns></returns>
[HttpGet("getcheckItemTable")]
public IActionResult GetcheckItemTable()
[HttpGet("getcheckItemTable__first")]
public IActionResult GetcheckItemTable__first(string workorderID)
{
CheckItemTableDTO itemTableDTO = fQCService.GetCheckItemTable();
CheckItemTableDTO itemTableDTO = fQCService.GetCheckItemTable_first(workorderID);
return SUCCESS(itemTableDTO);
}
/// <summary>
/// 获取 检测项 填充 (二检)
/// </summary>
/// <returns></returns>
[HttpGet("getcheckItemTable__again")]
public IActionResult GetcheckItemTable__again(string workorderID)
{
CheckItemTableDTO itemTableDTO = fQCService.GetCheckItemTable_again(workorderID);
return SUCCESS(itemTableDTO);
}
/// <summary>
/// 获取 检测项 填充 (三检)
/// </summary>
/// <returns></returns>
[HttpGet("getcheckItemTable__thirty")]
public IActionResult GetcheckItemTable__thirty(string workorderID)
{
CheckItemTableDTO itemTableDTO = fQCService.GetCheckItemTable_thirty(workorderID);
return SUCCESS(itemTableDTO);
}
[HttpGet("getcheckitemRecord")]
public IActionResult GetcheckitemRecord()
{
return null;
}
@@ -98,5 +117,82 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC
return SUCCESS(workorder);
}
/// <summary>
/// 初检累加器
/// </summary>
/// <param name="workorder_id"></param>
/// <param name="checkid"></param>
/// <param name="counter"></param>
/// <returns></returns>
[HttpGet("accumulator_query_first")]
public IActionResult Accumulator_first(string workorder_id,int checkid,int counter)
{
int result= fQCService.Accumulator_first(workorder_id, checkid, counter, HttpContext.GetName());
return SUCCESS(counter);
}
/// <summary>
/// 二检累加器
/// </summary>
/// <param name="workorder_id"></param>
/// <param name="checkid"></param>
/// <param name="counter"></param>
/// <returns></returns>
[HttpGet("accumulator_query_again")]
public IActionResult Accumulator_again(string workorder_id, int checkid, int counter)
{
int result = fQCService.Accumulator_again(workorder_id, checkid, counter, HttpContext.GetName());
return SUCCESS(counter);
}
/// <summary>
/// 三检累加器
/// </summary>
/// <param name="workorder_id"></param>
/// <param name="checkid"></param>
/// <param name="counter"></param>
/// <returns></returns>
[HttpGet("accumulator_query_thirty")]
public IActionResult Accumulator_thirty(string workorder_id, int checkid, int counter)
{
int result = fQCService.Accumulator_thirty(workorder_id, checkid, counter, HttpContext.GetName());
return SUCCESS(counter);
}
/// <summary>
/// 计算当前工单抛光总数
/// </summary>
/// <param name="workorder_id"></param>
/// <param name="checkid"></param>
/// <param name="counter"></param>
/// <returns></returns>
[HttpGet("calculate_polish_total_number")]
public IActionResult CalculatePolishTotalNumber(string workorder_id)
{
int AllNumber = fQCService.CalculatePolishTotalNumber(workorder_id);
return SUCCESS(AllNumber);
}
/// <summary>
/// 计算当前工单下的包装投入数==一次合格+抛光合格
/// </summary>
/// <param name="workorder_id"></param>
/// <returns></returns>
[HttpGet("calculate_packagingInvestment")]
public IActionResult CalculatePackagingInvestment(string workorder_id)
{
int AllNumber = fQCService.CalculatePackagingInvestment(workorder_id);
return SUCCESS(AllNumber);
}
}
}

4
ZR.Admin.WebApi/Controllers/mes/qc/QcinspectionItemController.cs
View File

@@ -13,7 +13,9 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.mes.qc
{
/// <summary>
/// 检测
/// </summary>
[Route("mes/qc/IQC")]
public class QcinspectionItemController : BaseController
{

25
ZR.Admin.WebApi/Hubs/MessageHub.cs
View File

@@ -117,23 +117,24 @@ namespace ZR.Admin.WebApi.Hubs
/// <returns></returns>
public async Task SaveCacheInformation_v1(string workorderid, string Moudle, string checkid)
{
checkid = checkid + "_v1";
//缓存key
string checkid_Key =checkid + "_" + workorderid + "_v1";
if (CacheHelper.Exists(checkid))
if (CacheHelper.Exists(checkid_Key))
{
int sum = Convert.ToInt32(CacheHelper.GetCache(checkid)) + 1;
logger.Info($"当前保存工单号{workorderid}，检测项{checkid}，累加的数为{sum}");
CacheHelper.SetCache(checkid, sum);
//SaveinspectItem
await firstFQCService.SaveinspectItem_v1(workorderid,Moudle, checkid,sum);
await Clients.All.SendAsync("GetCache_v1", Moudle,checkid, sum);
int sum = Convert.ToInt32(CacheHelper.GetCache(checkid_Key)) + 1;
logger.Info($"当前保存工单号{workorderid}，检测项{checkid_Key}，累加的数为{sum}");
CacheHelper.SetCache(checkid_Key, sum);
await firstFQCService.SaveinspectItem_v1(workorderid,Moudle, checkid_Key, sum);
await Clients.All.SendAsync("GetCache_v1", Moudle, checkid_Key, sum);
}
else
{
CacheHelper.SetCache(checkid, 1);
logger.Info($"当前保存工单号{workorderid}，检测项{checkid}，累加的数为1");
await firstFQCService.SaveinspectItem_v1(workorderid, Moudle, checkid, 1);
await Clients.All.SendAsync("GetCache_v1", Moudle, checkid, 1);
CacheHelper.SetCache(checkid_Key, 1);
logger.Info($"当前保存工单号{workorderid}，检测项{checkid_Key}，累加的数为1");
await firstFQCService.SaveinspectItem_v1(workorderid, Moudle, checkid_Key, 1);
await Clients.All.SendAsync("GetCache_v1", Moudle, checkid_Key, 1);
}
}