From 112c9bd20afed95d582b7eb227075ab8d10cdd12 Mon Sep 17 00:00:00 2001 From: 海波 张 <2956280567@qq.com> Date: 星期二, 24 六月 2025 17:29:28 +0800 Subject: [PATCH] 金坛优化 --- core/TaskCore.cs | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/core/TaskCore.cs b/core/TaskCore.cs index 4d8e582..77436ae 100644 --- a/core/TaskCore.cs +++ b/core/TaskCore.cs @@ -20,7 +20,6 @@ internal class TaskCore { public static void OperateTaskStatus(AgvTaskState model) { - var wmsTask = TaskHelper.GetTask(model.task_no); var db = new SqlHelper<object>().GetInstance(); @@ -82,7 +81,6 @@ TaskProcess.OperateStatus(wcsTask1, 7); } } - TaskHelper.Fail(wmsTask); TaskProcess.OperateStatus(wmsTask, 7); @@ -92,19 +90,19 @@ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE); } - //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙g粦 - if (!WcsTask.WcsCvstate(wmsTask)) - { - LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱"); - TaskProcess.OperateStatus(wmsTask, 4); - ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); - ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE); - } + + //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙g粦 + if (!WcsTask.WcsCvstate(wmsTask)) + { + LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱"); + TaskProcess.OperateStatus(wmsTask, 4); + ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); + ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE); + } break; } - TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data); - + TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data); } else { @@ -112,12 +110,30 @@ TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data); } } - } - + public static void addAgvActionState(AgvTaskState model) + { + var agvAction = new AgvActionState(); + agvAction.state = model.state; + agvAction.task_no = model.task_no; + agvAction.ext_data = model.ext_data; + agvAction.forklift_no = model.forklift_no; + if (TaskHelper.CreateAgvActionState(agvAction)) + { + LogHelper.Info("娣诲姞agv鍔ㄤ綔缂撳瓨鎴愬姛淇℃伅" + JsonConvert.SerializeObject(agvAction), "agv鍔ㄤ綔缂撳瓨"); + } + else { + LogHelper.Info("娣诲姞agv鍔ㄤ綔缂撳瓨澶辫触淇℃伅" + JsonConvert.SerializeObject(agvAction), "agv鍔ㄤ綔缂撳瓨"); + } + + } + + + + /// <summary> -- Gitblit v1.9.1