From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:12 +0800
Subject: [PATCH] 解决冲突

---
 Admin.NET/WCS.Application/PLC/PLCService.cs | 1315 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 980 insertions(+), 335 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 3b8b3f3..d1253f1 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1,8 +1,15 @@
 锘�
+using DocumentFormat.OpenXml.Bibliography;
+using Elastic.Clients.Elasticsearch.Tasks;
 using Furion.Logging;
 using IoTClient;
 using Microsoft.AspNetCore.SignalR;
+using Qiniu.Storage;
+using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
+using SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models;
+using System;
 using System.Data;
+using System.Reflection.Emit;
 
 namespace WCS.Application;
 public static class PLCService
@@ -51,385 +58,588 @@
     private static 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));
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
 
-                                // 鐩爣鏀捐揣宸ヤ綅
-                                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))
+                    // 鑾峰彇杞崲鍚庣殑璧峰鎺掑垪灞�
+                    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))
+                    {
+                        // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
+                        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();
+                        _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                        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 "840":
+                // 鍙栬揣瀹屾垚
+                {
+                    // 鑾峰彇璺烘満鐐逛綅閰嶇疆
+                    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)
+                    {
+                        // 鑾峰彇浠诲姟淇℃伅
+                        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("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
+                                var plcConveyorConn = PLCCommon.GetPlcIp(startStationVal);
+                                if (plcConveyorConn.Connected)
                                 {
-                                    // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
-                                    plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "10");
+                                    // 鍚戝彇璐у伐浣嶅啓鍏ユ祦绋嬪瓧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;
+                                    }
 
-                                    // 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝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()
+                                    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();
+                                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                                    var modcTaskMonitor = 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,
+                                        EndLocat = modTask.EndLocate,
+                                        InteractiveMsg = $"浠诲姟瀹屾垚"
                                     };
-                                    _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                    if (modTask.Origin == "WMS")
+                                    {
+                                        // 鍙嶉WMS
+                                        var requestMode = new TaskRequest()
+                                        {
+                                            TaskNo = modTask.TaskNo,
+                                            PalletNo = modTask.PalletNo,
+                                            TaskType = TaskTypeEnum.In,
+                                            TaskStatus = TaskStatusEnum.Complete
+                                        };
+                                        HttpService httpService = new HttpService();
+                                        var modResponseTask = httpService.RequestTask(requestMode).Result;
+                                        if (modResponseTask.StatusCode == "0")
+                                        {
+                                            modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
+                                        }
+                                    }
+                                    // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
                                     //涓嬪彂浠诲姟鏃ュ織
-                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-                                    //淇敼led灞忎俊鎭�
-                                    //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                                    // 姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
                                 }
-                            }
+                                break;
+                            case TaskTypeEnum.Out: // 鍑哄簱浠诲姟
+                                {
+                                    string roadway = modTask.StartRoadway;
+                                    // 浠庡嚭搴撲换鍔¤幏鍙栨斁璐у伐浣�
+                                    string outCode = modTask.EndLocate;
+                                    // 鏍规嵁宸ヤ綅鍙疯幏鍙栧搴旂殑杈撻�佺嚎IP
+                                    var plcConveyorConn = PLCCommon.GetPlcIp(outCode);
+                                    if (plcConveyorConn.Connected)
+                                    {
+                                        // 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
+                                        PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, modTask.TaskType.ToString(),
+                                            modTask.StartRoadway, modTask.EndRoadway);
+                                        // 鏍规嵁宸ヤ綅鍙疯幏鍙栧伐浣嶄俊鎭�
+                                        var wcsDevice = PLCTaskAction.plcDevices.First(s => s.PlcId == plcConveyorConn.PlcId && s.Level == DeviceLevelEnum.Station && s.StationNum == taskInfo.EndStation);
+                                        // 璇诲彇褰撳墠宸ヤ綅鍚勫亸绉婚噺鍊�
+                                        var listPos = PLCTaskAction.plcPositions.Where(s => s.DeviceId == wcsDevice.Id).ToList();
+
+                                        // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+                                        var listResult = new List<Result>();
+                                        //浠诲姟鍙�
+                                        var modPosTask = listPos.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+                                        //浠诲姟绫诲瀷
+                                        var modPosTaskType = listPos.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, modDevice.DbNumber, modPosTaskType.PlcPos, ((int)modTask.TaskType).ToString()));
+                                        //鎵樼洏鍙�
+                                        var modPosPalletNo = listPos.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+                                        //璧峰宸ヤ綅
+                                        var modPosLocatNo = listPos.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosLocatNo.PosType, modDevice.DbNumber, modPosLocatNo.PlcPos, taskInfo.EndStation));
+                                        // 鐩爣宸ヤ綅
+                                        var modPosEndLocatNo = listPos.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosEndLocatNo.PosType, modDevice.DbNumber, modPosEndLocatNo.PlcPos, outCode));
+
+                                        // 鏄惁鍐欏叆鎴愬姛
+                                        if (listResult.All(s => s.IsSucceed))
+                                        {
+                                            var result = plcConveyorConn.SetPlcDBValue(wcsDevice.PosType, wcsDevice.DbNumber, wcsDevice.WcsPos, "740");
+
+                                            if (result.IsSucceed)
+                                            {
+                                                // 鍐欏叆璺烘満wcs鎺у埗瀛� 杩斿洖鍨涙満鎵ц瀹屾垚
+                                                result = modDevice.PLCUtil.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
+                                                if (result.IsSucceed)
+                                                {
+                                                    var modcTaskMonitor = new WcsTaskMonitor()
+                                                    {
+                                                        TaskNo = modTask.TaskNo,
+                                                        PlcId = wcsDevice.Id,
+                                                        PlcName = wcsDevice.Text,
+                                                        PalletNo = modTask.PalletNo,
+                                                        Status = TaskStatusEnum.Complete,
+                                                        StartLocat = taskInfo.EndStation,
+                                                        EndLocat = outCode,
+                                                        InteractiveMsg = $"鍐欏叆鎸囦护锛氭敹鍒拌泛鏈烘斁璐у畬鎴愶紱鏀捐揣{taskInfo.EndStation}宸ヤ綅===銆媨outCode}鍑哄簱鍙�"
+                                                    };
+                                                    // 鎻掑叆浜や簰鏃ュ織
+                                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
+                                                    //涓嬪彂浠诲姟鏃ュ織
+                                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        //姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
+                                    }
+                                }
+                                break;
+                            case TaskTypeEnum.Move:       // 绉诲簱浠诲姟
+                                {
+                                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                                    var result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
+                                    if (!result.IsSucceed)
+                                    {
+                                        Log.Error($"{modDevice.Text}鍐欏叆浠诲姟鍙峰け璐�");
+                                        break;
+                                    }
+                                    result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+                                    if (!result.IsSucceed)
+                                    {
+                                        Log.Error($"{modDevice.Text}鎺у埗瀛楀啓鍏�30澶辫触");
+                                        break;
+                                    }
+                                    // 鏀瑰彉浠诲姟鐘舵��
+                                    modTask.Status = TaskStatusEnum.Complete;
+                                    modTask.FinishDate = DateTime.Now;
+                                    _db.Updateable(modTask).ExecuteCommand();
+                                    //涓嬪彂浠诲姟鏃ュ織
+                                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+
+                                    var modcTaskMonitor = new WcsTaskMonitor()
+                                    {
+                                        TaskNo = modTask.TaskNo,
+                                        PlcId = modDevice.Id,
+                                        PlcName = modDevice.Text,
+                                        PalletNo = modTask.PalletNo,
+                                        Status = TaskStatusEnum.Complete,
+                                        StartLocat = modTask.StartLocate,
+                                        EndLocat = modTask.EndLocate,
+                                        InteractiveMsg = $"浠诲姟瀹屾垚"
+                                    };
+                                    if (modTask.Origin == "WMS")
+                                    {
+                                        // 鍙嶉WMS
+                                        var requestMode = new TaskRequest()
+                                        {
+                                            TaskNo = modTask.TaskNo,
+                                            PalletNo = modTask.PalletNo,
+                                            TaskType = TaskTypeEnum.Move,
+                                            TaskStatus = TaskStatusEnum.Complete
+                                        };
+                                        HttpService httpService = new HttpService();
+                                        var modResponseTask = httpService.RequestTask(requestMode).Result;
+                                        if (modResponseTask.StatusCode == "0")
+                                        {
+                                            modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
+                                            //淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
+
+                                        }
+                                    }
+                                    // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
+                                    //涓嬪彂浠诲姟鏃ュ織
+                                    _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                                    // 姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
+                                }
+                                break;
+                            default: break;
                         }
+                    }
+                }
+                break;
+            case "841":
+                {
+
+                }
+                break;
+            case "843":
+                {
+                    //绌哄彇璐у紓甯�
+                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.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(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "844");
+                    if (!res.IsSucceed)
+                        break;
+                    modTask.Status = TaskStatusEnum.Exception;
+                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                    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
                     {
-                        Log.Error(string.Join(',', result.ErrList));
+                        //璇锋眰澶辫触
+                        modTask.IsSuccess = TaskSuccessEnum.Fail;
+                        modTask.Information = modResponseTask.Message;
+                        _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+                        _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
                     }
                 }
                 break;
-            case "20":
+            case "861":
                 {
-                    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);
+                    //婊℃斁璐у紓甯�
+                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                    var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鍙�");
+                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.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("銆愯泛鏈恒�戝綋鍓嶆墭鐩樺彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟");
+                        Log.Error($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
                         break;
                     }
-                    if (modTask.TaskType.Value == TaskTypeEnum.In)
+                    modTask.Status = TaskStatusEnum.Exception;
+                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+                    _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                    Log.Information($"銆愬爢鍨涙満銆憌cs浠诲姟鍙樻洿婊″彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+                    var modTaskRequest = modTask.Adapt<TaskRequest>();
+                    HttpService httpService = new HttpService();
+                    var modResponseTask = httpService.RequestFullException(modTaskRequest).Result;
+                    if (modResponseTask.StatusCode == "0")
                     {
-                        //鍏ュ簱浠诲姟
-                        var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
-                        if (!res.IsSucceed)
-                            break;
-                        // 鏍规嵁璺烘満鍙风‘璁ゅ彇璐у伐浣�
-                        string outStationNum = "0";
-                        switch (modDevice.StationNum)
+                        //淇敼浠诲姟涓烘鍦ㄦ墽琛�
+                        modTask.Status = TaskStatusEnum.Doing;
+                        _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+                        // 璧峰鎺掑垪灞�
+                        var modPosRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+                        var modPosColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+                        var modPosStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+                        // 鐩爣鏀捐揣宸ヤ綅
+                        var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+                        var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+                        var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+                        string endLocat = modResponseTask.TaskList.EndLocate;
+                        string row = int.Parse(endLocat.Substring(0, 2)).ToString();
+                        string column = int.Parse(endLocat.Substring(2, 2)).ToString();
+                        string storey = int.Parse(endLocat.Substring(4, 2)).ToString();
+
+                        // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+                        var listResult = new List<Result>();
+                        // 浠诲姟鍙锋墭鐩樺彿
+                        listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+                        listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+                        // 璧峰鎺掑垪灞�
+                        listResult.Add(plcConn.SetPlcDBValue(modPosRow.PosType, modDevice.DbNumber, modPosRow.PlcPos, "2"));
+                        listResult.Add(plcConn.SetPlcDBValue(modPosColumn.PosType, modDevice.DbNumber, modPosColumn.PlcPos, "100"));
+                        listResult.Add(plcConn.SetPlcDBValue(modPosStorey.PosType, modDevice.DbNumber, modPosStorey.PlcPos, "1"));
+                        listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, row));
+                        listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, column));
+                        listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, storey));
+                        // 鏄惁鍐欏叆鎴愬姛
+                        if (listResult.All(s => s.IsSucceed))
                         {
-                            case "R01":
-                                outStationNum = "10";
-                                break;
-                            case "R02":
-                                outStationNum = "6";
-                                break;
-                            default: break;
+                            // 鍚戣泛鏈哄啓鍏ユ帶鍒舵祦绋嬪瓧
+                            var res = modDevice.PLCUtil.SetPlcDBValue(modDevice.PosType, modDevice.WcsPos, "862");
+                            var modcTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = modTask.TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                PalletNo = modTask.PalletNo,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum,
+                                EndLocat = endLocat,
+                                InteractiveMsg = $"鍐欏叆鎸囦护锛歿modDevice.StationNum}宸ヤ綅====銆�" + endLocat + "鍌ㄤ綅鍦板潃!"
+                            };
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modcTaskMonitor).ExecuteCommand();
+                            //涓嬪彂浠诲姟鏃ュ織
+                            _taskLogHubContext.Clients.All.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                         }
-                        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.Value, 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":
-                {
-                    //鎿嶄綔瀹屾垚锛堟斁璐у畬鎴愶級
-                    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.Value, 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.Value, 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:
-
-                            break;
-                        default:
-                            break;
-                    }
+                    //else
+                    //{
+                    //    //璇锋眰澶辫触
+                    //    modTask.IsSuccess = TaskSuccessEnum.Fail;
+                    //    modTask.Information = modResponseTask.Message;
+                    //    _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+                    //}
                 }
                 break;
             default:
@@ -442,6 +652,439 @@
     /// <param name="modDevice"></param>
     private static void ConveyorLine(WcsDeviceDto modDevice)
     {
+        var plcConn = modDevice.PLCUtil;
+        // 鑾峰彇妤煎眰鏁�
+        var louCeng = PLCCommon.GetRoadwayByStationNew(modDevice.StationNum);
+        switch (modDevice.Value.ToString())
+        {
+            case "320":
+                {
+                    // 鐢宠宸烽亾
+                    string strMsg = "";
+                    string taskModel = "";
+                    // 鍒ゆ柇鏄惁婕旂ず妯″紡
+                    if (PLCTaskAction.boDemo)
+                    {
+                        taskModel = "1";// 婕旂ず妯″紡
+                    }
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    var http = new HttpService();
+                    string TaskNo = "", EndLocate = "";
+                    strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo);
+                    
+                    if (!strMsg.Contains("-1"))
+                    {
+                        // 鍐欏叆330
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "330");
+                        
+                        if (ret.IsSucceed)
+                        {
+                            // 鎻掑叆浠诲姟鏄庣粏 
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护330锛歿modDevice.StationNum}宸ヤ綅鐢宠宸烽亾",
+                                PalletNo = palletVal,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum,
+                                EndLocat = EndLocate,
+                            };
+                            
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                            // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                            if (PLCTaskAction.boRefresh)
+                            {
+                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            }
+                            // led鏇存柊鍐呭
+                            //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
+                            //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+                        }
+
+                    }
+                    else
+                    {
+                        // 鐢宠宸烽亾澶辫触锛丩ED鏄剧ず
+                        Log.Error(string.Format($"鐢宠宸烽亾澶辫触:{ strMsg },璇诲啓plc閿欒")); 
+                    }
+                }
+                break;
+            case "330":
+                {
+                    // 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
+
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    string pallet = palletVal.ToString();
+                    // 鑾峰彇浠诲姟淇℃伅
+                    var modTask = _db.Queryable<WcsTask>().First(s => s.IsDelete == false && s.PalletNo == pallet && (s.Status == TaskStatusEnum.Wait || s.Status == TaskStatusEnum.Doing) && s.TaskType == TaskTypeEnum.In && s.StartRoadway == modDevice.StationNum);
+                    if (modTask == null)
+                    {
+                        // 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
+                        break;
+                    }
+                    
+                    // 鑾峰彇宸烽亾鍙e叆搴撳伐浣�
+                    string endLocatVlue = PLCCommon.RoadwayToStationNum(modTask.EndRoadway, louCeng);
+                    // 缁橮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 modPosTaskType = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, modDevice.DbNumber, modPosTaskType.PlcPos, modTask.TaskType.ToString()));
+                    var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+                    // 璧峰宸ヤ綅銆佺洰鐨勫伐浣�
+                    var modPosStrLocat = modDevice.listStation.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosStrLocat.PosType, modDevice.DbNumber, modPosStrLocat.PlcPos, modDevice.StationNum));
+                    var modPosEndLocat = modDevice.listStation.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+                    listResult.Add(plcConn.SetPlcDBValue(modPosEndLocat.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, endLocatVlue));
+                    
+
+                    if (listResult.All(s => s.IsSucceed))
+                    {
+                        // 灏嗕换鍔$姸鎬佸彉鏇翠负姝e湪鎵ц
+                        _db.Updateable<WcsTask>()
+                           .SetColumns(s => s.Status == TaskStatusEnum.Doing)
+                           .Where(s => s.Id == modTask.Id)
+                           .ExecuteCommand();
+                        // 鍐欏叆娴佺▼瀛� 330 340
+                        
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "340");
+                         
+                        
+                        if (ret.IsSucceed)
+                        {
+                            // 鎻掑叆浠诲姟鏄庣粏 
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = modTask.TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护340锛歿modDevice.StationNum}鍌ㄤ綅====銆媨endLocatVlue}宸ヤ綅",
+                                PalletNo = palletVal,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum,
+                                EndLocat = endLocatVlue,
+                            };
+
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                            // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                            if (PLCTaskAction.boRefresh)
+                            {
+                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            }
+
+                            // led鏇存柊鍐呭
+                            //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+                        }
+                    }
+
+                }
+                break;
+            case "620":
+                {
+                    // 鐢宠鍌ㄤ綅 鏇存柊鍏ュ簱浠诲姟(鍌ㄤ綅鍦板潃) 630
+                                        
+                    var strMsg = "";
+                    var taskModel = "";
+                    // 鍒ゆ柇鏄惁婕旂ず妯″紡
+                    if (PLCTaskAction.boDemo)
+                    {
+                        // 婕旂ず妯″紡
+                        taskModel = "1";
+                    }
+                    // 鏍规嵁宸ヤ綅鍙疯幏鍙栧贩閬撳彿
+                    var roadway = PLCCommon.GetRoadwayByStation(modDevice.StationNum);
+                    if (roadway == "")
+                    {
+                        break;
+                    }
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    var http = new HttpService();
+                    string TaskNo = "";
+                    // 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
+                    strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo);
+                    if (!strMsg.Contains("-1"))
+                    {
+                        // 鍐欏叆娴佺▼瀛� 630
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "630");
+
+                        if (ret.IsSucceed)
+                        {
+                            // 鎻掑叆浠诲姟鏄庣粏 
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护340锛歿modDevice.StationNum}宸ヤ綅鐢宠鍌ㄤ綅",
+                                PalletNo = palletVal,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum,
+                                EndLocat = strMsg,
+                            };
+
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                            // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                            if (PLCTaskAction.boRefresh)
+                            {
+                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            }
+                            // led鏇存柊鍐呭
+                            //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
+                            //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+                        }
+                    }
+                    else
+                    {
+                        // 鐢宠鍌ㄤ綅澶辫触锛丩ED鏄剧ず
+                        Log.Error(string.Format($"鐢宠鍌ㄤ綅澶辫触:{strMsg},璇诲啓plc閿欒"));
+                    }
+                    
+                }
+                break;
+            case "630":
+                {
+                    #region 鍐欏叆璺烘満鍙栬揣浠诲姟 640
+
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosTaskNo = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                    var (taskRes, taskNoVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosTaskNo.PlcPos);
+                    string pallet = palletVal.ToString();
+                    string taskNo = taskNoVal.ToString();
+                    // 鑾峰彇浠诲姟淇℃伅
+                    var modTask = _db.Queryable<WcsTask>().First(s => s.IsDelete == false && s.PalletNo == pallet && s.Status == TaskStatusEnum.Doing && s.TaskType == TaskTypeEnum.In && s.TaskNo == taskNo);
+                    if (modTask == null)
+                    {
+                        // 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
+                        break;
+                    }
+                    
+                    var sInfo = PLCCommon.GetStokePlc(modTask.EndRoadway, louCeng);
+                    if (string.IsNullOrWhiteSpace(sInfo.Ip))
+                    {
+                        throw new Exception("鏍规嵁宸烽亾鑾峰彇璺烘満IP澶辫触锛岃鑱旂郴绠$悊鍛�");
+                    }
+                    // 璺烘満杩炴帴
+                    var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == sInfo.Ip);
+                    if (plcStackeConn.Connected)
+                    {
+                        // 鐩爣鎺掑垪灞�
+                        var endLocate = modTask.EndLocate;
+                        if (string.IsNullOrWhiteSpace(modTask.EndLocate))
+                        {
+                            Log.Error(string.Format($"鐩爣浣嶇疆涓虹┖锛岃浜哄伐澶勭悊,璇诲啓plc閿欒"));
+                            break;
+                        }
+
+                        var paiVal = PLCCommon.GetDjAdress(modTask.EndRoadway.Substring(1, 2), endLocate.Substring(0, 2), endLocate.Substring(6, 2));
+                        string pai = paiVal.ToString();
+                        string lie = int.Parse(endLocate.Substring(2, 2)).ToString();
+                        string ceng = int.Parse(endLocate.Substring(4, 2)).ToString();
+
+                        var djMod = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.EndRoadway
+                            && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
+                        var djInfos = PLCTaskAction.plcStation.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
+                        var djInfo = djInfos.First(m => m.Text == "PLC娴佺▼瀛�");
+
+                        // 鑾峰彇璺烘満褰撳墠鐘舵��
+                        var (djRes, djVal) = plcStackeConn.GetPlcDBValue(djMod.PosType, djMod.DbNumber, djMod.PlcPos);
+                        if (djVal != "820")
+                        {
+                            // 璺烘満闈炵┖闂茬瓑寰�
+                            break;
+                        }
+                        // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+                        var listResult = new List<Result>();
+
+                        // 浠诲姟鍙枫�佷换鍔$被鍨嬨�佹墭鐩樺彿
+                        var modPosTask = djInfos.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosTask.PosType, djMod.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+                        var modPosTaskType = djInfos.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosTaskType.PosType, djMod.DbNumber, modPosTaskType.PlcPos, modTask.TaskType.ToString()));
+                        var modPosPalletNo = djInfos.FirstOrDefault(s => s.Text == "鎵樼洏鍙�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosPallet.PosType, djMod.DbNumber, modPosPallet.PlcPos, modTask.PalletNo));
+                        
+                        //璧峰宸ヤ綅
+                        var modPosStrStationNum = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrStationNum.PosType, djMod.DbNumber, modPosStrStationNum.PlcPos, modDevice.StationNum));
+
+                        //鍙栬揣鎺掋�佸垪銆佸眰
+                        var modPosStrPai = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣鎺�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrPai.PosType, djMod.DbNumber, modPosStrPai.PlcPos, sInfo.Pai));
+                        var modPosStrLie = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣鍒�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrLie.PosType, djMod.DbNumber, modPosStrLie.PlcPos, sInfo.Lie));
+                        var modPosStrCeng = djInfos.FirstOrDefault(s => s.Text == "鍙栬揣灞�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosStrCeng.PosType, djMod.DbNumber, modPosStrCeng.PlcPos, sInfo.Ceng));
+                        //鏀捐揣鎺掋�佸垪銆佸眰
+                        var modPosEndPai = djInfos.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosEndPai.PosType, djMod.DbNumber, modPosEndPai.PlcPos, pai));
+                        var modPosEndLie = djInfos.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosEndLie.PosType, djMod.DbNumber, modPosEndLie.PlcPos, lie));
+                        var modPosEndCeng = djInfos.FirstOrDefault(s => s.Text == "鏀捐揣灞�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosEndCeng.PosType, djMod.DbNumber, modPosEndCeng.PlcPos, ceng));
+
+                        if (listResult.All(s => s.IsSucceed))
+                        {
+                            // 鍐欏叆璺烘満 830
+                            var retc2 = plcStackeConn.SetPlcDBValue(djMod.PosType, djMod.DbNumber, djMod.WcsPos, "830");
+
+                            // 鎻掑叆浠诲姟鏄庣粏 浠诲姟鏄庣粏瀹炰綋绫�
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                TaskNo = modTask.TaskNo,
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                PalletNo = modTask.PalletNo,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum,
+                                EndLocat = modTask.EndLocate                  // 鐩爣鍌ㄤ綅鍦板潃
+                            };
+                            if (!retc2.IsSucceed)
+                            {
+                                modInsertTaskMonitor.InteractiveMsg = $"杈撻�佺嚎鍙栬揣宸ヤ綅锛歿modDevice.StationNum},鍐欏叆鍨涙満鍙栬揣浠诲姟830澶辫触绛夊緟鍐嶆鍐欏叆";
+                                // 鎻掑叆浜や簰鏃ュ織
+                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                //涓嬪彂浠诲姟鏃ュ織
+                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                break;
+
+                            }
+                            modInsertTaskMonitor.InteractiveMsg = $"璺烘満鍐欏叆鎸囦护830锛歿modDevice.StationNum}宸ヤ綅====銆�" + modTask.EndLocate + "鍌ㄤ綅鍦板潃!";
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                            if (PLCTaskAction.boRefresh)
+                            {   //涓嬪彂浠诲姟鏃ュ織
+                                _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            }
+                            
+                        }
+                        
+                       
+
+                        
+                    }
+                    
+                    #endregion
+                }
+                break;
+            #region 鍑哄簱浜や簰
+
+            case "420":
+                {
+                    #region 鎵樼洏鍒拌揪鎷i�夊伐浣�/鍑哄簱鍙�
+                    // 鍑哄簱鍙�
+                    // led鏄剧ず鎵樼洏淇℃伅
+                    // 鍐欏叆430
+                    var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "430");
+                   
+                    if (ret.IsSucceed)
+                    {
+                        var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                        var (res, taskVal) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+                        var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                        var (res2, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
+                        var modPosStarStationNum = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
+                        var (res3, starVal) = plcConn.GetPlcDBValue(modPosStarStationNum.PosType, modDevice.DbNumber, modPosStarStationNum.PlcPos);
+                        // 鎻掑叆浠诲姟鏄庣粏 
+                        var modInsertTaskMonitor = new WcsTaskMonitor()
+                        {
+                            TaskNo = taskVal,
+                            PlcId = modDevice.Id,
+                            PlcName = modDevice.Text,
+                            InteractiveMsg = $"鍐欏叆鎸囦护430锛氭墭鐩樺埌杈緖modDevice.StationNum}宸ヤ綅",
+                            PalletNo = palletVal,
+                            Status = TaskStatusEnum.Complete,
+                            StartLocat = starVal,
+                            EndLocat = modDevice.StationNum,
+                        };
+
+                        // 鎻掑叆浜や簰鏃ュ織
+                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                        // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                        if (PLCTaskAction.boRefresh)
+                        {
+                            _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        }
+                         
+                        // led鏇存柊鍐呭
+                        //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
+                        //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+                    }
+                    // 鍙嶉WMS鍑哄簱瀹屾垚
+                    //TaskReques taskReques = new TaskReques();
+                    //taskReques.taskNo = TaskNo;
+                    //taskReques.TaskType = "1";
+                    //taskReques.TaskStatus = "2";
+                    //bool bl = wcsMySql.RequestTasks(taskReques);
+                    #endregion
+                }
+                break;
+            case "440":
+                {
+                    #region 鎷i�夊畬鎴�,鎵樼洏绂诲紑宸ヤ綅
+                    // 鍐欏叆450
+                    var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "450");
+                    if (ret.IsSucceed)
+                    {
+                        var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                        var (res, taskVal) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+                        var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                        var (res2, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
+                        var modPosStarStationNum = modDevice.listStation.FirstOrDefault(m => m.Text == "璧峰宸ヤ綅");
+                        var (res3, starVal) = plcConn.GetPlcDBValue(modPosStarStationNum.PosType, modDevice.DbNumber, modPosStarStationNum.PlcPos);
+                        // 鎻掑叆浠诲姟鏄庣粏 
+                        var modInsertTaskMonitor = new WcsTaskMonitor()
+                        {
+                            TaskNo = taskVal,
+                            PlcId = modDevice.Id,
+                            PlcName = modDevice.Text,
+                            InteractiveMsg = $"鍐欏叆鎸囦护450锛歿modDevice.StationNum}鎷i�夊畬鎴�,鎵樼洏绂诲紑宸ヤ綅",
+                            PalletNo = palletVal,
+                            Status = TaskStatusEnum.Complete,
+                            StartLocat = starVal,
+                            EndLocat = modDevice.StationNum,
+                        };
+
+                        // 鎻掑叆浜や簰鏃ュ織
+                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                        // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                        if (PLCTaskAction.boRefresh)
+                        {
+                            _taskLogHubContext.Clients.All.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        }
+                        // led鏇存柊鍐呭
+                        //DataRow ConveyorsRow10 = PlcInfoDt.Select($"Level = '2' and  StationNum = '{EndLocat}'")[0];
+                        //LedDisplay(ConveyorsRow10["LedIP"].ToString(), "宸ヤ綅:" + EndLocat, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿StartLocat}", "鎵樼洏鍙�:" + PalletNo);
+                    }
+                    #endregion
+                }
+                break;
+
+            #endregion
+
+            default: break;
+        }
 
     }
     /// <summary>
@@ -511,4 +1154,6 @@
         }
     }
 
+
+
 }

--
Gitblit v1.8.0