diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs index dbb6deb2..b2b883c8 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs @@ -40,5 +40,28 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro return ToResponse(new ApiResult(200, "success", data)); } + [HttpPost("updateworkplan")] + public IActionResult UpdateWorkPlan([FromBody] ProWorkplan proWorkplan) + { + int data = 0; + if (proWorkplan != null) + { + data = proWorkplanService.UpdateWorkPlan(proWorkplan); + } + + return ToResponse(new ApiResult(200, "success", data)); + } + + [HttpGet("deleteitem/{id}")] + public IActionResult DeleteItem(string id) + { + int data = 0; + if (!string.IsNullOrEmpty(id)) + { + data = proWorkplanService.DeleteWorkPlan(id); + } + + return ToResponse(new ApiResult(200, "success", data)); + } } } diff --git a/ZR.Service/mes/pro/IService/IProWorkplanService.cs b/ZR.Service/mes/pro/IService/IProWorkplanService.cs index 31993651..e356b66d 100644 --- a/ZR.Service/mes/pro/IService/IProWorkplanService.cs +++ b/ZR.Service/mes/pro/IService/IProWorkplanService.cs @@ -15,5 +15,9 @@ namespace ZR.Service.mes.pro.IService public (List,int) GetAllData(int pageNum, int pageSize, int year, int week, string partNumber, string color); public int AddWorkPlan(ProWorkplan proWorkplan); + + public int UpdateWorkPlan(ProWorkplan proWorkplan); + + public int DeleteWorkPlan(string id); } } diff --git a/ZR.Service/mes/pro/ProWorkplanService.cs b/ZR.Service/mes/pro/ProWorkplanService.cs index b555f66b..348a783e 100644 --- a/ZR.Service/mes/pro/ProWorkplanService.cs +++ b/ZR.Service/mes/pro/ProWorkplanService.cs @@ -18,13 +18,7 @@ namespace ZR.Service.mes.pro [AppService(ServiceType = typeof(IProWorkplanService), ServiceLifetime = LifeTime.Transient)] public class ProWorkplanService : BaseService, IProWorkplanService { - public int AddWorkPlan(ProWorkplan proWorkplan) - { - - proWorkplan.Id = DateTime.Now.ToString("yyyyMMddHHmmss"); - return Context.Insertable(proWorkplan).ExecuteCommand(); - } - + public (List, int) GetAllData(int pageNum, int pageSize, int year, int week, string partNumber, string color) { var predicate = Expressionable.Create() @@ -37,5 +31,23 @@ namespace ZR.Service.mes.pro List proWorkplanList = Context.Queryable().Where(predicate).ToPageList(pageNum, pageSize, ref totalCount); return (proWorkplanList, totalCount); } + + + public int AddWorkPlan(ProWorkplan proWorkplan) + { + + proWorkplan.Id = DateTime.Now.ToString("yyyyMMddHHmmss"); + return Context.Insertable(proWorkplan).ExecuteCommand(); + } + + public int UpdateWorkPlan(ProWorkplan proWorkplan) + { + return Context.Updateable(proWorkplan).ExecuteCommand(); + } + + public int DeleteWorkPlan(string id) + { + return Context.Deleteable().In(id).ExecuteCommand(); + } } }