From b67787b031e357c60565d3e1aa8b829706e520e2 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 11 七月 2025 17:30:56 +0800
Subject: [PATCH] Mes接口修改

---
 core/Monitor.cs |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/core/Monitor.cs b/core/Monitor.cs
index b46a4a7..b4573f0 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -154,10 +154,10 @@
                                 switch (model.state)
                                 {
                                     case 1:
+                                        TaskHelper.opMesTask(wmsTask, 1);
                                         TaskHelper.Begin(wmsTask, model.forklift_no);
                                         //鑳庨潰浜や簰
                                         TaskHelper.TmSafety(wmsTask);
-                                        TaskHelper.opMesTask(wmsTask,1);
                                         break;
                                     case 3:
                                         TaskHelper.UpdateStatus(wmsTask, "寮�鍙栬揣");
@@ -189,10 +189,14 @@
                                         LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
                                         TaskProcess.inPri(wmsTask);
                                         TaskHelper.End(wmsTask);
-                                        TaskHelper.opMesTask(wmsTask, 2);
+                                       
                                         break;
                                     case 7:
-                                            var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+                                        if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
+                                            TaskHelper.opMesTask(wmsTask, 3);
+                                        }
+                                            
+                                        var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
                                             if (wcsTask1 != null)
                                             {
                                                 //agv鎵ц閫氱煡 wcs鍙栨秷  
@@ -210,16 +214,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);
+                                        else {
+                                            //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙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);
+                                            }
                                         }
-                                        TaskHelper.opMesTask(wmsTask, 3);
+                                        
+                                      
+                                       
                                         break;
 
                                 }

--
Gitblit v1.9.1