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 |  186 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 168 insertions(+), 18 deletions(-)

diff --git a/core/Monitor.cs b/core/Monitor.cs
index d2d9a78..b4573f0 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -88,23 +88,33 @@
         public static void UpdateOutTaskPriority()
         {
             var db = new SqlHelper<object>().GetInstance();
-            var st = Settings.outMinutePriority;
+            //var st = Settings.outMinutePriority;
+
+            var st = TaskHelper.GetOutMinutePriority();
+
+            if (st==null)
+            {
+                return;
+            }
+
             var list = TaskHelper.GetWcsTaskListByState("鎵ц", "agv", "鍑哄簱");
 
             foreach (var item in list)
             {
-                var action = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE==item.S_CODE && p.N_ACTION_CODE == 1).First();
-                if (action != null)
-                {
-                    var action3 = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 3).First();
-                    if (action3 == null)
+                var wcsTask = TaskHelper.GetTaskByState("瀹屾垚", "wcs", item.S_OP_CODE, "鍑哄簱");
+                if (wcsTask != null) {
+                    var action = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 1).First();
+                    if (action != null)
                     {
-                        if (DateTime.Now.Subtract(action.T_CREATE).TotalMinutes > st.Minute)
+                        var action3 = db.Queryable<WmsTaskAction>().Where(p => p.S_TASK_CODE == item.S_CODE && p.N_ACTION_CODE == 3).First();
+                        if (action3 == null)
                         {
-                            item.N_PRIORITY += st.Priority;
-                            db.Updateable(item).UpdateColumns(it => new { it.N_PRIORITY }).ExecuteCommand();
-                            NDCApi.ChangeOrderPri(item.S_CODE, item.N_PRIORITY);
-
+                            if (DateTime.Now.Subtract(action.T_CREATE).TotalMinutes > st.Minute)
+                            {
+                                item.N_PRIORITY += st.Priority;
+                                db.Updateable(item).UpdateColumns(it => new { it.N_PRIORITY }).ExecuteCommand();
+                                NDCApi.ChangeOrderPri(item.S_CODE, item.N_PRIORITY);
+                            }
                         }
                     }
                 }
@@ -112,6 +122,138 @@
             int sp = st.Minute * 60000;
             Thread.Sleep(sp);
         }
+
+        private static object locker1 = new object();
+
+
+        /// <summary>
+        /// agv鍔ㄤ綔缂撳瓨澶勭悊
+        /// </summary>
+        /// <param name="model"></param>
+        public static void agvActionManage()
+        {
+
+            var db = new SqlHelper<object>().GetInstance();
+
+
+            try
+            {
+                lock (locker1)
+                {
+                    var operations = db.Queryable<AgvActionState>().OrderBy(a => a.T_CREATE).ToList().Take(50);
+                    foreach (var model in operations)
+                    {
+                        var wmsTask = TaskHelper.GetTask(model.task_no);
+                        LogHelper.Info("agvActionManage--浠诲姟淇℃伅" + JsonConvert.SerializeObject(wmsTask), "agv鍔ㄤ綔缂撳瓨");
+                        LogHelper.Info("agvActionManage--鍙傛暟淇℃伅" + JsonConvert.SerializeObject(model), "agv鍔ㄤ綔缂撳瓨");
+                        if (wmsTask != null)
+                        {
+                            if (model.state <= 7)
+                            {
+                                //鏈変换鍔″彿璇锋眰
+                                switch (model.state)
+                                {
+                                    case 1:
+                                        TaskHelper.opMesTask(wmsTask, 1);
+                                        TaskHelper.Begin(wmsTask, model.forklift_no);
+                                        //鑳庨潰浜や簰
+                                        TaskHelper.TmSafety(wmsTask);
+                                        break;
+                                    case 3:
+                                        TaskHelper.UpdateStatus(wmsTask, "寮�鍙栬揣");
+                                        break;
+                                    case 4:
+                                        TaskHelper.UpdateStatus(wmsTask, "鍙栬揣瀹屾垚");
+                                        LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
+                                        TaskProcess.OperateStatus(wmsTask, 4);
+                                        break;
+                                    case 5:
+                                        TaskHelper.UpdateStatus(wmsTask, "寮�鍗歌揣");
+                                        break;
+                                    case 6:
+                                        TaskHelper.UpdateStatus(wmsTask, "鍗歌揣瀹屾垚");
+                                        LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
+                                        TaskProcess.OperateStatus(wmsTask, 6);
+
+                                        //濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
+                                        var wcsTask = TaskHelper.GetTaskByState("鏈墽琛�, "wcs", wmsTask.S_OP_CODE, "鍏ュ簱");
+                                        if (wcsTask != null)
+                                        {
+                                            LocationHelper.LockLoc(wcsTask.S_START_LOC, "鍑哄簱閿�, 2);
+                                            WcsTask.WcsTaskEntity(wcsTask);
+                                        }
+                                        break;
+                                    case 2:
+                                        //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇
+
+                                        LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
+                                        TaskProcess.inPri(wmsTask);
+                                        TaskHelper.End(wmsTask);
+                                       
+                                        break;
+                                    case 7:
+                                        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鍙栨秷  
+                                                WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
+                                                TaskHelper.Fail(wcsTask1);
+                                                TaskProcess.OperateStatus(wcsTask1, 7);
+                                            }
+                                        
+
+                                        TaskHelper.Fail(wmsTask);
+                                        TaskProcess.OperateStatus(wmsTask, 7);
+                                        //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
+                                        if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱"))
+                                        {
+                                            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);
+                                            }
+                                        }
+                                        
+                                      
+                                       
+                                        break;
+
+                                }
+                                TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
+                            }
+                            else
+                            {
+                                //瀹夊叏璇锋眰绛�+                                TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
+                            }
+                            db.Deleteable(model).ExecuteCommand();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Info("agvActionManage--寮傚父淇℃伅" + ex.Message, "agv鍔ㄤ綔缂撳瓨");
+                throw;
+            }
+
+        }
+
+
+          
+            
+
 
 
 
@@ -177,8 +319,8 @@
 
 
 
-                        //鏌ユ壘璧风偣
-                        List<Location> strrtList;
+                            //鏌ユ壘璧风偣
+                            List<Location> strrtList;
 
                         Location start = null;
 
@@ -206,23 +348,26 @@
                             LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂澶辫触锛岃捣鐐瑰簱鍖簕workFlow.STARTAREA},娌℃壘鍒拌捣鐐�, "绌烘墭鍑哄簱");
                             continue;
                         }
+                        if (start.S_LOCK_STATE!="鏃�)
+                        {
+                            LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂澶辫触锛岃捣鐐箋start.S_CODE}鏈夐攣", "绌烘墭鍑哄簱");
+                            continue;
+                        }
 
-                       
 
 
                         //鑾峰彇鎵樼洏鐮�                         var cntrCode = LocationHelper.GetLocCntrCode(start.S_CODE);
 
                         if (workFlow.SENDWCS == "Y")
-                        {
-
+                        {   
                             //姝e紡浠g爜锛岃皟鐢ㄦ帴鍙e鎵惧彲鐢ㄦ帴椹充綅
                             var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
 
                             var balanceConnectionList = LocationHelper.GetBalanceConnectionList(connectionList);
                             foreach (var item in balanceConnectionList)
                             {
-                                if (item.loc.N_CURRENT_NUM < 2)
+                                if (item.loc.N_CURRENT_NUM < 2 && item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
                                 {
                                     connection = item.loc.S_CODE;
                                     connectionArea = item.loc.S_AREA_Name;
@@ -245,6 +390,12 @@
                             LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂澶辫触锛岃捣鐐箋start.S_CODE}鏈夋墽琛屼腑浠诲姟{startTask.S_CODE}", "绌烘墭鍑哄簱");
                             continue;
                         }
+
+
+
+                        LocationHelper.LockLoc(start.S_CODE, "鍑哄簱閿�, 2);
+                      
+
 
                         //璧风偣缁堢偣鏌ユ壘鎴愬姛锛屽垱寤轰綔涓� 
@@ -301,7 +452,6 @@
             }
             catch (Exception ex)
             {
-
                 LogHelper.Info($"绌烘墭鍑哄簱寮傚父淇℃伅" + ex.Message, "绌烘墭鍑哄簱");
             }
         }

--
Gitblit v1.9.1