From 61ece19b5b178d1b23bed16c733b01af1185f838 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期日, 20 七月 2025 23:11:43 +0800
Subject: [PATCH] 0720

---
 process/TaskProcess.cs |  415 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 249 insertions(+), 166 deletions(-)

diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index c2088d3..89acc60 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -560,7 +560,7 @@
                         }
 
                         //鎺ラ┏浣嶄袱涓猘gv浠诲姟锛宎浠诲姟鍙栬揣瀹屾垚 鎺ㄩ�b浠诲姟
-                        var agvTask = LocationHelper.GetConnectionTask(wmsWork.CONNECTION,"agv");
+                        var agvTask = LocationHelper.GetConnectionTask(wmsWork.CONNECTION,"agv", mst.T_CREATE);
 
                         LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽綋鍓嶆帴椹充綅{wmsWork.CONNECTION}锛岀涓�釜agv浠诲姟淇℃伅"+JsonConvert.SerializeObject(agvTask), "NDC");
                         //if (agvTask==null)
@@ -990,105 +990,182 @@
                 return result;
             }
 
+            if (string.IsNullOrEmpty(model.task_no))
+            {
+                result.errMsg = "task_no涓簄ull";
+                result.errCode = 1;
+                result.success = false;
+                return result;
+            }
+
+
             try
             {
                 var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
 
                 var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no, "wcs");
 
-                if (task != null)
+                var work = TaskHelper.GetWmsWork(model.task_no);
+
+                if (work==null)
                 {
-                    LogHelper.Info($"cancelTask1鍙栨秷agv浠诲姟{task.S_CODE}锛�, "鍙栨秷");
-                    if (task.S_B_STATE.Trim() == "鏈墽琛�)
+                    result.errCode = 1;
+                    result.errMsg = $"{model.task_no}浣滀笟涓嶅瓨鍦紝涓嶅厑璁稿彇娑�;
+                    result.success = false;
+                    return result;
+                }
+
+                //浣滀笟娌℃湁鎺ラ┏浣嶏紝涓�浠诲姟鍙栨秷
+                if (string.IsNullOrEmpty(work.CONNECTION)) {
+                    if (task != null)
                     {
-                        //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
-                        TaskHelper.opMesTask(task, 3);
-                        TaskHelper.Fail(task);
-                        TaskProcess.CacheBitCancelUpdate(task);
-                        
-                        if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
+                        if (task.S_TYPE.Contains("鍑哄簱"))
                         {
-                            ContainerHelper.delCntr(task.S_CNTR_CODE);
-                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
-
+                            
                         }
-                        result.errCode = 0;
-                        result.errMsg = "鍙栨秷鎴愬姛";
-                        result.success = true;
-                    }
-                    else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触" && task.S_B_STATE.Trim() != "瀹屾垚")
-                    {
-                        var db = new SqlHelper<object>().GetInstance();
-                        var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "4").First();
+                        else {
+                            if (task.S_B_STATE.Trim() == "鏈墽琛�)
+                            {
+                                //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
+                                TaskHelper.opMesTask(task, 3);
+                                TaskHelper.Fail(task);
+                                TaskProcess.CacheBitCancelUpdate(task);
 
+                                ContainerHelper.delCntr(task.S_CNTR_CODE);
+                                ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+                                
+                                result.errCode = 0;
+                                result.errMsg = "鍙栨秷鎴愬姛";
+                                result.success = true;
+                            }
+                            else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触" && task.S_B_STATE.Trim() != "瀹屾垚")
+                            {
+                                var db = new SqlHelper<object>().GetInstance();
+                                var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "4").First();
 
-                        if (qhflag != null)
-                        {
-                            LogHelper.Info($"璇ヤ换鍔task.S_CODE}宸茬粡鍙栬揣瀹屾垚", "鍙栨秷");
-                            result.errCode = 1;
-                            result.errMsg = "浠诲姟宸茬粡鍙栬揣瀹屾垚锛屼笉鍏佽鍙栨秷";
-                            result.success = false;
-                            return result;
+                                if (qhflag != null)
+                                {
+                                    LogHelper.Info($"璇ヤ换鍔task.S_CODE}宸茬粡鍙栬揣瀹屾垚", "鍙栨秷");
+                                    result.errCode = 1;
+                                    result.errMsg = "浠诲姟宸茬粡鍙栬揣瀹屾垚锛屼笉鍏佽鍙栨秷";
+                                    result.success = false;
+                                    return result;
+                                }
+                                  ContainerHelper.delCntr(task.S_CNTR_CODE);
+                                  ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+                                  ContainerHelper.delCntrLoc(task.S_CNTR_CODE);
+                                
+
+                                TaskHelper.opMesTask(task, 3);
+                                //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
+                                TaskHelper.Fail(task);
+
+                                NDCApi.CancelOrder(task.S_CODE.Trim());
+                                TaskProcess.CacheBitCancelUpdate(task);
+
+                                result.errCode = 0;
+                                result.errMsg = "鍙栨秷鎴愬姛";
+                                result.success = true;
+                            }
+                            else
+                            {
+                                result.errCode = 1;
+                                result.errMsg = "浠诲姟宸茬粡缁撴潫";
+                                result.success = false;
+                            }
                         }
-                        if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
-                        {
-                            ContainerHelper.delCntr(task.S_CNTR_CODE);
-                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
-                            ContainerHelper.delCntrLoc(task.S_CNTR_CODE);
-                        }
-
-                        TaskHelper.opMesTask(task, 3);
-                        //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
-                        TaskHelper.Fail(task);
-
-                        NDCApi.CancelOrder(task.S_CODE.Trim());
-                        TaskProcess.CacheBitCancelUpdate(task);
-
-                        result.errCode = 0;
-                        result.errMsg = "鍙栨秷鎴愬姛";
-                        result.success = true;
+                        LogHelper.Info($"cancelTask1鍙栨秷agv浠诲姟{task.S_CODE}锛�, "鍙栨秷");
                     }
                     else
                     {
                         result.errCode = 1;
-                        result.errMsg = "浠诲姟宸茬粡缁撴潫";
+                        result.errMsg = $"{model.task_no},Agv浠诲姟涓嶅瓨鍦�;
                         result.success = false;
                     }
-                }
-                else
+                }else
                 {
-                    result.errCode = 1;
-                    result.errMsg = $"{model.task_no}浠诲姟涓嶅瓨鍦�;
-                    result.success = false;
-                }
+                    //浜屾浠诲姟鍙栨秷
 
-                if (wcsTask != null)
-                {
-                    LogHelper.Info($"cancelTask1鍙栨秷Wcs浠诲姟{wcsTask.S_CODE}", "鍙栨秷");
-                    if (wcsTask.S_B_STATE.Trim() == "鏈墽琛�)
+                    if (task.S_TYPE.Contains("鍑哄簱"))
                     {
-                        //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
-                        if (wcsTask.S_TYPE.Contains("鍏ュ簱") || wcsTask.S_TYPE.Contains("鍥炲簱"))
+                        if (wcsTask != null)
                         {
-                            ContainerHelper.delCntr(wcsTask.S_CNTR_CODE);
-                            ContainerHelper.delCntrItem(wcsTask.S_CNTR_CODE);
+                            LogHelper.Info($"cancelTask1鍙栨秷Wcs浠诲姟{wcsTask.S_CODE}", "鍙栨秷");
+                            if (wcsTask.S_B_STATE.Trim() == "鏈墽琛� && task.S_B_STATE.Trim() == "鏈墽琛�)
+                            {
+                                //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
+                                TaskHelper.opMesTask(task, 3);
+                                TaskHelper.Fail(task);
+                                TaskProcess.OperateStatus(task,7);
+                                TaskHelper.Fail(wcsTask);
+                                TaskProcess.OperateStatus(wcsTask, 7);
+                                result.errCode = 0;
+                                result.errMsg = "鍙栨秷鎴愬姛";
+                                result.success = true;
+                                return result;
+                            }
+                            else
+                            {
+                                LogHelper.Info($"璇ヤ换鍔wcsTask.S_CODE}宸茬粡鎺ㄩ�", "鍙栨秷");
+                                result.errCode = 1;
+                                result.errMsg = "浠诲姟宸茬粡鎺ㄩ�锛屼笉鍏佽鍙栨秷";
+                                result.success = false;
+                                return result;
+                            }
                         }
-                        TaskHelper.Fail(wcsTask);
-                        TaskProcess.OperateStatus(wcsTask, 7);
-                        result.errCode = 0;
-                        result.errMsg = "鍙栨秷鎴愬姛";
-                        result.success = true;
-                        return result;
                     }
-                    else 
+                    else
                     {
-                            LogHelper.Info($"璇ヤ换鍔wcsTask.S_CODE}宸茬粡鎺ㄩ�", "鍙栨秷");
+                        if (task.S_B_STATE.Trim() == "鏈墽琛�)
+                        {
+                            //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
+                            TaskHelper.opMesTask(task, 3);
+                            TaskHelper.Fail(task);
+                            TaskProcess.CacheBitCancelUpdate(task);
+
+                            ContainerHelper.delCntr(task.S_CNTR_CODE);
+                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+
+                            result.errCode = 0;
+                            result.errMsg = "鍙栨秷鎴愬姛";
+                            result.success = true;
+                        }
+                        else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触" && task.S_B_STATE.Trim() != "瀹屾垚")
+                        {
+                            var db = new SqlHelper<object>().GetInstance();
+                            var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "4").First();
+
+                            if (qhflag != null)
+                            {
+                                LogHelper.Info($"璇ヤ换鍔task.S_CODE}宸茬粡鍙栬揣瀹屾垚", "鍙栨秷");
+                                result.errCode = 1;
+                                result.errMsg = "浠诲姟宸茬粡鍙栬揣瀹屾垚锛屼笉鍏佽鍙栨秷";
+                                result.success = false;
+                                return result;
+                            }
+                            ContainerHelper.delCntr(task.S_CNTR_CODE);
+                            ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+                            ContainerHelper.delCntrLoc(task.S_CNTR_CODE);
+
+
+                            TaskHelper.opMesTask(task, 3);
+                            //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
+                            TaskHelper.Fail(task);
+
+                            NDCApi.CancelOrder(task.S_CODE.Trim());
+                            TaskProcess.CacheBitCancelUpdate(task);
+
+                            result.errCode = 0;
+                            result.errMsg = "鍙栨秷鎴愬姛";
+                            result.success = true;
+                        }
+                        else
+                        {
                             result.errCode = 1;
-                            result.errMsg = "浠诲姟宸茬粡鎺ㄩ�锛屼笉鍏佽鍙栨秷";
+                            result.errMsg = "浠诲姟宸茬粡缁撴潫";
                             result.success = false;
-                            return result;
-                       
-                    }
+                        }
+                    }      
                 }
             }
             catch (Exception ex)
@@ -1726,6 +1803,12 @@
                     throw new Exception("缂哄皯鍙傛暟task_no");
                 }
 
+                var work = TaskHelper.GetWmsWork(model.task_no);
+                if (work != null)
+                {
+                    throw new Exception($"浠诲姟{model.task_no}宸茬粡鍒涘缓浣滀笟锛岃鍕块噸澶嶇敵璇�);
+                }
+
 
                 //var wmsWork = TaskHelper.GetTaskByCntrCode(model.TOOLS_NO);
 
@@ -1843,112 +1926,112 @@
                     {
 
                         //姝e紡浠g爜锛岃皟鐢ㄦ帴鍙e鎵惧彲鐢ㄦ帴椹充綅
-                        //var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
-                        //var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
-                        //if (usableConnectionList != null && usableConnectionList.code == "0")
-                        //{
-                        //    var balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
-                        //    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍙敤鎺ラ┏浣� + JsonConvert.SerializeObject(balanceConnectionList), "Mes浠诲姟涓嬪彂");
-
-                        //    if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2")
-                        //    {
-                        //        //婊℃墭鍏�-                        //        balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
-
-                        //        if (TOOLSTYPE == "25" || TOOLSTYPE == "35") {
-                        //            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
-                        //            balanceLocList = LocationHelper.RoadWayBalance1ByItem(balanceLocList, model.PROD_NO);
-                        //        }
-
-
-
-                        //    }
-                        //    else if (workFlow.FLOWCODE == "3")
-                        //    {
-                        //        //绌烘墭鍏ョ珛搴撳尯
-                        //        cntrCount = 0;
-                        //        LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
-                        //        balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
-                        //    }
-
-                        //    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘缁堢偣鏁伴噺{balanceLocList.Count}", "Mes浠诲姟涓嬪彂");
-
-                        //    foreach (var item in balanceLocList)
-                        //    {
-                        //        if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM == 0)
-                        //        {
-                        //           // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂item淇℃伅" + JsonConvert.SerializeObject(item), "Mes浠诲姟涓嬪彂");
-                        //            foreach (var item1 in balanceConnectionList)
-                        //            {
-                        //                if (item1.CONNEC_ROADWAY == item.N_ROADWAY)
-                        //                {
-                        //                    connection = item1.S_CODE;
-                        //                    connectionArea = item1.S_AREA_Name;
-                        //                    end = item;
-                        //                    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
-                        //                    break;
-                        //                }
-                        //            }
-                        //            if (end!=null)
-                        //            {
-                        //                LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒扮粓鐐箋end.S_CODE}", "Mes浠诲姟涓嬪彂");
-                        //                break;
-                        //            }
-                        //        }
-                        //    }
-                        //    if (connection == "")
-                        //    {
-                        //        LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂娌℃壘鍒版帴椹充綅", "Mes浠诲姟涓嬪彂");
-                        //        throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂娌℃壘鍒版帴椹充綅");
-                        //    }
-                        //}
-                        //else
-                        //{
-                        //    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶆帴鍙eけ璐�, "Mes浠诲姟涓嬪彂");
-                        //    throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶆帴鍙eけ璐�);
-                        //}
-
-
-                        if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2" || workFlow.FLOWCODE == "5" || workFlow.FLOWCODE == "8" || workFlow.FLOWCODE == "11")
+                        var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
+                        var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
+                        if (usableConnectionList != null && usableConnectionList.code == "0")
                         {
-                            //婊℃墭鍏�+                            var balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
+                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍙敤鎺ラ┏浣� + JsonConvert.SerializeObject(balanceConnectionList), "Mes浠诲姟涓嬪彂");
 
-                            if (TOOLSTYPE == "25" || TOOLSTYPE == "35")
+                            if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2" || workFlow.FLOWCODE == "5" || workFlow.FLOWCODE == "8" || workFlow.FLOWCODE == "11")
                             {
-                                LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
-                                end = LocationHelper.FindBalanceEndcolByLocListItem(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no, model.PROD_NO);
+                                //婊℃墭鍏�+                                if (TOOLSTYPE == "25" || TOOLSTYPE == "35")
+                                {
+                                    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
+                                    balanceLocList = LocationHelper.RoadWayBalance1ByItem(balanceLocList, model.PROD_NO);
+                                }
+                                else {
+                                    balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+                                }
 
                             }
-                            else {
-                                end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no);
+                            else if (workFlow.FLOWCODE == "3" || workFlow.FLOWCODE == "10")
+                            {
+                                //绌烘墭鍏ョ珛搴撳尯
+                                cntrCount = 0;
+                                LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
+                                balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                             }
 
+                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘缁堢偣鏁伴噺{balanceLocList.Count}", "Mes浠诲姟涓嬪彂");
+
+                            foreach (var item in balanceLocList)
+                            {
+                                if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM == 0)
+                                {
+                                    // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂item淇℃伅" + JsonConvert.SerializeObject(item), "Mes浠诲姟涓嬪彂");
+                                    foreach (var item1 in balanceConnectionList)
+                                    {
+                                        if (item1.CONNEC_ROADWAY == item.N_ROADWAY)
+                                        {
+                                            connection = item1.S_CODE;
+                                            connectionArea = item1.S_AREA_Name;
+                                            end = item;
+                                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
+                                            break;
+                                        }
+                                    }
+                                    if (end != null)
+                                    {
+                                        LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒扮粓鐐箋end.S_CODE}", "Mes浠诲姟涓嬪彂");
+                                        break;
+                                    }
+                                }
+                            }
+                            if (connection == "")
+                            {
+                                   LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{model.task_no}涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐瑰贩閬撴垨鎺ラ┏浣嶄笉鍙敤", "Mes浠诲姟涓嬪彂");
+                                   throw new Exception($"{model.task_no}涓嬪彂澶辫触缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�宸烽亾鎴栨帴椹充綅涓嶅彲鐢�);
+                            }
                         }
-                        else if (workFlow.FLOWCODE == "3" || workFlow.FLOWCODE == "10")
+                        else
                         {
-                            //绌烘墭鍏ョ珛搴撳尯
-                            cntrCount = 0;
-                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
-                            end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no);
-                        }
-
-                        if (end == null)
-                        {
-                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{model.task_no}涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐瑰贩閬撴垨鎺ラ┏浣嶄笉鍙敤", "Mes浠诲姟涓嬪彂");
-                            throw new Exception($"{model.task_no}涓嬪彂澶辫触缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�宸烽亾鎴栨帴椹充綅涓嶅彲鐢�);
-                        }
-
-                        var jb = LocationHelper.GetConnectionByEnd(workFlow.CONNECTION, end.N_ROADWAY);
-
-                        if (jb==null)
-                        {
-                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂搴撳尯{workFlow.CONNECTION}锛屽贩閬搟end.N_ROADWAY},娌℃壘鍒版帴椹充綅", "Mes浠诲姟涓嬪彂");
-                            throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂搴撳尯{workFlow.CONNECTION}锛屽贩閬搟end.N_ROADWAY},娌℃壘鍒版帴椹充綅");
+                            LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶆帴鍙eけ璐�, "Mes浠诲姟涓嬪彂");
+                            throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶆帴鍙eけ璐�);
                         }
 
 
-                        connection = jb.S_CODE;
-                        connectionArea = jb.S_AREA_Name;
+                        //if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2" || workFlow.FLOWCODE == "5" || workFlow.FLOWCODE == "8" || workFlow.FLOWCODE == "11")
+                        //{
+                        //    //婊℃墭鍏�+
+                        //    if (TOOLSTYPE == "25" || TOOLSTYPE == "35")
+                        //    {
+                        //        LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
+                        //        end = LocationHelper.FindBalanceEndcolByLocListItem(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no, model.PROD_NO);
+
+                        //    }
+                        //    else {
+                        //        end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no);
+                        //    }
+
+                        //}
+                        //else if (workFlow.FLOWCODE == "3" || workFlow.FLOWCODE == "10")
+                        //{
+                        //    //绌烘墭鍏ョ珛搴撳尯
+                        //    cntrCount = 0;
+                        //    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
+                        //    end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no);
+                        //}
+
+                        //if (end == null)
+                        //{
+                        //    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{model.task_no}涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐瑰贩閬撴垨鎺ラ┏浣嶄笉鍙敤", "Mes浠诲姟涓嬪彂");
+                        //    throw new Exception($"{model.task_no}涓嬪彂澶辫触缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�宸烽亾鎴栨帴椹充綅涓嶅彲鐢�);
+                        //}
+
+                        //var jb = LocationHelper.GetConnectionByEnd(workFlow.CONNECTION, end.N_ROADWAY);
+
+                        //if (jb==null)
+                        //{
+                        //    LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂搴撳尯{workFlow.CONNECTION}锛屽贩閬搟end.N_ROADWAY},娌℃壘鍒版帴椹充綅", "Mes浠诲姟涓嬪彂");
+                        //    throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂搴撳尯{workFlow.CONNECTION}锛屽贩閬搟end.N_ROADWAY},娌℃壘鍒版帴椹充綅");
+                        //}
+
+
+                        //connection = jb.S_CODE;
+                        //connectionArea = jb.S_AREA_Name;
 
 
                     }

--
Gitblit v1.9.1