From 38a8b2931abd72ee04285794aacbea7ed7c49228 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期二, 13 五月 2025 17:06:43 +0800 Subject: [PATCH] 抽检合格回库/不合格移库开发完成 --- Services/AgvService.cs | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Services/AgvService.cs b/Services/AgvService.cs index 544a88d..8a98eaf 100644 --- a/Services/AgvService.cs +++ b/Services/AgvService.cs @@ -1,25 +1,23 @@ 锘縰sing System; +using System.Threading.Tasks; using HH.WCS.Mobox3.DSZSH.Consts; using HH.WCS.Mobox3.DSZSH.Devices; using HH.WCS.Mobox3.DSZSH.Helpers; -using HH.WCS.Mobox3.DSZSH.Helpers.Model; using HH.WCS.Mobox3.DSZSH.Models; -using HH.WCS.Mobox3.DSZSH.Helper; +using HH.WCS.Mobox3.DSZSH.ServiceCore; using Newtonsoft.Json; using static HH.WCS.Mobox3.DSZSH.Dtos.Request.AgvRequest; using static HH.WCS.Mobox3.DSZSH.Dtos.Response.AgvResponse; -using System.Threading.Tasks; -using HH.WCS.Mobox3.DSZSH.ServiceCore; namespace HH.WCS.Mobox3.DSZSH.Services { public class AgvService { public static ReturnResult OperateAgvTaskStatus(AgvTaskState model) { var result = new ReturnResult(); try { - switch (model.State) { + switch (model.state) { case 1023: case 1025: @@ -35,7 +33,7 @@ if (!AgvTaskProcessOk(model)) { // 鎵ц涓峅K锛岃鏄庢病鏈夋壘鍒颁换鍔� result.ResultCode = 1; - result.ResultMsg = $"鏍规嵁Model.No鏈壘鍒板搴旂殑浠诲姟锛寋model.TaskNo}"; + result.ResultMsg = $"鏍规嵁Model.No鏈壘鍒板搴旂殑浠诲姟锛寋model.task_no}"; LogHelper.Info(result.ResultMsg, "API"); return result; } @@ -62,19 +60,19 @@ /// <param name="model"></param> /// <returns></returns> private static bool AgvTaskProcessOk(AgvTaskState model) { - var TN_Task = TaskHelper.GetTask(model.TaskNo); // 鏍规嵁褰撳墠model缂栧彿鏌ヨ浠诲姟 + var TN_Task = TaskHelper.GetTask(model.task_no); // 鏍规嵁褰撳墠model缂栧彿鏌ヨ浠诲姟 if (TN_Task == null) { return false; } - if (model.State > 7) { + if (model.state > 7) { //瀹夊叏璇锋眰绛�- TaskHelper.OperateReq(model.TaskNo, model.State, model.ForkliftNo, model.ext_data); + TaskHelper.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data); return true; } // AGV 浠诲姟 134562(7) 鐘舵�澶勭悊 - switch (model.State) { + switch (model.state) { case AgvStateCode.鎵ц: - TaskHelper.Begin(TN_Task, model.ForkliftNo); // 宸叉帹閫佺殑浠诲姟鐨勭姸鎬佹敼鎴愭墽琛�+ TaskHelper.Begin(TN_Task, model.forklift_no); // 宸叉帹閫佺殑浠诲姟鐨勭姸鎬佹敼鎴愭墽琛� break; case AgvStateCode.寮�鍙栬揣: TaskHelper.UpdateStatus(TN_Task, "寮�鍙栬揣"); // 浠诲姟鐘舵�鏀规垚寮�鍙栬揣 @@ -100,7 +98,7 @@ case AgvStateCode.瀹屾垚: TaskHelper.End(TN_Task); // 浠诲姟鐘舵�鏀规垚缁撴潫 - if (TN_Task.S_TYPE == TaskName.鎶芥) { + if (TN_Task.S_TYPE == TaskName.鎶芥_鍑哄簱) { var checkCompleteTask = Task.Run(() => { CheckCore.UpdateTaskState(SpotStateCode.浠诲姟鎵ц瀹屾垚); }); @@ -114,7 +112,7 @@ } // 灏咥GV鎵ц鐘舵�锛屽姞鍏N_Task_Action琛ㄤ腑 - TaskHelper.AddActionRecord(model.TaskNo, model.State, model.ForkliftNo, model.ext_data); + TaskHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data); //璋冪敤绗笁鏂规帴鍙o紙濡傛灉鏈夛級TaskProcess.ReportStatus锛屾坊鍔犱换鍔″姩浣滃叧绯昏〃 return true; -- Gitblit v1.9.1