diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs new file mode 100644 index 00000000..7dab2f05 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorklineController.cs @@ -0,0 +1,73 @@ +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; +using ZR.Service.MES.md.IService; + +namespace ZR.Admin.WebApi.Controllers.mes.md +{ + + [Route("mes/md/workline")] + public class MdWorklineController : BaseController + { + IMdWorklineService worklineService; + public MdWorklineController(IMdWorklineService worklineService) + { + this.worklineService = worklineService; + } + + + /// + /// + /// + /// + /// + /// + /// + /// + [HttpGet("list")] + public IActionResult List(int pageNum, int pageSize, string lineCode = "", string lineName = "") + { + (int, List) data = worklineService.GetAll(lineCode, lineName, pageNum, pageSize); + return ToResponse(new ApiResult(200, "success", data)); + } + + + [HttpPost("addWorkline")] + public IActionResult AddWorkline([FromBody] MdWorkline workline) + { + if (workline != null) + workline.ToCreate(HttpContext); + int result = worklineService.AddWorkline(workline); + return SUCCESS(result); + } + + [HttpPost("updateWorkline")] + public IActionResult UpdateWorkline([FromBody] MdWorkline workline) + { + if (workline != null) + { + workline.ToUpdate(HttpContext); + } + + int result = worklineService.UpdateWorkline(workline); + return SUCCESS(result); + } + + + [HttpPost("delWorkline")] + public IActionResult DelWorkline([FromBody] List ids) + { + if (ids != null) + { + int result = worklineService.deleteWorkline(ids.ToArray()); + return ToResponse(result); + } + return null; + + } + } +} diff --git a/ZR.Model/mes/md/MdWorkline.cs b/ZR.Model/mes/md/MdWorkline.cs index 245cc96d..3b7ca850 100644 --- a/ZR.Model/mes/md/MdWorkline.cs +++ b/ZR.Model/mes/md/MdWorkline.cs @@ -26,10 +26,10 @@ namespace ZR.Model.mes.md [SugarColumn(ColumnName="line_name" )] public string LineName { get; set; } /// - /// fk_工艺流程 + /// fk_工作车间 /// - [SugarColumn(ColumnName="fk_tech_process_id" )] - public int? FkTechProcessId { get; set; } + [SugarColumn(ColumnName= "pk_workshop_id")] + public int? FkWorkShopId { get; set; } /// /// 租户号 /// diff --git a/ZR.Model/mes/md/MdWorkstation.cs b/ZR.Model/mes/md/MdWorkstation.cs index 0b0a3393..30d61ec5 100644 --- a/ZR.Model/mes/md/MdWorkstation.cs +++ b/ZR.Model/mes/md/MdWorkstation.cs @@ -28,7 +28,7 @@ namespace ZR.Model.mes.md /// /// fk_工序id /// - [SugarColumn(ColumnName="fk_worksort_id" )] + [SugarColumn(ColumnName= "fk_workline_id")] public int? FkWorksortId { get; set; } [Navigate(NavigateType.OneToOne, nameof(FkWorksortId))] diff --git a/ZR.Service/mes/md/IService/IMdWorklineService.cs b/ZR.Service/mes/md/IService/IMdWorklineService.cs new file mode 100644 index 00000000..6f185dbd --- /dev/null +++ b/ZR.Service/mes/md/IService/IMdWorklineService.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 IMdWorklineService + { + int AddWorkline(MdWorkline workline); + + public (int, List) GetAll(string lineCode, string lineName, int pageNum, int pageSize); + public int UpdateWorkline(MdWorkline workline); + + public int deleteWorkline(int[] ids); + } +} diff --git a/ZR.Service/mes/md/MdWorklineService.cs b/ZR.Service/mes/md/MdWorklineService.cs new file mode 100644 index 00000000..059738c5 --- /dev/null +++ b/ZR.Service/mes/md/MdWorklineService.cs @@ -0,0 +1,44 @@ +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; +using ZR.Service.MES.md.IService; + +namespace ZR.Service.MES.md +{ + [AppService(ServiceType = typeof(IMdWorklineService), ServiceLifetime = LifeTime.Transient)] + public class MdWorklineService : BaseService, IMdWorklineService + { + int IMdWorklineService.AddWorkline(MdWorkline workline) + { + return Insert(workline); + } + + int IMdWorklineService.deleteWorkline(int[] ids) + { + return Delete(ids); + } + + (int, List) IMdWorklineService.GetAll(string lineCode, string lineName, int pageNum, int pageSize) + { + int totalNum = 0; + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(lineCode), it => it.LineCode.Contains(lineCode)) + .AndIF(!string.IsNullOrEmpty(lineName), it => it.LineName.Contains(lineName)) + .ToExpression(); + List data = Context.Queryable().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum); + return (totalNum, data); + } + + int IMdWorklineService.UpdateWorkline(MdWorkline workline) + { + return Update(workline, true); + } + } +} diff --git a/ZR.Vue/src/api/basisManagement/workLine.js b/ZR.Vue/src/api/basisManagement/workLine.js new file mode 100644 index 00000000..79e4404a --- /dev/null +++ b/ZR.Vue/src/api/basisManagement/workLine.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + +export function getWorklineList(query) { + return request({ + url: '/mes/md/workline/list', + method: 'get', + params: query, + }) +} + +export function insertworkline(data) { + return request({ + url: '/mes/md/workline/addWorkline', + method: 'post', + data: data, + contextType:"application/json" + }) +} + + +export function updateWorkline(data) { + return request({ + url: '/mes/md/workline/updateWorkline', + method: 'post', + data: data, + contextType:"application/json" + }) +} + + +export function delWorkline(data) { + return request({ + url: '/mes/md/workline/delWorkline', + method: 'post', + data: data, + contextType:"application/json" + }) +} diff --git a/ZR.Vue/src/views/basisManagement/assemblyLine.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue similarity index 75% rename from ZR.Vue/src/views/basisManagement/assemblyLine.vue rename to ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue index 5309db8f..e5a127ea 100644 --- a/ZR.Vue/src/views/basisManagement/assemblyLine.vue +++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue @@ -3,11 +3,11 @@
- - + + - - + + @@ -40,14 +40,14 @@ - - + +