From 41e2c229c669c6da09578f073e925cb29d2b958c Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Tue, 30 Apr 2024 13:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=85=8D=E6=96=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/mm/MaterialInputController.cs | 34 ++++++++++++++++--- ZR.Model/MES/mm/MmIngredientTask.cs | 4 +++ .../mes/mm/IService/IMaterialInputService.cs | 2 ++ ZR.Service/mes/mm/MaterialInputService.cs | 29 +++++++++++++--- 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs index 8e7f8bbe..fc6db0c3 100644 --- a/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs @@ -148,9 +148,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm /// /// [HttpGet("emergency_stop_agv")] - public IActionResult EmergencyStopAgv(string reqCode) + public IActionResult EmergencyStopAgv(string reqCode) { - if(string.IsNullOrEmpty(reqCode)) + if (string.IsNullOrEmpty(reqCode)) { SUCCESS(null); } @@ -160,14 +160,40 @@ namespace ZR.Admin.WebApi.Controllers.mes.mm } /// - /// + /// agv完成任务 /// /// [HttpPost("agv_final_task")] - public IActionResult AgvFinalTask() + public IActionResult AgvFinalTask() { return null; } + /// + /// 完成配料任务 + /// 1.更改站点托盘 + /// 2.完成的配料任务不可见 + /// + /// + [HttpGet("finishBatchingTask")] + public IActionResult FinishBatchingTask(string start_point, string end_point, string taskId) + { + if (string.IsNullOrEmpty(start_point)) + { + return SUCCESS(null); + } + if (string.IsNullOrEmpty(end_point)) + { + return SUCCESS(null); + } + if (string.IsNullOrEmpty(taskId)) + { + return SUCCESS(null); + } + + var response = materialInputService.FinishBatchingTask(start_point, end_point, taskId); + return SUCCESS(response); + } + } } \ No newline at end of file diff --git a/ZR.Model/MES/mm/MmIngredientTask.cs b/ZR.Model/MES/mm/MmIngredientTask.cs index bf9f0f26..78c467c8 100644 --- a/ZR.Model/MES/mm/MmIngredientTask.cs +++ b/ZR.Model/MES/mm/MmIngredientTask.cs @@ -50,6 +50,10 @@ namespace ZR.Model.MES.mm /// public int? PreviousNumbered { get; set; } + + + public int? Isfinal { get; set; } + /// /// 创建人 /// diff --git a/ZR.Service/mes/mm/IService/IMaterialInputService.cs b/ZR.Service/mes/mm/IService/IMaterialInputService.cs index 649e114b..559b9701 100644 --- a/ZR.Service/mes/mm/IService/IMaterialInputService.cs +++ b/ZR.Service/mes/mm/IService/IMaterialInputService.cs @@ -29,5 +29,7 @@ namespace ZR.Service.mes.mm.IService string AGV_schedule(string start_point, string end_point); string EmergencyStopAgv(string reqCode); + int FinishBatchingTask(string start_point, string end_point, string taskId); + } } diff --git a/ZR.Service/mes/mm/MaterialInputService.cs b/ZR.Service/mes/mm/MaterialInputService.cs index 6b7ff3f8..94f30292 100644 --- a/ZR.Service/mes/mm/MaterialInputService.cs +++ b/ZR.Service/mes/mm/MaterialInputService.cs @@ -160,6 +160,7 @@ namespace ZR.Service.mes.mm ingredientTask.TaskId = taskid.ToString(); ingredientTask.Workorder = item.workorder; ingredientTask.Partnumber = item.partnumber; + ingredientTask.Isfinal = 0; ingredientTask.PreviousNumber = item.previousNumber; ingredientTask.PreviousNumbered = item.previousNumbered; ingredientTask.CreatedBy = name; @@ -189,6 +190,7 @@ namespace ZR.Service.mes.mm DateTime endOfDay = startOfDay.AddDays(1).AddTicks(-1); return Context.Queryable() .Where(it => it.CreatedTime > startOfDay && it.CreatedTime < endOfDay) + .Where(it => it.Isfinal == 0) .GroupBy(it => it.TaskId) .Select(it => new MmIngredientTask() { @@ -217,8 +219,8 @@ namespace ZR.Service.mes.mm /// public string[] Getfabgopoints() { - return Context.Queryable().Where(it => it.AreaCode == 3).Where(it => it.Status == 0) - .Select(it => it.Coordinate).ToArray(); + return Context.Queryable().Where(it => it.AreaCode == 3).Where(it => it.Status == 0) + .Select(it => it.Coordinate).ToArray(); } @@ -230,7 +232,7 @@ namespace ZR.Service.mes.mm /// /// /// - public string AGV_schedule(string start_point, string end_point) + public string AGV_schedule(string start_point, string end_point) { string url = "https://192.168.60.1:443/rcms/services/rest/hikRpcService/genAgvSchedulingTask"; AGVtask_third task = new AGVtask_third(); @@ -256,7 +258,7 @@ namespace ZR.Service.mes.mm string postData = JsonSerializer.Serialize(task); string response = HttpHelper.HttpPost(url, postData); - + return response; @@ -285,6 +287,25 @@ namespace ZR.Service.mes.mm } + + + /// + /// 完成配料任务 + /// 1.更改站点托盘 + /// 2.完成的配料任务不可见 + /// + /// + public int FinishBatchingTask(string start_point, string end_point, string taskId) + { + int result = 0; + UseTran2(() => + { + Context.Updateable().Where(it => it.Coordinate == start_point).SetColumns(it => it.Status == 0).ExecuteCommand(); + Context.Updateable().Where(it => it.Coordinate == end_point).SetColumns(it => it.Status == 1).ExecuteCommand(); + result= Context.Updateable().Where(it => it.TaskId.Equals(taskId)).SetColumns(it => it.Isfinal == 1).ExecuteCommand(); + }); + return result; + } } }