RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

树结构

Browse Source
This commit is contained in:
qianhao.xu 2024-07-05 14:30:02 +08:00
parent b9936689e6
commit 3b4abc97fb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/Controllers/MES/andon/AndonInteractionController.cs
View File

@ -35,7 +35,7 @@ namespace DOAN.WebApi.Controllers.MES.andon
}
AndonFaultRecord record = query.Adapt<AndonFaultRecord>();
record.ToCreate();
record.ToCreate(HttpContext);
var response = _andonInteractionService.CallHandle(record);
return SUCCESS(response);
}
@ -64,7 +64,7 @@ namespace DOAN.WebApi.Controllers.MES.andon
}
AndonFaultRecord record = response.Adapt<AndonFaultRecord>();
record.ToUpdate();
record.ToUpdate(HttpContext);
var res = _andonInteractionService.SignIn(record);
return SUCCESS(res);

8
DOAN.Service/MES/dev/DeviceAccountService.cs
View File

@ -326,8 +326,8 @@ namespace DOAN.Service.MES.dev
.OrderBy(it => it.Id)
.Select(it => new SelectTreeDto
{
Id = it.Id.ToString(),
ParentId = it.ParentId.ToString(),
Id =(it.Id * 10000).ToString(),
ParentId = (it.ParentId*10000).ToString(),
Label = it.Name,
Value = it.Name
})
@ -338,8 +338,8 @@ namespace DOAN.Service.MES.dev
.Select(it => new SelectTreeDto
{
// Id = it.Id.ToString() + it.FkDeviceType.ToString(),//解决合并后id重复
Id = (it.Id*10000).ToString() ,//解决合并后id重复
ParentId = it.FkDeviceType.ToString(),
Id = it.Id.ToString(),//解决合并后id重复
ParentId = (it.FkDeviceType*10000).ToString(),
Label = it.DeviceCode + "||" +it.DeviceName ,
Value = it.Id.ToString()
}).ToList();