diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdTechnologicalProrouteController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdTechnologicalProrouteController.cs new file mode 100644 index 00000000..e0424a47 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdTechnologicalProrouteController.cs @@ -0,0 +1,74 @@ +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/workproroute")] + public class MdTechnologicalProrouteController : BaseController + { + IMdTechnologicalProrouteService workproroute; + + public MdTechnologicalProrouteController(IMdTechnologicalProrouteService workproroute) + { + this.workproroute = workproroute; + } + + [HttpGet("list")] + public IActionResult List(int pageNum, int pageSize, string ProrouteCode="", string ProrouteName="") + { + + (int, List) data = workproroute.GetAll(ProrouteCode, ProrouteName, pageNum, pageSize); + + return ToResponse(new ApiResult(200, "success", data)); + + } + + + /// + /// 插入车间 + /// + /// + /// + [HttpPost("addProcess")] + public IActionResult AddWorkshop([FromBody] MdTechnologicalProroute workshop) + { + if (workshop != null) + workshop.ToCreate(HttpContext); + int result = workproroute.AddWorkProroute(workshop); + return SUCCESS(result); + } + + + [HttpPost("updateProcess")] + public IActionResult UpdateWorkshop([FromBody] MdTechnologicalProroute workshop) + { + if (workshop != null) + workshop.ToUpdate(HttpContext); + int result = workproroute.UpdateWorkProroute(workshop); + return SUCCESS(result); + } + + + [HttpPost("delProcess")] + public IActionResult deleteWorkshop([FromBody] List ids) + { + if (ids != null) + { + int result = workproroute.deleteWorksProroute(ids.ToArray()); + return ToResponse(result); + } + return null; + } + + + + + } +} + + diff --git a/ZR.Service/mes/md/IService/IMdTechnologicalProrouteService.cs b/ZR.Service/mes/md/IService/IMdTechnologicalProrouteService.cs new file mode 100644 index 00000000..7756b504 --- /dev/null +++ b/ZR.Service/mes/md/IService/IMdTechnologicalProrouteService.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.mes.md; + +namespace ZR.Service.mes.md.IService +{ + public interface IMdTechnologicalProrouteService + { + int AddWorkProroute(MdTechnologicalProroute proroute); + + public (int, List) GetAll(string ProrouteCode, string ProrouteName, int pageNum, int pageSize); + + public int UpdateWorkProroute(MdTechnologicalProroute proroute); + + public int deleteWorksProroute(int[] ids); + } +} diff --git a/ZR.Service/mes/md/MdTechnologicalProrouteService.cs b/ZR.Service/mes/md/MdTechnologicalProrouteService.cs new file mode 100644 index 00000000..238f4d7d --- /dev/null +++ b/ZR.Service/mes/md/MdTechnologicalProrouteService.cs @@ -0,0 +1,48 @@ +using Infrastructure.Attribute; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.mes.md; +using ZR.Service.mes.md.IService; + +namespace ZR.Service.mes.md +{ + [AppService(ServiceType = typeof(IMdTechnologicalProrouteService), ServiceLifetime = LifeTime.Transient)] + public class MdTechnologicalProrouteService : BaseService, IMdTechnologicalProrouteService + { + public int AddWorkProroute(MdTechnologicalProroute proroute) + { + return Add(proroute); + } + + public int deleteWorksProroute(int[] ids) + { + return Delete(ids); + } + + public (int, List) GetAll(string ProrouteCode, string ProrouteName, int pageNum, int pageSize) + { + int totalNum = 0; + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(ProrouteCode), it => it.ProrouteCode.Contains(ProrouteCode)) + .AndIF(!string.IsNullOrEmpty(ProrouteName), it => it.ProrouteName.Contains(ProrouteName)) + .ToExpression(); + + + List data = Context.Queryable().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum); + + return (totalNum, data); + } + + + + public int UpdateWorkProroute(MdTechnologicalProroute proroute) + { + return Update(proroute, true); + } + } +} diff --git a/ZR.Vue/src/api/basisManagement/process.js b/ZR.Vue/src/api/basisManagement/process.js new file mode 100644 index 00000000..21f94ffa --- /dev/null +++ b/ZR.Vue/src/api/basisManagement/process.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + +export function getProcessList(query) { + return request({ + url: '/mes/md/workproroute/list', + method: 'get', + params: query, + }) +} + +export function insertProcess(data) { + return request({ + url: '/mes/md/workproroute/addProcess', + method: 'post', + data: data, + contextType: 'application/json', + }) +} + +export function updateProcess(data) { + return request({ + url: '/mes/md/workproroute/updateProcess', + method: 'post', + data: data, + contextType: 'application/json', + }) +} + +export function delProcess(data) { + return request({ + url: '/mes/md/workproroute/delProcess', + method: 'post', + data: data, + contextType: 'application/json', + }) +} diff --git a/ZR.Vue/src/views/basisManagement/process.vue b/ZR.Vue/src/views/basisManagement/process.vue index 1e838741..93b41360 100644 --- a/ZR.Vue/src/views/basisManagement/process.vue +++ b/ZR.Vue/src/views/basisManagement/process.vue @@ -4,10 +4,10 @@
- + - + @@ -46,8 +46,8 @@ :row-config="{ isHover: true }" > - - + +