From 969aafa8bd335025da4caf5939a1626bad4f4236 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 19 六月 2025 16:54:03 +0800
Subject: [PATCH] Merge branch 'csc'

---
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs |  439 ++++++++++++++++++++++--------------------------------
 1 files changed, 180 insertions(+), 259 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index e6932f9..fa54401 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -9,6 +9,7 @@
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
 using OnceMi.AspNetCore.OSS;
+using Qiniu.Storage;
 using System;
 using System.Drawing.Drawing2D;
 using System.Net.NetworkInformation;
@@ -52,6 +53,7 @@
 
     private static List<ModbusUtil> listModbusUtil = new List<ModbusUtil>();
 
+
     public static List<ModbusUtil> modbusUtilConn
     {
         get { return listModbusUtil; }
@@ -86,11 +88,12 @@
         boDrumReversal = _sysConfigService.GetConfigValue<bool>("sys_DrumReversal").Result;
         boOutLock = _sysConfigService.GetConfigValue<bool>("sys_BoOutLock").Result;
         boEnterLock = _sysConfigService.GetConfigValue<bool>("sys_BoEnterLock").Result;
+        
     }
     /// <summary>
     /// 鍒濆鍖朠LC杩炴帴
     /// </summary>
-    public static void Init()
+    public static void Init() 
     {
         cts.Cancel();
         listPlc = _db.Queryable<WcsPlc>()
@@ -143,7 +146,7 @@
             StartRead();
             ConnectionStatus();
             StartWatchAlarm();
-            //AssignTasks();
+            AssignTasks();
             //StartWatchPosition();
         }
     }
@@ -209,15 +212,6 @@
                                         var (result, value) = modPlcUtil.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
                                         if (result.IsSucceed)
                                         {
-                                            //濡傛灉鏄┛姊溅锛岃繖閲屽彂閫佸績璺�
-                                            if (modPlc.Type == PLCTypeEnum.ShuttleCar)
-                                            {
-                                                var modHeart = listPlcPosition.Where(s => s.DeviceId == modDevice.Id && s.Text == "蹇冭烦").FirstOrDefault();
-                                                if (modHeart != null)
-                                                {
-                                                    modPlcUtil.SetPlcDBValue(modHeart.PosType, modHeart.PlcPos, "1");
-                                                }
-                                            }
                                             //鏃犳祦绋嬭烦鍑�
                                             if (Convert.ToInt32(value) == 0)
                                                 continue;
@@ -265,11 +259,22 @@
                                         var (result, value) = modbusUtil.GetDBValue(modDevice.PosType, modDevice.PlcPos);
                                         if (result.IsSucceed)
                                         {
+                                            //濡傛灉鏄┛姊溅锛岃繖閲屽彂閫佸績璺�
+                                            if (modPlc.Type == PLCTypeEnum.ShuttleCar)
+                                            {
+                                                var modHeart = listPlcPosition.Where(s => s.DeviceId == modDevice.Id && s.Text == "蹇冭烦").FirstOrDefault();
+                                                if (modHeart != null)
+                                                {
+                                                    modbusUtil.SetDBValue(modHeart.PosType, modHeart.PlcPos, "1");
+                                                }
+                                            }
+
                                             //鏃犳祦绋嬭烦鍑�
                                             if (value == 0)
                                                 continue;
                                             var dto = modDevice.Adapt<WcsDeviceDto>();
                                             dto.Value = value;
+                                            dto.PlcIdIP = modPlc.IP;
                                             dto.Type = _modplc.Type;
                                             dto.modbusUtil = modbusUtil;
                                             dto.listStation = listPlcPosition.Where(s => s.DeviceId == modDevice.Id).ToList();
@@ -327,7 +332,7 @@
 
 
 
-                        Thread.Sleep(1000);
+                        Thread.Sleep(2000);
                     }
                     catch (OperationCanceledException)
                     {
@@ -352,7 +357,7 @@
         {
             while (true)
             {
-                Console.WriteLine("寮�鍚洓鍚戣溅浠诲姟鑷垎閰�");
+                //Console.WriteLine("寮�鍚洓鍚戣溅浠诲姟鑷垎閰�");
                 //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
                 if (cts.Token.IsCancellationRequested)
                 {
@@ -365,13 +370,93 @@
                 }
                 try
                 {
-                    // 鑾峰彇瀵嗛泦搴撴湭鎵ц浠诲姟 鏍规嵁鍒涘缓鏃堕棿鎺掑簭
-                    var waitTask = _db.Queryable<WcsTask>().Where(s => s.IsDelete == false && s.Status == TaskStatusEnum.Wait && s.Type == PLCTypeEnum.ShuttleCar).OrderBy(s => s.CreateTime).First();
 
+                    
+                    // 鑾峰彇瀵嗛泦搴撴湭鎵ц浠诲姟 鏍规嵁鍒涘缓鏃堕棿鎺掑簭
+                    var waitTask = _db.Queryable<WcsTask>().Where(s => s.IsDelete == false && s.Status == TaskStatusEnum.Wait && s.Type == PLCTypeEnum.ShuttleCar).OrderBy(s => new {s.Levels, s.CreateTime}).First();
+                    if (waitTask == null)
+                    {
+                        continue;
+                    }
+                    var starLocate = "";
+                    var endLocate = "";
+                    var taskceng = 0;
                     //01010101: 01鎺� 01鍒� 01灞� 01娣卞害-姝ら」鐩笉鍋氬垽鏂�
-                    var taskpai = int.Parse(waitTask.StartLocate.Substring(4, 2));
-                    var tasklie = int.Parse(waitTask.StartLocate.Substring(4, 2));
-                    var taskceng = int.Parse(waitTask.StartLocate.Substring(4, 2));
+                    
+                    if (waitTask.TaskType == TaskTypeEnum.In )
+                    {
+                        //鍏ュ簱浠诲姟璧峰宸烽亾灏辨槸鍥涘悜杞﹀彇璐у伐浣�
+                        if (string.IsNullOrWhiteSpace(waitTask.StartRoadway) || string.IsNullOrWhiteSpace(waitTask.EndLocate))
+                        {
+                            continue;
+                        }
+                        
+                        taskceng = int.Parse(waitTask.StartRoadway.Substring(4, 2));
+                        starLocate = waitTask.StartRoadway;
+                        endLocate = waitTask.EndLocate;
+                    }
+                    else if (waitTask.TaskType == TaskTypeEnum.Out)
+                    {
+                        //鍑哄簱浠诲姟鐩爣宸烽亾灏辨槸鍥涘悜杞︽斁璐у伐浣�
+                        taskceng = int.Parse(waitTask.StartLocate.Substring(4, 2));
+                        starLocate = waitTask.StartLocate;
+                        endLocate = waitTask.EndRoadway;
+
+                        #region 娣诲姞杈撻�佺嚎涓庝换鍔¢獙璇�
+
+                         
+
+                        var text = "";
+                        var devStation = "";
+                        var ip = "";
+                        var carcon = new carConverModel();
+                        if (carcon.conveyorBei.Keys.Contains(endLocate))
+                        {
+                            text = "杈撻�佺嚎鍖�";
+                            ip = "10.26.254.10";
+                            devStation = carcon.conveyorBei[endLocate];
+                        }
+                        else if (carcon.conveyorNan.Keys.Contains(endLocate))
+                        {
+                            text = "杈撻�佺嚎鍗�";
+                            ip = "10.26.254.11";
+                            devStation = carcon.conveyorNan[endLocate];
+                        }
+                        if (text != "")
+                        {
+                            //var modPlc = PLCTaskAction.plcs.FirstOrDefault(s => s.Text == text);
+                            //var modConn = new PLCUtil(modPlc);
+                            var modConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == ip);
+                            var modDevice = PLCTaskAction.plcDevices.First(s => s.StationNum == devStation);
+                            var (plcResult, palletVal) = modConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos);
+                            if (!plcResult.IsSucceed || Convert.ToInt32(palletVal) != 720)
+                            {
+                                continue;//鏀捐揣宸ヤ綅娌℃湁璇诲彇鎴愬姛鎴栦笉鏄┖闂�
+                            } 
+
+                            var gongwei = carcon.conveyorRuKu[endLocate];
+                            //鍒ゆ柇浠诲姟
+                            var convarTask = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.StartLocate == gongwei
+                            && m.Type == PLCTypeEnum.ConveyorLine && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing));
+                            if (convarTask != null)
+                            {
+                                continue;//鏀捐揣宸ヤ綅鏈変换鍔�
+                            }
+                        }
+
+
+                        #endregion
+                    }
+                    else if (waitTask.TaskType == TaskTypeEnum.Move)
+                    {
+                        taskceng = int.Parse(waitTask.StartLocate.Substring(4, 2));
+                        starLocate = waitTask.StartLocate;
+                        endLocate = waitTask.EndLocate;
+                    }
+                    else 
+                    {
+                        continue;
+                    }
 
                     #region 鑾峰彇褰撳墠浠诲姟鎵�鍦ㄥ眰鎵�鏈夌┖闂插皬杞�
 
@@ -380,6 +465,7 @@
 
                     // 鑾峰彇褰撳墠浠诲姟鎵�鍦ㄥ眰鎵�鏈夌┖闂插皬杞︼紙鏍规嵁灏忚溅浠诲姟琛ㄦ槸鍚︽湁浠诲姟鍜屽皬杞︾姸鎬佸叡鍚屽垽鏂皬杞︽槸鍚︾┖闂�)
                     var kXCarList = new List<CarInfo>();
+                    var carErr = false;//灏忚溅鏄惁鏈夊け鑱旂殑
                     foreach (var modbusUtil in listModbusUtil)
                     {
                         //濡傛灉灏忚溅鏈夋湭鎵ц鐨勪换鍔★紝璺冲嚭
@@ -397,6 +483,31 @@
                             {
                                 //鑾峰彇宸ヤ綅WCSPLCPosition淇℃伅
                                 var plcPosition = listPlcPosition.Where(s => s.DeviceId == modDevice.Id).ToList();
+                                if (value == 3)
+                                {
+                                    var modCarDl = plcPosition.FirstOrDefault(s => s.Text == "鐢垫睜鐢甸噺");
+                                    var (resultDl, valueDl) = modbusUtil.GetDBValue(modCarDl.PosType, modCarDl.PlcPos);
+                                    if (resultDl.IsSucceed && valueDl> (int)FourWayCarDLEnum.Dl) 
+                                    {
+                                        //鍐欏叆缁撴潫鍏呯數鍛戒护
+                                        var modCdEnd = plcPosition.FirstOrDefault(s => s.Text == "鍏呯數鍛戒护");
+                                        var resultDl22 = modbusUtil.SetDBValue(modCdEnd.PosType, modCdEnd.PlcPos.ToString(), "3") ;
+                                        carErr = true;
+                                        break; //鏆傜紦鍒嗛厤锛岄槻姝㈠悓灞傚皬杞﹀叧鏈烘垨澶辫仈瀵艰嚧闃绘尅璺緞
+                                    }
+                                }
+                                var modCarPall = plcPosition.FirstOrDefault(s => s.Text == "鎵樼洏妫�娴�");
+                                var (resultPall, valuePall) = modbusUtil.GetDBValue(modCarPall.PosType, modCarPall.PlcPos);
+                                //var modCarju = plcPosition.FirstOrDefault(s => s.Text == "涓惧崌浣嶇疆");
+                                //var (resultju, valueju) = modbusUtil.GetDBValue(modCarju.PosType, modCarju.PlcPos);
+                                //if (resultPall.IsSucceed && valuePall == 1  && resultPall.IsSucceed && valuePall != 1)  //1椤惰揣 2瀛愰�氶亾  3涓婚�氶亾
+                                //{
+                                //    break; //鏆傜紦鍒嗛厤 
+                                //}
+                                if (resultPall.IsSucceed && valuePall == 1)  //1鏈夋墭鐩� 2鏃犳墭鐩�
+                                {
+                                    break; //鏆傜紦鍒嗛厤 
+                                }
                                 //灏忚溅绌洪棽鍔犲叆闆嗗悎
                                 if (value == 1)
                                 {
@@ -414,7 +525,8 @@
                                         if (!kXCarList.Any(m => m.CarPlcIp == modbusUtil.PlcIP))
                                         {
                                             var carVal = ((int)valuex).ToString().PadLeft(2, '0') + ((int)valuey).ToString().PadLeft(2, '0') + ((int)valuez).ToString().PadLeft(2, '0');
-                                            var d = FourWayCarUtil.GetCarPath(carVal, waitTask.StartLocate, 0);
+                                            //灏忚溅鍒板彇璐у偍浣嶈矾寰�  
+                                            var d = FourWayCarUtil.GetCarPath(carVal, starLocate);
                                             kXCarList.Add(new CarInfo()
                                             {
                                                 CarPlcIp = modbusUtil.PlcIP,
@@ -430,270 +542,79 @@
                             else
                             {
                                 Console.WriteLine($"璇诲彇鍥涘悜杞modbusUtil.PlcIP}鐘舵�佸け璐�");
-                                return;//鏈変竴涓皬杞﹁鍙栧け璐ヨ烦鍑烘柟娉曪紝鏆傜紦鍒嗛厤锛岄槻姝㈠悓灞傚皬杞﹀叧鏈烘垨澶辫仈瀵艰嚧闃绘尅璺緞
+                                carErr = true;
+                                break;//鏈変竴涓皬杞﹁鍙栧け璐ヨ烦鍑烘柟娉曪紝鏆傜紦鍒嗛厤锛岄槻姝㈠悓灞傚皬杞﹀叧鏈烘垨澶辫仈瀵艰嚧闃绘尅璺緞
                             }
+                        }
+                        //鏈夊皬杞﹀け鑱旓紝涓嶅垎閰嶄换鍔�
+                        if (carErr)
+                        {
+                            kXCarList.Clear();//娓呮绌鸿溅璁板綍
+                            break;
                         }
                     }
 
                     #endregion
 
-                    #region 鑾峰彇閫傚悎鎵ц褰撳墠浠诲姟鐨勫皬杞� 鐢熸垚璺緞锛堥渶鑰冭檻灏忚溅闃婚樆鎸★級
 
+                    // 鑾峰彇閫傚悎鎵ц褰撳墠浠诲姟鐨勫皬杞� 鐢熸垚璺緞锛堥渶鑰冭檻灏忚溅闃婚樆鎸★級
                     var assignCar = kXCarList.OrderBy(m => m.Level).FirstOrDefault();
                     if (assignCar == null)
                     {
-                        break;//娌℃湁绌洪棽灏忚溅
+                        continue;//娌℃湁绌洪棽灏忚溅
                     }
-                    var data = new List<CarModel>();
-                    if (assignCar.Level != 0)
+                    
+                    if (assignCar.Level != 1)
                     {
                         //鍒ゆ柇灏忚溅浣嶇疆鏄惁涓庝换鍔$殑璧峰鍌ㄤ綅鐩稿悓,涓嶇浉鍚岋細鑾峰彇灏忚溅鍒板彇璐у偍浣嶈矾寰�
                         var carLocate = assignCar.X.ToString().PadLeft(2, '0')+assignCar.Y.ToString().PadLeft(2, '0')+ assignCar.Z.ToString().PadLeft(2, '0');
                         //鑾峰彇灏忚溅鍘诲彇璐у偍浣嶄换鍔¤矾寰�
-                        var data1 = FourWayCarUtil.GetCarPath(carLocate, waitTask.StartLocate, 0);
-                        data.AddRange(data1);
+                        var data1 = FourWayCarUtil.GetCarPath(carLocate, starLocate);
+                        var datas1 = FourWayCarUtil.GetCarPathUp(data1, 0);
+                        if (datas1 == null)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            var bl = FourWayCarUtil.AddCarTask(datas1, kXCarList, assignCar, waitTask,0);
+                            //鍒嗛厤閿欒锛屽垹闄ゅ垎閰嶄俊鎭�
+                            if (!bl)
+                            {
+                                var carTask = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && m.TaskNo == waitTask.TaskNo).ToList();
+                                _db.Deleteable(carTask).ExecuteCommand();
+                            }
+                        }
+                    }
+                    var typeStr = "1";
+                    var typeStr2 = 1;
+                    if (waitTask.Levels  == 888 )
+                    {
+                        typeStr = "0";//灏忚溅浠诲姟鏄厖鐢典换鍔�
+                        typeStr2 = 0;
                     }
                     //鑾峰彇灏忚溅鍘绘斁璐у偍浣嶄换鍔¤矾寰�
-                    var data2 = FourWayCarUtil.GetCarPath(waitTask.StartLocate, waitTask.EndLocate, 2, "1");
+                    var data2 = FourWayCarUtil.GetCarPath(starLocate, endLocate, typeStr);
+                    var datas2 = FourWayCarUtil.GetCarPathUp(data2, typeStr2);
                     
-                    data.AddRange(data2);
-                    if (data == null) { break; }
-
-                    var preId1 = "";//鍓嶇疆浠诲姟Id
-                    var executionPath1 = "";//浜や簰璺緞
-                    var executionPath2 = "";//浜や簰璺緞
-                    var path = "";//鎵�鏈夎矾寰�
-                    var isOk = "1"; //鏄惁瀹屾暣璺緞  1瀹屾暣 2 涓ゆ潯璺緞
-                    for (int i = 0; i < data.Count; i++)
-                    {
-                        //璺緞鑺傜偣
-                        var pathXYZ = data[i].X.ToString().PadLeft(2, '0') + data[i].Y.ToString().PadLeft(2, '0') + data[i].Z.ToString().PadLeft(2, '0')+ data[i].NodeCom.ToString();
-                        path += pathXYZ + ";";
-                        
-                        //鑾峰彇绛夊緟鎴栨鍦ㄦ墽琛岀殑浠诲姟涓寘鍚綋鍓嶈妭鐐圭殑灏忚溅浠诲姟
-                        var taskList = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.Path.Contains(pathXYZ)).Select(m => m.Id).Distinct().ToList();
-
-                        foreach (var item in taskList)
-                        {
-                            //鍒ゆ柇濡傛灉鏄畬鏁磋矾寰� 璁板綍浜や簰璺緞
-                            if (isOk == "1")
-                            {
-                                if (i == 0)
-                                {
-                                    return;//绗竴涓妭鐐规湁鍜屽叾浠栦换鍔¤矾寰勫啿绐侊紝鏃犳硶閬垮厤
-                                }
-                                var pathXYZQian = data[i - 1].X.ToString().PadLeft(2, '0') + data[i - 1].Y.ToString().PadLeft(2, '0') + data[i - 1].Z.ToString().PadLeft(2, '0') + data[i].NodeCom.ToString();
-                                if (!executionPath1.Contains(pathXYZQian))
-                                {
-                                    executionPath1 += pathXYZQian + ";";
-                                }
-                                executionPath2 += pathXYZQian + ";";
-                            }
-                            //鍒ゆ柇娣诲姞鍓嶇疆浠诲姟Id
-                            if (!preId1.Contains(item + ""))
-                            {
-                                preId1 += item + ";";
-                            }
-                            
-                            isOk = "2";
-                        }
-                        
-                        if (data[i].IsSendPlc)
-                        {
-                            if (isOk == "1")
-                            {
-                                executionPath1 += pathXYZ + ";";
-                            }
-                            else
-                            {
-                                executionPath2 += pathXYZ + ";";
-                            }
-
-                        }
-
+                    if (datas2 == null) 
+                    { 
+                        continue; 
                     }
-
-                    #endregion
-
-                    #region 鍒ゆ柇鏄惁鏈夌┖闂插皬杞﹂樆鎸¤矾寰� 3
-                    var preId3 = "";//鍓嶇疆浠诲姟Id
-                    foreach (var item in kXCarList)
+                    else
                     {
-                        if (item == assignCar)
+                        var bl = FourWayCarUtil.AddCarTask(datas2,kXCarList,assignCar,waitTask,1);
+                        //鍒嗛厤閿欒锛屽垹闄ゅ垎閰嶄俊鎭�
+                        if (!bl)
                         {
-                            continue;//鎺掗櫎褰撳墠鍒嗛厤浠诲姟鐨勫皬杞�
-                        }
-                        //灏忚溅浣嶇疆
-                        var carXYZ = item.X.ToString().PadLeft(2, '0') + item.Y.ToString().PadLeft(2, '0') + item.Z.ToString().PadLeft(2, '0') ;
-                        //鍒嗛厤鐨勪换鍔¤矾寰勪腑 褰撳墠灏忚溅鏄惁闃绘尅
-                        if (path.Contains(carXYZ))
-                        {
-                            //鑾峰彇绛夊緟鎴栨鍦ㄦ墽琛岀殑浠诲姟涓寘鍚綋鍓嶈妭鐐圭殑灏忚溅浠诲姟锛屼笉浼氭湁澶浠诲姟锛屽悓灞傛湁鍑犱釜灏忚溅鏈�澶氭湁鍑犱釜浠诲姟
-                            var taskList3 = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing)).ToList();
-                            
-                            var str3 = "";//鎵�鏈夊凡鍒嗛厤鎴栨墽琛岀殑浠诲姟鍏ㄨ矾寰勪箣鍜�
-
-                            foreach (var item2 in taskList3)
-                            {
-                                str3 += item2.Path;
-                            }
-                            var endLocate3 = "";
-                            var executionPath3 = "";
-                            var path3 = ""; 
-                            var data3 = new List<CarModel>();
-                            //鏌ユ壘鐩爣浣嶇疆
-                            while (endLocate3 == "" || data3.Count == 0 || data3 == null)
-                            {
-                                endLocate3 = FourWayCarUtil.GetCarEndLocation(carXYZ, str3);
-                                data3 = FourWayCarUtil.GetCarPath(carXYZ, endLocate3, 0, "0");
-                            }
-                            foreach (var itemPath in data3)
-                            {
-                                var pathXYZ = itemPath.X.ToString().PadLeft(2, '0') + itemPath.Y.ToString().PadLeft(2, '0') + itemPath.Z.ToString().PadLeft(2, '0') + itemPath.NodeCom.ToString();
-
-                                path3 += pathXYZ + ";";
-                                if (itemPath.IsSendPlc)
-                                {
-                                    executionPath3 += pathXYZ + ";";
-                                }
-                            }
-                            WcsTask modTask = new WcsTask()
-                            {
-                                TaskNo = _taskService.GetTaskCode(),
-                                TaskType = TaskTypeEnum.Move,
-                                Type = PLCTypeEnum.ShuttleCar,
-                                StartLocate = carXYZ,
-                                EndLocate = endLocate3,
-                                PalletNo = "",
-                                Status = TaskStatusEnum.Wait,
-                                Levels = 2,
-                                Origin = "WCS"
-                            };
-                            _db.Insertable(modTask).ExecuteCommand();
-                            HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
-                            //绉诲姩灏忚溅
-                            var carTaskYC = new WcsCarTasks()
-                            {
-                                TaskNo = modTask.TaskNo,
-                                PreId = "",
-                                ExecutionPath = executionPath3,
-                                Path = path3,
-                                CarNo = item.CarPlcIp,
-                                Status = TaskStatusEnum.Wait
-                            };
-                            var idLong = _db.Insertable(carTaskYC).ExecuteReturnBigIdentity();
-                            preId3 += idLong + ";";
+                            waitTask.Status = TaskStatusEnum.Wait;
+                            _db.Updateable(waitTask).ExecuteCommand();
+                            var carTask = _db.Queryable<WcsCarTasks>().Where(m=>m.IsDelete == false && m.TaskNo == waitTask.TaskNo).ToList();
+                            _db.Deleteable(carTask).ExecuteCommand();
                         }
                     }
 
-                    #endregion
-
-                    #region 鍒ゆ柇鐜版湁浠诲姟涓渶缁堣妭鐐规槸鍚﹀湪褰撳墠鍒嗛厤璺緞涓紝濡傛湁 娣诲姞绉昏蛋灏忚溅浠诲姟骞跺姞鍏ュ墠缃换鍔� 4
-
-                    //鑾峰彇绛夊緟鎴栨鍦ㄦ墽琛岀殑浠诲姟涓寘鍚綋鍓嶈妭鐐圭殑灏忚溅浠诲姟锛屼笉浼氭湁澶浠诲姟锛屽悓灞傛湁鍑犱釜灏忚溅鏈�澶氭湁鍑犱釜浠诲姟
-                    var taskList4 = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing)).ToList();
-                    var preId4 = "";//鍓嶇疆浠诲姟Id
-                    var str4 = "";//鎵�鏈夊凡鍒嗛厤鎴栨墽琛岀殑浠诲姟鍏ㄨ矾寰勪箣鍜�
-
-                    foreach (var item in taskList4)
-                    {
-                        str4 += item.Path;
-                    } 
-                    //鍒ゆ柇鐜版湁浠诲姟涓渶缁堣妭鐐规槸鍚﹀湪褰撳墠鍒嗛厤璺緞涓紝濡傛湁 娣诲姞绉昏蛋灏忚溅浠诲姟骞跺姞鍏ュ墠缃换鍔� 
-                    foreach (var item in taskList4)
-                    {
-                        var lastPathList = item.ExecutionPath.Split(';');
-                        //  a;b;c; 鏈�鍚庝竴涓綅鏄�溾�濓紝鎵�浠astPathList.Length - 2
-                        var lastPath = lastPathList[lastPathList.Length - 2];
-
-                        //濡傛灉姝ゆ鍒嗛厤璺緞鍖呭惈閱夎垶涓渶缁堣妭鐐硅矾寰勶紝娣诲姞绉昏蛋灏忚溅
-                        if (path.Contains(lastPath))
-                        {
-                            var endLocate = "";
-                            var executionPath4 = "";
-                            var path4 = "";
-                            var data4 = new List<CarModel>();
-                            //鏌ユ壘鐩爣浣嶇疆
-                            while (endLocate == "" || data4.Count == 0 || data4 == null)
-                            {
-                                endLocate = FourWayCarUtil.GetCarEndLocation(lastPath, str4);
-                                data4 = FourWayCarUtil.GetCarPath(lastPath, endLocate, 0, "0");
-                            }
-                            foreach (var itemPath in data4)
-                            {
-                                var pathXYZ = itemPath.X.ToString().PadLeft(2, '0') + itemPath.Y.ToString().PadLeft(2, '0') + itemPath.Z.ToString().PadLeft(2, '0') + itemPath.NodeCom.ToString();
-
-                                path4 += pathXYZ + ";";
-                                if (itemPath.IsSendPlc)
-                                {
-                                    executionPath4 += pathXYZ + ";";
-                                }
-                            }
-                            WcsTask modTask = new WcsTask()
-                            {
-                                TaskNo = _taskService.GetTaskCode(),
-                                TaskType = TaskTypeEnum.Move,
-                                Type = PLCTypeEnum.ShuttleCar,
-                                StartLocate = lastPath,
-                                EndLocate = endLocate,
-                                PalletNo = "",
-                                Status = TaskStatusEnum.Wait,
-                                Levels = 2,
-                                Origin = "WCS"
-                            };
-                            _db.Insertable(modTask).ExecuteCommand();
-                            HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
-                            //绉诲姩灏忚溅
-                            var carTaskYC = new WcsCarTasks()
-                            {
-                                TaskNo = modTask.TaskNo,
-                                PreId = "",
-                                ExecutionPath = executionPath4,
-                                Path = path4,
-                                CarNo = item.CarNo,
-                                Status = TaskStatusEnum.Wait
-                            };
-                            var idLong = _db.Insertable(carTaskYC).ExecuteReturnBigIdentity();
-                            preId4 += idLong + ";";
-                        }
-                    }
-
-                    #endregion
-
-                    #region 鎻掑叆浠诲姟鏁版嵁  鏀瑰彉浠诲姟鐘舵��
-
-                    // 鎻掑叆鍥涘悜杞︿换鍔¤〃
-                    var carTask1 = new WcsCarTasks()
-                    {
-                        TaskNo = waitTask.TaskNo,
-                        PreId = preId1+ preId3+preId4,
-                        ExecutionPath = executionPath1,
-                        Path = path,
-                        CarNo = assignCar.CarPlcIp,
-                        Status = TaskStatusEnum.Wait
-                    };
-                    _db.Insertable(carTask1).ExecuteCommand();
-                    if (!string.IsNullOrWhiteSpace(executionPath1) && isOk == "2")
-                    {
-                        // 鎻掑叆鍥涘悜杞︿换鍔¤〃
-                        var carTask2 = new WcsCarTasks()
-                        {
-                            TaskNo = waitTask.TaskNo,
-                            PreId = preId1,
-                            ExecutionPath = executionPath2,
-                            Path = path,
-                            CarNo = assignCar.CarPlcIp,
-                            Status = TaskStatusEnum.Wait
-                        };
-                        _db.Insertable(carTask2).ExecuteCommand();
-                    }
-                    // 鏀瑰彉鎬讳换鍔¤〃鐘舵��
-                    waitTask.Status = TaskStatusEnum.Doing;
-                    waitTask.UpdateTime = DateTime.Now;
-                    _db.Updateable(waitTask).ExecuteCommand();
-                    HubUtil.PublicTask(waitTask.Adapt<WcsTaskOutput>());
-
-                    #endregion
+                    
 
                     Thread.Sleep(3000);
                 }

--
Gitblit v1.8.0