From 5af0a043ffbbe444f7e43b6bf52a9e94c74283f2 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 11 九月 2024 08:43:43 +0800
Subject: [PATCH] 跺机交互流程

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |  789 +++++++++++++++++++++----------------------------------
 1 files changed, 300 insertions(+), 489 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 7f56930..15c6b70 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1,7 +1,11 @@
 锘�
+using DocumentFormat.OpenXml.Bibliography;
+using Elastic.Clients.Elasticsearch.Tasks;
 using Furion.Logging;
 using IoTClient;
 using Microsoft.AspNetCore.SignalR;
+using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models;
 using System.Data;
 
 namespace WCS.Application;
@@ -48,532 +52,337 @@
     /// 璺烘満涓氬姟澶勭悊
     /// </summary>
     /// <param name="modDevice"></param>
-    private static void StackingMachine(WcsDeviceDto modDevice)
+    private static async void StackingMachine(WcsDeviceDto modDevice)
     {
         var plcConn = modDevice.PLCUtil;
-        switch (modDevice.ToString())
+        switch (modDevice.Value.ToString())
         {
             case "820":
+                // 璺烘満绌洪棽锛岃幏鍙栧嚭搴撲换鍔°�佺Щ搴撲换鍔�
                 {
-                    var modTask = _db.Queryable<WcsTask>().First(s => s.Status == TaskStatusEnum.Wait && s.TaskType == TaskTypeEnum.Out && s.StartRoadway == modDevice.StationNum);
+                    // 鑾峰彇浠诲姟淇℃伅
+                    var modTask = _db.Queryable<WcsTask>().OrderBy(m=>m.CreateTime).OrderBy(m=>m.Levels,OrderByType.Desc)
+                        .First(s => s.Status == TaskStatusEnum.Wait && (s.TaskType == TaskTypeEnum.Out || s.TaskType == TaskTypeEnum.Move) 
+                        && s.StartRoadway == modDevice.StationNum);
                     if (modTask == null)
                     {
                         break;
                     }
-                    var modTaskMonitor = new WcsTaskMonitor()
-                    {
-                        TaskNo = modTask.TaskNo,
-                        StartLocat = modTask.StartLocate,
-                        EndLocat = modTask.EndLocate,
-                        PalletNo = modTask.PalletNo,
-                    };
-                    // 鏍规嵁璺烘満鍙风‘璁ゆ斁璐у伐浣�
-                    string outStationNum = "0";
-                    string endRow = "", endColumn = "", endStorey = "";
-                    switch (modDevice.StationNum)
-                    {
-                        case "R01":
-                            outStationNum = "11";
-                            endRow = "1";
-                            endColumn = "100";
-                            endStorey = "1";
-                            break;
-                        case "R02":
-                            outStationNum = "7";
-                            endRow = "1";
-                            endColumn = "100";
-                            endStorey = "1";
-                            break;
-                        default: break;
-                    }
-                    var modD = modDevice.listDevice.FirstOrDefault();
-                    if (modD == null)
-                    {
-                        Log.Error($"IP{modDevice.PlcId}.璁惧id锛歿modDevice.Id}缂哄皯宸ヤ綅绾у埆璁惧淇℃伅");
-                        break;
-                    }
-                    var (result, value) = plcConn.GetPlcDBValue(modD.PosType, modD.DbNumber, modD.PlcPos);
-                    if (result.IsSucceed)
-                    {
-                        if (value == 120)// 鏀捐揣宸ヤ綅绌洪棽 鍙斁璐�
-                        {
-                            if (int.Parse(outStationNum) > 0)
-                            {
-                                var row = int.Parse(modTaskMonitor.StartLocat.Substring(0, 2)).ToString();
-                                var column = int.Parse(modTaskMonitor.StartLocat.Substring(2, 2)).ToString();
-                                var layer = int.Parse(modTaskMonitor.StartLocat.Substring(4, 2)).ToString();
-                                var deep = int.Parse(modTaskMonitor.StartLocat.Substring(6, 2)).ToString();
-                                if (int.Parse(row) > 2) //澶т簬4
-                                {
-                                    row = (int.Parse(row) - 2).ToString();
-                                }
-                                else
-                                {
-                                    // 璧峰鍌ㄤ綅鍦板潃涓虹┖锛岃烦杩� 鍐欏叆浠诲姟鏄庣粏琛�
-                                    modTaskMonitor.StartLocat = "";
-                                    modTaskMonitor.InteractiveMsg = "璧峰鍌ㄤ綅涓虹┖!";
 
-                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
-                                    //涓嬪彂浠诲姟鏃ュ織
-                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                    // 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
+                    PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, modTask.TaskType.ToString(), 
+                        modTask.StartRoadway, modTask.EndRoadway);
+
+                    // 鐩爣宸ヤ綅涓嶄负null锛岄渶鍏堝垽鏂斁璐у伐浣嶆槸鍚︾┖闂�
+                    if (!string.IsNullOrEmpty(taskInfo.EndStation)) 
+                    {
+                        // 鎵撳紑瀵瑰簲鐨勮緭閫佺嚎杩炴帴
+                        var plcConveyorConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == taskInfo.Ip);
+                        if (plcConveyorConn.Connected)
+                        {
+                            // 鑾峰彇鏀捐揣宸ヤ綅閰嶇疆淇℃伅
+                            var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == taskInfo.EndStation
+                            && m.DeviceType == DeviceTypeEnum.Business);
+
+                            var (result, value) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.PlcPos);
+                            if (result.IsSucceed)
+                            {
+                                if (value.ToString() != "720")              // 720:鏀捐揣绌轰綅绌洪棽锛屽彲鏀捐揣
+                                {
+                                    Log.Error(string.Format("浠诲姟鍙�:{0}:鏀捐揣宸ヤ綅鍗犵敤锛岀◢鍚庢墽琛屻��", modTask.TaskNo));
                                     break;
                                 }
-                                //缁橮LC鍐欏叆浠诲姟鏁版嵁
-                                var listResult = new List<Result>();
-                                //浠诲姟鍙�
-                                var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTaskMonitor.TaskNo));
-                                //鎵樼洏鍙�
-                                var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "PalletNo");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTaskMonitor.PalletNo));
-                                //璧峰鎺�
-                                var modPosRow = modDevice.listStation.FirstOrDefault(s => s.Text == "StartRow");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosRow.PosType, modDevice.DbNumber, modPosRow.PlcPos, row));
-                                // 璧峰鍒�
-                                var modPosColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "StartColumn");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosColumn.PosType, modDevice.DbNumber, modPosColumn.PlcPos, column));
-                                // 璧峰灞�
-                                var modPosStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "StartLayer");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosStorey.PosType, modDevice.DbNumber, modPosStorey.PlcPos, layer));
-
-                                // 鐩爣鏀捐揣宸ヤ綅
-                                var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "EndRow");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, endRow));
-                                var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "EndColumn");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, endColumn));
-                                var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "EndLayer");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, endColumn));
-                                //鍏ㄩ儴鍐欏叆鎴愬姛
-                                if (listResult.All(s => s.IsSucceed))
-                                {
-                                    // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
-                                    plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "10");
-
-                                    // 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝e湪鎵ц
-                                    _db.Updateable<WcsTask>()
-                                        .SetColumns(s => s.FinishDate == DateTime.Now)
-                                        .SetColumns(s => s.Status == TaskStatusEnum.Doing)
-                                        .SetColumns(s => s.Levels == 2)
-                                        .Where(s => s.Id == modTask.Id)
-                                        .ExecuteCommand();
-                                    var modInsertTaskMonitor = new WcsTaskMonitor()
-                                    {
-                                        TaskNo = modTask.TaskNo,
-                                        PlcId = modDevice.Id,
-                                        PlcName = modDevice.Text,
-                                        InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨outStationNum}宸ヤ綅",
-                                        PalletNo = modTask.PalletNo,
-                                        Status = TaskStatusEnum.Complete,
-                                        StartLocat = modTask.StartLocate,
-                                        EndLocat = outStationNum,
-                                    };
-                                    _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
-                                    //涓嬪彂浠诲姟鏃ュ織
-                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-                                    //淇敼led灞忎俊鎭�
-                                    //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
-                                }
+                            }
+                            else 
+                            {
+                                break;
                             }
                         }
+                        else 
+                        {
+                            break;
+                        }
                     }
-                    else
+
+                    // 鑾峰彇杞崲鍚庣殑璧峰鎺掑垪灞�
+                    PlcTaskInfo startTaskInfo = PLCCommon.GetEndPai(modTask.StartLocate.Substring(1, 2),
+                    modTask.StartLocate.Substring(0, 2), modTask.StartLocate.Substring(4, 2),
+                    modTask.StartLocate.Substring(6, 2));
+
+                    // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+                    var listResult = new List<Result>();
+                    // 浠诲姟鍙锋墭鐩樺彿
+                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+                    var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+                    // 璧峰鎺掑垪灞�
+                    var modPosRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosRow.PosType, modDevice.DbNumber, modPosRow.PlcPos, startTaskInfo.EndPai));
+                    var modPosColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosColumn.PosType, modDevice.DbNumber, modPosColumn.PlcPos, startTaskInfo.EndLie));
+                    var modPosStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosStorey.PosType, modDevice.DbNumber, modPosStorey.PlcPos, startTaskInfo.EndCeng));
+                    // 鐩爣鏀捐揣宸ヤ綅(鍥哄畾鎺掑垪灞�)
+                    var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, taskInfo.EndPai));
+                    var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, taskInfo.EndLie));
+                    var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, taskInfo.EndCeng));
+
+                    // 鏄惁鍐欏叆鎴愬姛
+                    if (listResult.All(s => s.IsSucceed))
                     {
-                        Log.Error(string.Join(',', result.ErrList));
+                        // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
+                        plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "830");
+
+                        // 灏嗙Щ搴撲换鍔″緟鎵ц鏀逛负姝e湪鎵ц
+                        _db.Updateable<WcsTask>()
+                            .SetColumns(s => s.Status == TaskStatusEnum.Doing)
+                            .Where(s => s.Id == modTask.Id)
+                            .ExecuteCommand();
+
+                        WcsTaskMonitor modInsertTaskMonitor;
+                        if (string.IsNullOrEmpty(taskInfo.EndStation))
+                        {
+                            // 鍚屽贩閬撶Щ搴�
+                            modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = modTask.TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨modTask.EndLocate}鍌ㄤ綅銆�",
+                                PalletNo = modTask.PalletNo,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modTask.StartLocate,
+                                EndLocat = modTask.EndLocate,
+                            };
+                        }
+                        else 
+                        {
+                            // 鍑哄簱浠诲姟 璺ㄥ贩閬撶Щ搴�
+                            modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = modTask.TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨taskInfo.EndStation}宸ヤ綅銆�",
+                                PalletNo = modTask.PalletNo,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modTask.StartLocate,
+                                EndLocat = modTask.EndLocate,
+                            };
+                        }
+
+                        // 鎻掑叆浜や簰鏃ュ織
+                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                        //涓嬪彂浠诲姟鏃ュ織
+                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        //淇敼led灞忎俊鎭�
+                        //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
                     }
                 }
                 break;
-            case "20":
+            case "840": 
+                // 鍙栬揣瀹屾垚
                 {
-                    var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
-                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
-                    if (!result.IsSucceed)
-                        break;
-                    string taskNo = Convert.ToString(TaskNo);
-                    var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
-                    if (modTask == null)
+                    // 鑾峰彇璺烘満鐐逛綅閰嶇疆
+                    var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                    var (res, val) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTask.PlcPos);
+
+                    var modPosEndStation = modDevice.listStation.FirstOrDefault(m => m.Text == "鐩殑宸ヤ綅");
+                    var (endStationRes, endStation) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTask.PlcPos);
+                    if (res.IsSucceed) 
                     {
-                        Log.Error("銆愯泛鏈恒�戝綋鍓嶆墭鐩樺彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟");
-                        break;
-                    }
-                    if (modTask.TaskType.Value == TaskTypeEnum.In)
-                    {
-                        //鍏ュ簱浠诲姟
-                        var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
-                        if (!res.IsSucceed)
-                            break;
-                        // 鏍规嵁璺烘満鍙风‘璁ゅ彇璐у伐浣�
-                        string outStationNum = "0";
-                        switch (modDevice.StationNum)
+                        // 鑾峰彇浠诲姟淇℃伅
+                        string tasknoVal = val.ToString();
+                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == true); 
+                        if (modTask == null)
                         {
-                            case "R01":
-                                outStationNum = "10";
+                            Log.Error(string.Format("PLC鎺у埗瀛�840:鏈壘鍒板搴旂殑浠诲姟銆�"));
+                            break;
+                        }
+                        // 璁板綍浠诲姟鏄庣粏
+                        var modInsertTaskMonitor = new WcsTaskMonitor()
+                        {
+                            TaskNo = modTask.TaskNo,
+                            PlcId = modDevice.Id,
+                            PlcName = modDevice.Text, 
+                            PalletNo = modTask.PalletNo,
+                            Status = TaskStatusEnum.Complete,
+                            StartLocat = modTask.StartLocate,
+                        };
+
+                        if (modTask.TaskType == TaskTypeEnum.In)
+                        {
+                            // 鑾峰彇璺烘満璧峰宸ヤ綅鐐逛綅閰嶇疆,璇诲彇璧峰宸ヤ綅
+                            var modPosStartStation = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
+                            var (startStationRes, startStationVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosStartStation.PlcPos);
+                            if (startStationRes.IsSucceed) 
+                            {
+                                // 鏍规嵁宸ヤ綅鍙疯幏鍙栧搴旂殑杈撻�佺嚎IP
+                                PlcTaskInfo taskInfo = PLCCommon.GetPlcIp(startStationVal);
+                                var plcConveyorConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == taskInfo.Ip);
+                                if (plcConveyorConn.Connected) 
+                                {
+                                    // 鍚戝彇璐у伐浣嶅啓鍏ユ祦绋嬪瓧640  鍙栬揣宸插畬鎴�
+                                    var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == startStationVal
+                                                            && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == true);
+                                    var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
+                                    var modcTaskMonitor = new WcsTaskMonitor()
+                                    {
+                                        TaskNo = modTask.TaskNo,
+                                        PlcId = ConveyorMod.Id,
+                                        PlcName = ConveyorMod.Text,
+                                        PalletNo = modTask.PalletNo,
+                                        Status = TaskStatusEnum.Complete,
+                                        StartLocat = startStationVal,
+                                        EndLocat = modTask.EndLocate                  // 鐩爣鍌ㄤ綅鍦板潃
+                                    };
+                                    if (!retc.IsSucceed) 
+                                    {
+                                        modcTaskMonitor.InteractiveMsg = string.Format("杈撻�佺嚎鍙栬揣宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640澶辫触绛夊緟鍦ㄦ鍐欏叆", startStationVal);
+                                        // 鎻掑叆浜や簰鏃ュ織
+                                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                        //涓嬪彂浠诲姟鏃ュ織
+                                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                        break;
+                                    }
+
+                                    modcTaskMonitor.InteractiveMsg = string.Format("杈撻�佺嚎鍙栬揣宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640鎴愬姛", startStationVal);
+                                    // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
+                                    //涓嬪彂浠诲姟鏃ュ織
+                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                }
+
+                                // 鍐欏叆娴佺▼鎺у埗瀛�
+                                var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "850");
+                                if (!ret.IsSucceed)
+                                {
+                                    break;              // 鍐欏叆澶辫触璺冲嚭绛夊緟鍐嶆鍐欏叆
+                                }
+
+                                modInsertTaskMonitor.InteractiveMsg = string.Format("杈撻�佺嚎鍙栬揣宸ヤ綅锛歿0}璺烘満鍙栬揣瀹屾垚850鎴愬姛", startStationVal);
+                                modInsertTaskMonitor.EndLocat = modTask.EndLocate;                  // 鐩爣鍌ㄤ綅鍦板潃
+                                                                                             // 鎻掑叆浜や簰鏃ュ織
+                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                //涓嬪彂浠诲姟鏃ュ織
+                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            }
+                        }
+                        else if (modTask.TaskType == TaskTypeEnum.Out)
+                        {
+                            // 鍐欏叆娴佺▼鎺у埗瀛�
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "850");
+                            if (!ret.IsSucceed)
+                            {
+                                break;              // 鍐欏叆澶辫触璺冲嚭绛夊緟鍐嶆鍐欏叆
+                            }
+
+                            // 璁板綍浠诲姟鏄庣粏
+                            modInsertTaskMonitor.InteractiveMsg = string.Format("鍌ㄤ綅鍦板潃锛歿0}鍙栬揣瀹屾垚", modTask.StartLocate);
+                            modInsertTaskMonitor.EndLocat = endStation;                  // 鏀捐揣宸ヤ綅
+                        }
+                        else 
+                        {
+                            // 鍐欏叆娴佺▼鎺у埗瀛�
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "850");
+                            if (!ret.IsSucceed)
+                            {
+                                break;              // 鍐欏叆澶辫触璺冲嚭绛夊緟鍐嶆鍐欏叆
+                            }
+
+                            modInsertTaskMonitor.InteractiveMsg = string.Format("鍌ㄤ綅鍦板潃锛歿0}鍙栬揣瀹屾垚", modTask.StartLocate);
+                            modInsertTaskMonitor.EndLocat = endStation;                  // 鐩爣鍌ㄤ綅
+                        }
+
+                        // 鎻掑叆浜や簰鏃ュ織
+                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                        //涓嬪彂浠诲姟鏃ュ織
+                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        //淇敼led灞忎俊鎭�
+                        //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+                    }
+                }
+                break;
+            case "860":
+                {
+                    // 鑾峰彇璺烘満鐐逛綅閰嶇疆
+                    var modPos860Task = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                    var (res, val) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPos860Task.PlcPos);
+                    // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
+                    if (res.IsSucceed)
+                    {
+                        string tasknoVal = val.ToString();
+                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == true);
+                        if (modTask == null)
+                        {
+                            Log.Error(string.Format("璺烘満鎺у埗瀛�860:鏈壘鍒板搴旂殑浠诲姟銆�"));
+                            break;
+                        }
+
+                        switch (modTask.TaskType)
+                        {
+                            case TaskTypeEnum.In:
+                                {
+                                    var res870 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
+                                    if (!res870.IsSucceed) 
+                                    {
+                                        Log.Error(string.Format("璺烘満鎺у埗瀛�860鍐欏叆870澶辫触!"));
+                                        break;
+                                    }
+
+                                    // 鏀瑰彉浠诲姟鐘舵��
+                                    modTask.Status = TaskStatusEnum.Complete;
+                                    modTask.FinishDate = DateTime.Now; 
+                                    _db.Updateable(modTask).ExecuteCommand();
+
+                                    if (modTask.Origin == "WMS") 
+                                    {
+                                        // 鍙嶉WMS
+                                        var requestMode = new TaskRequest()
+                                        {
+                                            TaskNo = modTask.TaskNo,
+                                            PalletNo = modTask.PalletNo,
+                                            TaskType = "1",
+                                            TaskStatus = TaskStatusEnum.Complete
+                                        };
+
+                                        // 姝ゅ娣诲姞璋冪敤WMS鎺ュ彛 liudl
+                                    }
+
+                                    // 姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
+                                }
                                 break;
-                            case "R02":
-                                outStationNum = "6";
+                            case TaskTypeEnum.Out: // 鍑哄簱浠诲姟
+                                { 
+                                    
+                                }
+                                break;
+                            case TaskTypeEnum.Move:       // 绉诲簱浠诲姟
+                                { 
+                                
+                                }
                                 break;
                             default: break;
                         }
-                        var modDevice2 = modDevice.listDevice.Where(s => s.StationNum == outStationNum).FirstOrDefault();
-                        var modStation = _db.Queryable<WcsPosition>().First(s => s.DeviceId == modDevice2.Id && s.Text == "TaskNo");
-                        // 鍚戝彇璐у伐浣嶅啓鍏ヤ换鍔″彿
-                        res = plcConn.SetPlcDBValue(modStation.PosType, modDevice2.DbNumber, modStation.PlcPos, taskNo);
-                        if (!res.IsSucceed)
-                            break;
-                        // 鍚戝彇璐у伐浣嶅啓鍏ユ祦绋嬫帶鍒跺瓧
-                        res = plcConn.SetPlcDBValue(modDevice2.PosType, modDevice2.DbNumber, modDevice2.WcsPos, "100");
-                        if (!res.IsSucceed)
-                            break;
-                        var modTaskMonitor = new WcsTaskMonitor()
-                        {
-                            TaskNo = modTask.TaskNo,
-                            PlcId = modDevice2.PlcId,
-                            PlcName = modDevice2.Text,
-                            InteractiveMsg = "璺烘満鍙栬揣瀹屾垚",
-                            StartLocat = outStationNum,
-                            EndLocat = modTask.EndLocate,
-                            PalletNo = modTask.PalletNo,
-                            Status = TaskStatusEnum.Complete
-                        };
-                        _db.Insertable(modTaskMonitor).ExecuteCommand();
-                        //涓嬪彂浠诲姟鏃ュ織
-                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-
-                    }
-                    else if (modTask.TaskType.Value == TaskTypeEnum.Out)
-                    {
-                        //鍏ュ簱浠诲姟
-                        var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
-                        if (!res.IsSucceed)
-                            break;
-                        res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
-                        if (!res.IsSucceed)
-                            break;
-                        // 鏍规嵁璺烘満鍙风‘璁ゅ彇璐у伐浣�
-                        string outStationNum = "0";
-                        switch (modDevice.StationNum)
-                        {
-                            case "R01":
-                                outStationNum = "11";
-                                break;
-                            case "R02":
-                                outStationNum = "7";
-                                break;
-                            default: break;
-                        }
-                        var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                        var modTaskMonitor = new WcsTaskMonitor()
-                        {
-                            TaskNo = modTask.TaskNo,
-                            PlcId = modDevice.PlcId,
-                            PlcName = modDevice.Text,
-                            InteractiveMsg = "璺烘満鍙栬揣瀹屾垚",
-                            StartLocat = outStationNum,
-                            EndLocat = modTask.EndLocate,
-                            PalletNo = modTask.PalletNo,
-                            Status = TaskStatusEnum.Complete
-                        };
-                        _db.Insertable(modTaskMonitor).ExecuteCommand();
-                        //涓嬪彂浠诲姟鏃ュ織
-                        _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                     }
                 }
                 break;
-            case "30":
+            case "841":
                 {
-                    //鎿嶄綔瀹屾垚锛堟斁璐у畬鎴愶級
-                    var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
-                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
-                    if (!result.IsSucceed)
-                        break;
-                    string taskNo = Convert.ToString(TaskNo);
-                    var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
-                    if (modTask == null)
-                    {
-                        Log.Error("銆愯泛鏈恒�戝綋鍓嶆墭鐩樺彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟");
-                        break;
-                    }
-                    switch (modTask.TaskType)
-                    {
-                        case TaskTypeEnum.In:
-                        case TaskTypeEnum.PLC:
-                            {
-                                //鍏ュ簱浠诲姟
-                                var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                                // 鍐欏叆plc浠诲姟鍙�
-                                var res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, taskNo);
-                                if (!res.IsSucceed)
-                                    break;
-                                res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
-                                if (!res.IsSucceed)
-                                    break;
-                                //淇敼浠诲姟鐘舵��
-                                modTask.Status = TaskStatusEnum.Complete;
-                                _db.Updateable<WcsTask>()
-                                        .SetColumns(s => s.Status == TaskStatusEnum.Complete)
-                                        .Where(s => s.Id == modTask.Id)
-                                        .ExecuteCommand();
-                                //鍙嶉缁橶MS
-                                var modTaskRequest = modTask.Adapt<TaskRequest>();
-                                HttpService httpService = new HttpService();
-                                var modResponseTask = httpService.RequestTask(modTaskRequest).Result;
-                                if (modResponseTask.StatusCode == "0")
-                                {
-                                    //璇锋眰鎴愬姛
-                                    modTask.IsSuccess = TaskSuccessEnum.Success;
-                                    _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
-                                    //todo:淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
-                                    //
 
-                                    //璁板綍浠诲姟鏄庣粏
-                                    var modTaskMonitor = new WcsTaskMonitor()
-                                    {
-                                        TaskNo = modTask.TaskNo,
-                                        PlcId = modDevice.PlcId,
-                                        PlcName = modDevice.Text,
-                                        InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚",
-                                        StartLocat = modTask.StartLocate,
-                                        EndLocat = modTask.EndLocate,
-                                        PalletNo = modTask.PalletNo,
-                                        Status = TaskStatusEnum.Complete
-                                    };
-                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
-                                    //涓嬪彂浠诲姟鏃ュ織
-                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-                                }
-                                else
-                                {
-                                    //璇锋眰澶辫触
-                                    modTask.IsSuccess = TaskSuccessEnum.Fail;
-                                    modTask.Information = modResponseTask.Message;
-                                    _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
-                                }
-                                //todo:鍨涙満鍏ュ簱涓嶇┖璺�
-
-                                //todo:LED
-                            }
-                            break;
-                        case TaskTypeEnum.Out://鍑哄簱
-                            {
-                                // 浠庡嚭搴撲换鍔¤幏鍙栧贩閬撳彿
-                                string num = ""; // 鏀捐揣宸ヤ綅鍙�
-                                if (modTask.StartRoadway == "R01")
-                                {
-                                    num = "11"; //浜や簰宸ヤ綅
-                                }
-                                else if (modTask.StartRoadway == "R02")
-                                {
-                                    num = "7"; //浜や簰宸ヤ綅
-                                }
-                                var modDevice2 = modDevice.listDevice.FirstOrDefault(s => s.StationNum == num);
-                                if (modDevice2 == null)
-                                {
-                                    Log.Error($"銆愯泛鏈恒�戞壘涓嶅埌宸ヤ綅{num}璁惧淇℃伅");
-                                    break;
-                                }
-                                // 鏍规嵁鐩爣鍙h幏鍙栫洰鏍囧伐浣�
-                                string outCode = modTask.EndLocate.IsNullOrEmpty() ? "-1" : modTask.EndLocate;
-
-                                var listStation = _db.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice2.Id).ToList();
-                                //缁橮LC鍐欏叆浠诲姟鏁版嵁
-                                var listResult = new List<Result>();
-                                //浠诲姟鍙�
-                                var modPosTask = listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
-                                //鎵樼洏鍙�
-                                var modPosPalletNo = listStation.FirstOrDefault(s => s.Text == "PalletNo");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
-                                //璧峰宸ヤ綅
-                                var modPosLocatNo = listStation.FirstOrDefault(s => s.Text == "StartLocatNo");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosLocatNo.PosType, modDevice.DbNumber, modPosLocatNo.PlcPos, num));
-                                // 鐩爣宸ヤ綅
-                                var modPosEndLocatNo = listStation.FirstOrDefault(s => s.Text == "EndLocatNo");
-                                listResult.Add(plcConn.SetPlcDBValue(modPosEndLocatNo.PosType, modDevice.DbNumber, modPosEndLocatNo.PlcPos, outCode));
-                                //鍏ㄩ儴鍐欏叆鎴愬姛
-                                if (listResult.All(s => s.IsSucceed))
-                                {
-                                    // 鍐欏叆宸ヤ綅wcs鎺у埗瀛�
-                                    var res = plcConn.SetPlcDBValue(modDevice2.PosType, modDevice2.DbNumber, modDevice2.WcsPos, "120");
-                                    if (!res.IsSucceed)
-                                        break;
-                                    //鍐欏叆plc浠诲姟鍙�
-                                    var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                                    res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, modTask.TaskNo);
-                                    if (!res.IsSucceed)
-                                        break;
-                                    //鍐欏叆璺烘満wcs鎺у埗瀛楁祦绋�30 杩斿洖鍨涙満鎵ц瀹屾垚
-                                    res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
-                                    if (!res.IsSucceed)
-                                        break;
-                                    //璁板綍浠诲姟鏄庣粏
-                                    var modTaskMonitor = new WcsTaskMonitor()
-                                    {
-                                        TaskNo = modTask.TaskNo,
-                                        PlcId = modDevice2.PlcId,
-                                        PlcName = modDevice2.Text,
-                                        InteractiveMsg = $"鍐欏叆鎸囦护锛氭敹鍒拌泛鏈烘斁璐у畬鎴愶紱鏀捐揣{num}宸ヤ綅===銆媨outCode}鍑哄簱鍙�",
-                                        PalletNo = modTask.PalletNo,
-                                        Status = TaskStatusEnum.Complete,
-                                        StartLocat = num, //璧峰浣嶇疆
-                                        EndLocat = outCode, //鐩爣宸ヤ綅
-                                    };
-                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
-
-                                    //涓嬪彂浠诲姟鏃ュ織
-                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-                                    //todo:鍨涙満鍑哄簱涓嶇┖璺�
-                                }
-                            }
-                            break;
-                        case TaskTypeEnum.Move:
-                            {
-                                //绉诲簱浠诲姟
-                                var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                                // 鍐欏叆plc浠诲姟鍙�
-                                var res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, taskNo);
-                                if (!res.IsSucceed)
-                                    break;
-                                //鍐欏叆plc鎺у埗瀛�
-                                res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
-                                if (!res.IsSucceed)
-                                    break;
-                                modTask.Status = TaskStatusEnum.Complete;
-                                _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
-                                var modTaskRequest = modTask.Adapt<TaskRequest>();
-                                HttpService httpService = new HttpService();
-                                var modResponseTask = httpService.RequestTask(modTaskRequest).Result;
-                                if (modResponseTask.StatusCode == "0")
-                                {
-                                    //璇锋眰鎴愬姛
-                                    modTask.IsSuccess = TaskSuccessEnum.Success;
-                                    _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
-                                    //todo:淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
-                                    //
-
-                                    //璁板綍浠诲姟鏄庣粏
-                                    var modTaskMonitor = new WcsTaskMonitor()
-                                    {
-                                        TaskNo = modTask.TaskNo,
-                                        PlcId = modDevice.PlcId,
-                                        PlcName = modDevice.Text,
-                                        InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚",
-                                        StartLocat = modTask.StartLocate,
-                                        EndLocat = modTask.EndLocate,
-                                        PalletNo = modTask.PalletNo,
-                                        Status = TaskStatusEnum.Complete
-                                    };
-                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
-                                    //涓嬪彂浠诲姟鏃ュ織
-                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-                                }
-                                else
-                                {
-                                    //璇锋眰澶辫触
-                                    modTask.IsSuccess = TaskSuccessEnum.Fail;
-                                    modTask.Information = modResponseTask.Message;
-                                    _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
-                                }
-
-                                //todo:LED灞�
-
-                            }
-
-                            break;
-                        default:
-                            break;
-                    }
                 }
                 break;
-            case "100":
+            case "843":
                 {
-                    //绌哄彇璐у紓甯�
-                    var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
-                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
-                    if (!result.IsSucceed)
-                        break;
-                    string taskNo = Convert.ToString(TaskNo);
-                    var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
-                    if (modTask == null)
-                    {
-                        Log.Error($"銆愯泛鏈恒�戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
-                        break;
-                    }
-                    var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
-                    if (!res.IsSucceed)
-                        break;
-                    res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "100");
-                    if (!res.IsSucceed)
-                        break;
-                    modTask.Status = TaskStatusEnum.Exception;
-                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
-                    Log.Information($"銆愯泛鏈恒�憌cs浠诲姟鍙樻洿绌哄彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
-                    var modTaskRequest = modTask.Adapt<TaskRequest>();
-                    HttpService httpService = new HttpService();
-                    var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
-                    if (modResponseTask.StatusCode == "0")
-                    {
-                        //璇锋眰鎴愬姛
-                        modTask.IsSuccess = TaskSuccessEnum.Success;
-                        _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
-                        //涓嬪彂浠诲姟鏃ュ織
-                        _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
-                    }
-                    else
-                    {
-                        //璇锋眰澶辫触
-                        modTask.IsSuccess = TaskSuccessEnum.Fail;
-                        modTask.Information = modResponseTask.Message;
-                        _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
-                    }
-                    //todo:LED灞�
+
                 }
                 break;
-            case "101":
+            case "861":
                 {
-                    //婊℃斁璐у紓甯�
-                    var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
-                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                    var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "PalletNo");
-                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
-                    if (!result.IsSucceed)
-                        break;
-                    string taskNo = Convert.ToString(TaskNo);
-                    var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
-                    if (modTask == null)
-                    {
-                        Log.Error($"銆愯泛鏈恒�戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
-                        break;
-                    }
-                    modTask.Status = TaskStatusEnum.Exception;
-                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
-                    Log.Information($"銆愯泛鏈恒�憌cs浠诲姟鍙樻洿婊″彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
-                    var modTaskRequest = modTask.Adapt<TaskRequest>();
-                    HttpService httpService = new HttpService();
-                    var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
-                    if (modResponseTask.StatusCode == "0")
-                    {
-                        //璇锋眰鎴愬姛
-                        modTask.IsSuccess = TaskSuccessEnum.Success;
-                        _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
-                        var modInsertTask = modResponseTask.TaskList;
-                        modInsertTask.TaskType = TaskTypeEnum.In;
-                        modInsertTask.Origin = "WMS";
-                        modInsertTask.StartLocate = modTask.StartLocate;
-                        modInsertTask.Levels = 1;
-                        _db.Insertable(modInsertTask);
-
-                        //涓嬪彂浠诲姟鏃ュ織
-                        _taskLogHubContext.Clients.All.PublicTask(modInsertTask.Adapt<WcsTaskOutput>());
-                    }
-                    else
-                    {
-                        //璇锋眰澶辫触
-                        modTask.IsSuccess = TaskSuccessEnum.Fail;
-                        modTask.Information = modResponseTask.Message;
-                        _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
-                    }
-                    //todo:LED灞�
 
                 }
                 break;
@@ -656,4 +465,6 @@
         }
     }
 
+
+    
 }

--
Gitblit v1.8.0