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

修正singR

Browse Source
This commit is contained in:
DESKTOP-H2PAFLR\Administrator
2023-10-12 09:36:03 +08:00
parent 39b86ccdf0
commit e43a04bc8f
18 changed files with 1290 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs
View File

@@ -55,6 +55,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
[HttpPost("addUnit")]
public IActionResult AddUnitmeasure([FromBody] MdUnit paramss)
{
if(paramss == null) {
return ToResponse(new ApiResult((int)ResultCode.NO_DATA, "null"));
}
paramss.ToCreate(HttpContext);
int result = unitService.InsertUnit(paramss);
return SUCCESS(result);

8
ZR.Admin.WebApi/Controllers/mes/op/OperationController.cs
View File

@@ -1,8 +1,10 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Hubs;
using ZR.Model.mes.md;
using ZR.Model.MES.op.DTO;
using ZR.Model.MES.op.ZR.Model.mes.md;
@@ -18,9 +20,11 @@ namespace ZR.Admin.WebApi.Controllers.MES.md
[Route("mes/op/operation")]
public class OperationController : BaseController
{
IOperationService operationService;
private readonly IOperationService operationService;
public OperationController(IOperationService operationService) {
this.operationService= operationService;
}
/// <summary>
/// 获取所有统计信息
@@ -34,6 +38,6 @@ namespace ZR.Admin.WebApi.Controllers.MES.md
return ToResponse(new ApiResult(200, "success", OpStatisticsList));
}
}
}

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

@@ -10,7 +10,7 @@ using ZR.Service.System.IService;
namespace ZR.Admin.WebApi.Hubs
{
/// <summary>
/// msghub
/// msghub OperationHub
/// </summary>
public class MessageHub : Hub
{

1
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
View File

@@ -18,6 +18,7 @@
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
<PackageReference Include="UAParser" Version="3.1.47" />