diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs new file mode 100644 index 00000000..3c5acdde --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdDeviceController.cs @@ -0,0 +1,82 @@ +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/device")] + public class MdDeviceController : BaseController + { + IMdDeviceService deviceService; + public MdDeviceController(IMdDeviceService deviceService) + { + this.deviceService = deviceService; + } + + + /// + /// + /// + /// + /// + /// + /// + /// + [HttpGet("list")] + public IActionResult List(int pageNum, int pageSize, string deviceCode = "", string deviceName = "") + { + (int, List) data = deviceService.GetAll(deviceCode, deviceName, pageNum, pageSize); + return ToResponse(new ApiResult(200, "success", data)); + } + + + [HttpPost("addDevice")] + public IActionResult AddDevice([FromBody]MdDevice device) + { + if (device != null) + device.ToCreate(HttpContext); + int result = deviceService.AddDevice(device); + return SUCCESS(result); + } + + [HttpPost("updateDevice")] + public IActionResult UpdateDevice([FromBody]MdDevice device) + { + if (device != null) + { + device.ToUpdate(HttpContext); + } + + int result = deviceService.UpdateDevice(device); + return SUCCESS(result); + } + + + [HttpPost("delDevice")] + public IActionResult deleteWorkshop([FromBody] List ids) + { + if (ids != null) + { + int result = deviceService.deleteDevice(ids.ToArray()); + return ToResponse(result); + } + return null; + + } + + + + + + + + + + + + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs new file mode 100644 index 00000000..7cae37dd --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdWorkstationController.cs @@ -0,0 +1,68 @@ +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/workstation")] + public class MdWorkstationController : BaseController + { + + IMdWorkstationService workstationService; + public MdWorkstationController(IMdWorkstationService workstationService) + { + this.workstationService = workstationService; + } + + [HttpGet("list")] + public IActionResult List(int pageNum, int pageSize, string StationCode = "", string StationName = "") + { + + (int, List) data = workstationService.GetAll(StationCode, StationName, pageNum, pageSize); + + return ToResponse(new ApiResult(200, "success", data)); + } + + + + [HttpPost("addWorkstation")] + public IActionResult AddWorkstation([FromBody] MdWorkstation workshop) + { + if (workshop != null) + workshop.ToCreate(HttpContext); + int result = workstationService.AddWorkshop(workshop); + return SUCCESS(result); + } + + + [HttpPost("updateWorkstation")] + public IActionResult UpdateWorkshop([FromBody] MdWorkstation workshop) + { + if (workshop != null) + workshop.ToUpdate(HttpContext); + int result = workstationService.UpdateWorkshop(workshop); + return SUCCESS(result); + } + + + [HttpPost("delWorkstation")] + public IActionResult DelWorkstation([FromBody] List ids) + { + if (ids != null) + { + int result = workstationService.deleteWorkshop(ids.ToArray()); + return ToResponse(result); + } + return null; + } + + } + + + +} diff --git a/ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs b/ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs index 2af23df8..e12ad050 100644 --- a/ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/md/WorkshopController.cs @@ -53,7 +53,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.md [HttpPost("updateWorkshop")] public IActionResult UpdateWorkshop([FromBody] MdWorkshop workshop) { - + if(workshop!=null) + workshop.ToUpdate(HttpContext); int result = mdWorkshopService.UpdateWorkshop(workshop); return SUCCESS(result); } diff --git a/ZR.Model/mes/md/MdWorkstation.cs b/ZR.Model/mes/md/MdWorkstation.cs index 1933d305..0b0a3393 100644 --- a/ZR.Model/mes/md/MdWorkstation.cs +++ b/ZR.Model/mes/md/MdWorkstation.cs @@ -30,6 +30,11 @@ namespace ZR.Model.mes.md /// [SugarColumn(ColumnName="fk_worksort_id" )] public int? FkWorksortId { get; set; } + + [Navigate(NavigateType.OneToOne, nameof(FkWorksortId))] + public MdWorksort worksort { get; set; } + + /// /// 租户号 /// diff --git a/ZR.Service/mes/md/IService/IMdDeviceService.cs b/ZR.Service/mes/md/IService/IMdDeviceService.cs new file mode 100644 index 00000000..1aa140f4 --- /dev/null +++ b/ZR.Service/mes/md/IService/IMdDeviceService.cs @@ -0,0 +1,19 @@ +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 IMdDeviceService + { + int AddDevice(MdDevice device); + + public (int, List) GetAll(string deviceCode, string deviceName, int pageNum, int pageSize); + public int UpdateDevice(MdDevice workshop); + + public int deleteDevice(int[] ids); + } +} diff --git a/ZR.Service/mes/md/IService/IMdWorkstationService.cs b/ZR.Service/mes/md/IService/IMdWorkstationService.cs new file mode 100644 index 00000000..60e81029 --- /dev/null +++ b/ZR.Service/mes/md/IService/IMdWorkstationService.cs @@ -0,0 +1,19 @@ +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 IMdWorkstationService + { + int AddWorkshop(MdWorkstation workshop); + + public (int, List) GetAll(string StationCode, string StationName, int pageNum, int pageSize); + public int UpdateWorkshop(MdWorkstation workshop); + + public int deleteWorkshop(int[] ids); + } +} diff --git a/ZR.Service/mes/md/MdDeviceService.cs b/ZR.Service/mes/md/MdDeviceService.cs new file mode 100644 index 00000000..f9a5fa14 --- /dev/null +++ b/ZR.Service/mes/md/MdDeviceService.cs @@ -0,0 +1,49 @@ +using Infrastructure.Attribute; +using JinianNet.JNTemplate; +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(IMdDeviceService), ServiceLifetime = LifeTime.Transient)] + public class MdDeviceService :BaseService, IMdDeviceService + { + public int AddDevice(MdDevice workshop) + { + + return Insert(workshop); + } + + public int deleteDevice(int[] ids) + { + return Delete(ids); + } + + + + public (int, List) GetAll(string deviceCode, string deviceName, int pageNum, int pageSize) + { + int totalNum = 0; + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(deviceCode), it => it.DeviceCode.Contains(deviceCode)) + .AndIF(!string.IsNullOrEmpty(deviceName), it => it.DeviceName.Contains(deviceName)) + .ToExpression(); + List data = Context.Queryable().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum); + return (totalNum, data); + } + + public int UpdateDevice(MdDevice workshop) + { + return Update(workshop, true); + } + + + } +} diff --git a/ZR.Service/mes/md/MdWorkstationService.cs b/ZR.Service/mes/md/MdWorkstationService.cs new file mode 100644 index 00000000..da5a880a --- /dev/null +++ b/ZR.Service/mes/md/MdWorkstationService.cs @@ -0,0 +1,47 @@ +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(IMdWorkstationService), ServiceLifetime = LifeTime.Transient)] + public class MdWorkstationService : BaseService, IMdWorkstationService + { + public int AddWorkshop(MdWorkstation workshop) + { + return Add(workshop); + + + } + + public int deleteWorkshop(int[] ids) + { + return Delete(ids); + } + + public (int, List) GetAll(string StationCode, string StationName, int pageNum, int pageSize) + { + int totalNum = 0; + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(StationCode), it => it.StationCode.Contains(StationCode)) + .AndIF(!string.IsNullOrEmpty(StationName), it => it.StationName.Contains(StationName)) + .ToExpression(); + List data = Context.Queryable().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum); + return (totalNum, data); + } + + public int UpdateWorkshop(MdWorkstation workshop) + { + return Update(workshop, true); + } + + + } +} diff --git a/ZR.Vue/src/api/basisManagement/device.js b/ZR.Vue/src/api/basisManagement/device.js new file mode 100644 index 00000000..6c5bd8a0 --- /dev/null +++ b/ZR.Vue/src/api/basisManagement/device.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + +export function getDeviceList(query) { + return request({ + url: '/mes/md/device/list', + method: 'get', + params: query, + }) +} + +export function insertDevice(data) { + return request({ + url: '/mes/md/device/addDevice', + method: 'post', + data: data, + contextType:"application/json" + }) +} + + +export function updateDevice(data) { + return request({ + url: '/mes/md/device/updateDevice', + method: 'post', + data: data, + contextType:"application/json" + }) +} + + +export function delDevice(data) { + return request({ + url: '/mes/md/device/delDevice', + method: 'post', + data: data, + contextType:"application/json" + }) +} diff --git a/ZR.Vue/src/api/basisManagement/workstation.js b/ZR.Vue/src/api/basisManagement/workstation.js new file mode 100644 index 00000000..a4b1c654 --- /dev/null +++ b/ZR.Vue/src/api/basisManagement/workstation.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + + +export function getWorkstationList(query) { + return request({ + url: '/mes/md/workstation/list', + method: 'get', + params: query, + }) + } + + export function insertWorkstation(data) { + return request({ + url: '/mes/md/workstation/addWorkstation', + method: 'post', + data: data, + contextType:"application/json" + }) + } + + + export function updateWorkstation(data) { + return request({ + url: '/mes/md/workstation/updateWorkstation', + method: 'post', + data: data, + contextType:"application/json" + }) + } + + + export function delWorkstation(data) { + return request({ + url: '/mes/md/workstation/delWorkstation', + method: 'post', + data: data, + contextType:"application/json" + }) + } + \ No newline at end of file diff --git a/ZR.Vue/src/views/basisManagement/devicestation.vue b/ZR.Vue/src/views/basisManagement/devicestation.vue index 13ebea0e..5309db8f 100644 --- a/ZR.Vue/src/views/basisManagement/devicestation.vue +++ b/ZR.Vue/src/views/basisManagement/devicestation.vue @@ -4,10 +4,10 @@
- + - + @@ -46,9 +46,9 @@ :row-config="{ isHover: true }" > - - - + + + + + diff --git a/ZR.Vue/vue.config.js b/ZR.Vue/vue.config.js index 8aaa19ab..bb1645e1 100644 --- a/ZR.Vue/vue.config.js +++ b/ZR.Vue/vue.config.js @@ -39,14 +39,14 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: 'http://localhost:8888/', // 后端接口地址 + target: 'http://192.168.1.30:8888/', // 后端接口地址 changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' //需要rewrite的 } }, "msgHub": { - target: 'http://localhost:8888/msgHub', + target: 'http://192.168.1.30/msgHub', ws: true, changeOrigin: true, pathRewrite: {