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

9/8

Browse Source
This commit is contained in:
DESKTOP-H2PAFLR\Administrator
2023-09-08 13:10:26 +08:00
parent 76452f970f
commit 50c0a7a016
17 changed files with 129 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs
View File

@@ -68,7 +68,13 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
}
[HttpGet("getworkstationList")]
public IActionResult GetworkstationList()
{
List<MdWorkstation> workstations= deviceService.getworkstationList();
return SUCCESS(workstations);
}

4
ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs
View File

@@ -77,5 +77,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
List<MdWorkshop> MdWorkshopList= worklineService.GetMdWorkshops(worklineId);
return SUCCESS(MdWorkshopList);
}
}
}

73
ZR.Admin.WebApi/Controllers/mes/md/MdWorksortController.cs
View File

@@ -1,73 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.mes.md;
using ZR.Service.mes.md.IService;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/Worksort")]
public class MdWorksortController : BaseController
{
IMdWorksortService worksortService;
public MdWorksortController(IMdWorksortService worksortService)
{
this.worksortService = worksortService;
}
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string WorksortCode = "", string WorksortName = "")
{
(int, List<MdWorksort>) data = worksortService.GetAll(WorksortCode, WorksortName, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 插入车间
/// </summary>
/// <param name="worksort"></param>
/// <returns></returns>
[HttpPost("addWorksort")]
public IActionResult AddWorksort([FromBody] MdWorksort worksort)
{
if (worksort != null)
worksort.ToCreate(HttpContext);
int result = worksortService.AddWorksort(worksort);
return SUCCESS(result);
}
[HttpPost("updateWorksort")]
public IActionResult UpdateWorksort([FromBody] MdWorksort worksort)
{
if (worksort != null)
worksort.ToUpdate(HttpContext);
int result = worksortService.UpdateWorksort(worksort);
return SUCCESS(result);
}
[HttpPost("delWorksort")]
public IActionResult deleteWorksort([FromBody] List<int> ids)
{
if (ids != null)
{
int result = worksortService.deleteWorksort(ids.ToArray());
return ToResponse(result);
}
return null;
}
}
}

14
ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs
View File

@@ -5,10 +5,11 @@ using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
using ZR.Service.MES.md;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/workstation")]
public class MdWorkstationController : BaseController
{
@@ -60,9 +61,14 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
}
return null;
}
[HttpGet("getworkLineList")]
public IActionResult GetworkLineList()
{
List<MdWorkline> MdWorkshopList = workstationService.GetworkLineList();
return SUCCESS(MdWorkshopList);
}
}
}