From a05f2cdffeb353ea7d8f2dbb4b75899e6337111c Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Sat, 7 Sep 2024 15:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=87=E6=96=99=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MES/mm/MmPreparantTaskController.cs | 8 +++++++ .../mm/IService/IMmPreparantTaskService.cs | 2 +- DOAN.Service/MES/mm/MmPreparantTaskService.cs | 21 ++++++++++++------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs index ed3d13a..58aa60e 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/mm/MmPreparantTaskController.cs @@ -120,6 +120,14 @@ namespace DOAN.WebApi.Controllers.MES.mm return SUCCESS(response); } + //TODO 任务备料状态切换 + [HttpGet("switch_task_preparation")] + public IActionResult SwitchTaskPreparation(string task_code,int preparation_status) + { + if(string.IsNullOrEmpty(task_code)) { return SUCCESS(null); }; + var response = preparantTaskService.SwitchTaskPreparation(task_code, preparation_status); + return SUCCESS(response); + } } diff --git a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs index b3bef38..b82525c 100644 --- a/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs +++ b/DOAN.Service/MES/mm/IService/IMmPreparantTaskService.cs @@ -33,6 +33,6 @@ namespace DOAN.Service.MES.mm.IService PagedInfo TableQuerytaskInfo(FormsWorkoderAndTaskQuery parm); - + int SwitchTaskPreparation(string task_code, int preparation_status); } } diff --git a/DOAN.Service/MES/mm/MmPreparantTaskService.cs b/DOAN.Service/MES/mm/MmPreparantTaskService.cs index 3644782..ff23178 100644 --- a/DOAN.Service/MES/mm/MmPreparantTaskService.cs +++ b/DOAN.Service/MES/mm/MmPreparantTaskService.cs @@ -295,12 +295,12 @@ namespace DOAN.Service.MES.mm SerialNum = t.SerialNum, TaskCode = t.TaskCode, FkWorkorder = q.Workorder, - RouteCode=q.FkRouteCode, - DeliveryNum=q.DeliveryNum, - ProductionName= q.ProductionName, - ProductionCode=q.ProductionCode, - CustomCode=q.CustomCode, - WorkorderDate=q.WorkorderDate, + RouteCode = q.FkRouteCode, + DeliveryNum = q.DeliveryNum, + ProductionName = q.ProductionName, + ProductionCode = q.ProductionCode, + CustomCode = q.CustomCode, + WorkorderDate = q.WorkorderDate, FkTaskCode = i.FkTaskCode, PreparationStatus = t.PreparationStatus, CreatedBy = t.CreatedBy, @@ -308,7 +308,7 @@ namespace DOAN.Service.MES.mm UpdatedTime = t.UpdatedTime, UpdatedBy = t.UpdatedBy, SubId = i.Id, - + MaterialCode = i.MaterialCode, MaterialName = i.MaterialName, Specification = i.Specification, @@ -329,5 +329,12 @@ namespace DOAN.Service.MES.mm } + + public int SwitchTaskPreparation(string task_code, int preparation_status) + { + return Context.Updateable().Where(it => it.TaskCode == task_code) + .SetColumns(it => it.PreparationStatus == preparation_status) + .ExecuteCommand(); + } } }