From 48d66a079c307356997fb400d27907ff6d363b7b Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期一, 20 一月 2025 08:35:37 +0800
Subject: [PATCH] 修改2楼分拣和1楼拆垛时获取拆垛信息接口

---
 Admin.NET/WCS.Application/PLC/PLCService.cs | 3040 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 2,648 insertions(+), 392 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index cf5a94c..e563b98 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1,11 +1,31 @@
 锘�
+using Dm.filter;
+using DocumentFormat.OpenXml.Bibliography;
+using DocumentFormat.OpenXml.Drawing.Charts;
+using Elastic.Clients.Elasticsearch.Snapshot;
+using Elastic.Clients.Elasticsearch.Tasks;
+using Flurl.Util;
 using Furion.Logging;
 using IoTClient;
+using Microsoft.AspNetCore.SignalR;
+using NewLife.Reflection;
+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;
+using WCS.Application.Entity;
+using WCS.Application.Service.WcsDevice.Dto;
+using WCS.Application.Util;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressIntracityUpdateStoreRequest.Types;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.NontaxInsertBillRequest.Types.CardExtra.Types.BillCard.Types;
 
 namespace WCS.Application;
 public static class PLCService
 {
+    private static readonly object OLock = new object();
+
     private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
 
     public static void OnChangeEvent(object sender, EventArgs e)
@@ -17,16 +37,19 @@
             switch (mod.Type)
             {
                 case PLCTypeEnum.StackingMachine:
-                    StackingMachine(mod);
+                    StackingMachine(mod);                           // 璺烘満
                     break;
                 case PLCTypeEnum.ConveyorLine:
-                    ConveyorLine(mod);
+                    ConveyorLine(mod);                              // 鎵樼洏杈撻�佺嚎
                     break;
                 case PLCTypeEnum.AGV:
-                    AGV(mod);
+                    AGV(mod);                                       // AGV璋冨害
                     break;
-                case PLCTypeEnum.PalletMachine:
-                    PalletMachine(mod);
+                case PLCTypeEnum.BoxConveyorLine:
+                    BoxConveyorLine(mod);                             // 鐮佸灈鏈哄櫒浜�
+                    break;
+                case PLCTypeEnum.StackingRobot:
+                    StackingRobot(mod);                           //鎷嗗灈鏈哄櫒浜�
                     break;
                 default:
                     break;
@@ -44,404 +67,690 @@
     private static void StackingMachine(WcsDeviceDto modDevice)
     {
         var plcConn = modDevice.PLCUtil;
-        switch (modDevice.ToString())
+        string ledText = "";
+        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.Levels, OrderByType.Asc).OrderBy(m => m.CreateTime)
+                        .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()
+                    //鍒ゆ柇鍑哄簱閿佸畾鏄惁鎵撳紑
+                    if (PLCTaskAction.boOutLock)
                     {
-                        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;
+                        break;//鍑哄簱閿佸畾鎵撳紑鍒欎笉鎵ц鍑哄簱浠诲姟
                     }
-                    var modD = modDevice.listDevice.FirstOrDefault();
-                    if (modD == null)
+
+                    PlcTaskInfo taskInfo = new PlcTaskInfo();
+                    if (modTask.TaskType == TaskTypeEnum.Move)
                     {
-                        Log.Error($"IP{modDevice.PlcId}.璁惧id锛歿modDevice.Id}缂哄皯宸ヤ綅绾у埆璁惧淇℃伅");
-                        break;
+                        taskInfo = PLCCommon.GetEndPai(modTask.EndRoadway.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
+                                    modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
+                                    modTask.EndLocate.Substring(6, 2));
+                        
                     }
-                    var (result, value) = plcConn.GetPlcDBValue(modD.PosType, modD.DbNumber, modD.PlcPos);
-                    if (result.IsSucceed)
+                    else 
                     {
-                        if (value == 120)// 鏀捐揣宸ヤ綅绌洪棽 鍙斁璐�
+                        // 鏍规嵁鐩爣鍦板潃鍜屽贩閬撹幏鍙栨斁璐у伐浣嶅搴旂殑鎺掑垪灞�
+                        taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
+                            modTask.StartRoadway, modTask.EndRoadway);
+
+                        // 鐩爣宸ヤ綅涓嶄负null锛岄渶鍏堝垽鏂斁璐у伐浣嶆槸鍚︾┖闂�
+                        if (!string.IsNullOrEmpty(taskInfo.EndStation))
                         {
-                            if (int.Parse(outStationNum) > 0)
+                            // 鎵撳紑瀵瑰簲鐨勮緭閫佺嚎杩炴帴
+                            var plcConveyorConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == taskInfo.Ip);
+                            if (plcConveyorConn.Connected)
                             {
-                                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
+                                // 鑾峰彇鏀捐揣宸ヤ綅閰嶇疆淇℃伅
+                                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)
                                 {
-                                    row = (int.Parse(row) - 2).ToString();
+                                    if (value.ToString() != "720")              // 720:鏀捐揣绌轰綅绌洪棽锛屽彲鏀捐揣
+                                    {
+                                        Log.Error(string.Format("浠诲姟鍙�:{0}:鏀捐揣宸ヤ綅鍗犵敤锛岀◢鍚庢墽琛屻��", modTask.TaskNo));
+                                        break;
+                                    }
+                                    else if (value.ToString() == "720") 
+                                    {
+                                        // 鑻ョ┖闂叉彁鍓嶅崰鐢ㄦ宸ヤ綅锛屽悓宸ヤ綅鍑哄叆鍏敤鍙� 鏀惧紑姝ょ▼搴�
+                                        // var ret = plcConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "730");
+                                    }
                                 }
                                 else
                                 {
-                                    // 璧峰鍌ㄤ綅鍦板潃涓虹┖锛岃烦杩� 鍐欏叆浠诲姟鏄庣粏琛�
-                                    modTaskMonitor.StartLocat = "";
-                                    modTaskMonitor.InteractiveMsg = "璧峰鍌ㄤ綅涓虹┖!";
-
-                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
-
-                                    // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
-                                    //if (TaskAction.refresh)
-                                    //{
-                                    //    wSChat.AlarmInformation("1");
-                                    //}
                                     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;
+                            }
+                        }
+                    }
 
-                                // 鐩爣鏀捐揣宸ヤ綅
-                                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))
+                    // 鑾峰彇杞崲鍚庣殑璧峰鎺掑垪灞� 06010101
+                    PlcTaskInfo startTaskInfo = PLCCommon.GetEndPai(modTask.StartRoadway.Substring(1, 2), modTask.StartLocate.Substring(2, 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))
+                    {
+                        // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
+                        var ret = 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();
+                        HubUtil.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();
+                        //涓嬪彂浠诲姟鏃ュ織
+                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                        //淇敼led灞忎俊鎭�
+                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == taskInfo.EndStation && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+                        ledText += $"浠诲姟绫诲瀷:{modTask.TaskType.GetDescription()}\n\n";
+                        ledText += $"浠诲姟鍙�:{modTask.TaskNo}\n";
+                        ledText += $"鎵樼洏鍙�:{modTask.PalletNo}\n\n";
+                        ledText += $"璧峰浣�:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
+                        ledText += $"鐩爣浣�:{modTask.EndRoadway + " " + modTask.EndLocate}";
+                        LedDisplay(ledDevice.LedIP, ledText);
+                    }
+                }
+                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, modPosEndStation.PlcPos);
+                    if (res.IsSucceed)
+                    {
+                        // 鑾峰彇浠诲姟淇℃伅
+                        string tasknoVal = val.ToString();
+                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
+                        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.Short, modDevice.DbNumber, modPosStartStation.PlcPos);
+                            if (startStationRes.IsSucceed)
+                            {
+                                // 鏍规嵁宸ヤ綅鍙疯幏鍙栧搴旂殑杈撻�佺嚎IP
+                                PLCUtil plcConveyorConn = PLCCommon.GetPlcIp(startStationVal.ToString());
+                                if (plcConveyorConn.Connected)
                                 {
-                                    // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
-                                    plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "10");
+                                    // 鍚戝彇璐у伐浣嶅啓鍏ユ祦绋嬪瓧640  鍙栬揣宸插畬鎴�
+                                    var ConveyorMod = PLCTaskAction.plcDevices.First(m => m.StationNum == startStationVal.ToString()
+                                                            && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
 
-                                    // 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝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()
+                                    var modcTaskMonitor = new WcsTaskMonitor()
+                                    {
+                                        TaskNo = modTask.TaskNo,
+                                        PlcId = ConveyorMod.Id,
+                                        PlcName = ConveyorMod.Text,
+                                        PalletNo = modTask.PalletNo,
+                                        Status = TaskStatusEnum.Complete,
+                                        StartLocat = startStationVal.ToString(),
+                                        EndLocat = modTask.EndLocate                  // 鐩爣鍌ㄤ綅鍦板潃
+                                    };
+
+                                    // 璇诲彇wcs鎺у埗瀛�
+                                    var (ress, va1s) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos);
+                                    if (va1s.ToString() == "630") 
+                                    {
+                                        modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚:640", startStationVal);
+                                        // 鎻掑叆浜や簰鏃ュ織
+                                        _db.Insertable(modcTaskMonitor).ExecuteCommand();
+
+                                        var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
+
+                                        if (!retc.IsSucceed)
+                                        {
+                                            modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640澶辫触", startStationVal);
+                                            // 鎻掑叆浜や簰鏃ュ織
+                                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                            //涓嬪彂浠诲姟鏃ュ織
+                                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                            break;
+                                        }
+
+                                        //涓嬪彂浠诲姟鏃ュ織
+                                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                    }
+
+                                }
+
+                                // 璇诲彇wcs鎺у埗瀛�
+                                var (resss, va1ss) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos);
+                                if (va1ss.ToString() == "830") 
+                                {
+                                    modInsertTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0}璺烘満鍙栬揣瀹屾垚鍐欏叆850", startStationVal);
+                                    modInsertTaskMonitor.EndLocat = modTask.EndLocate;                  // 鐩爣鍌ㄤ綅鍦板潃
+                                                                                                        // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                }
+
+                                // 鍐欏叆娴佺▼鎺у埗瀛�
+                                var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "850");
+                                if (!ret.IsSucceed)
+                                {
+                                    modInsertTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0}璺烘満鍙栬揣瀹屾垚鍐欏叆850澶辫触,绛夊緟鍐嶆鍐欏叆銆�", startStationVal);
+                                    modInsertTaskMonitor.EndLocat = modTask.EndLocate;                  // 鐩爣鍌ㄤ綅鍦板潃
+                                                                                                        // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                    break;              // 鍐欏叆澶辫触璺冲嚭绛夊緟鍐嶆鍐欏叆
+                                }
+
+                                //涓嬪彂浠诲姟鏃ュ織
+                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            }
+                        }
+                        else if (modTask.TaskType == TaskTypeEnum.Out)
+                        {
+                            // 璇诲彇wcs鎺у埗瀛�
+                            var (resss, va1ss) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos);
+                            if (va1ss.ToString() == "830")
+                            {
+                                // 璁板綍浠诲姟鏄庣粏
+                                modInsertTaskMonitor.InteractiveMsg = string.Format("鍌ㄤ綅鍦板潃锛歿0}鍙栬揣瀹屾垚鍐欏叆850", modTask.StartLocate);
+                                modInsertTaskMonitor.EndLocat = endStation;                  // 鏀捐揣宸ヤ綅
+                            }
+                            // 鍐欏叆娴佺▼鎺у埗瀛�
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "850");
+                            if (!ret.IsSucceed)
+                            {
+                                modInsertTaskMonitor.InteractiveMsg = string.Format("鍌ㄤ綅鍦板潃锛歿0}鍙栬揣瀹屾垚鍐欏叆850澶辫触,绛夊緟鍐嶆鍐欏叆銆�", modTask.StartLocate);
+                                modInsertTaskMonitor.EndLocat = modTask.EndLocate;                  // 鐩爣鍌ㄤ綅鍦板潃
+                                                                                                    // 鎻掑叆浜や簰鏃ュ織
+                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                break;              // 鍐欏叆澶辫触璺冲嚭绛夊緟鍐嶆鍐欏叆
+                            }
+
+                            //涓嬪彂浠诲姟鏃ュ織
+                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        }
+                        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();
+                            //涓嬪彂浠诲姟鏃ュ織
+                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        }
+
+                    }
+                }
+                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 == false);
+                        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();
+                                    HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                                    var modTaskMonitor = 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 (TaskAction.refresh)
-                                    //{
-                                    //    wSChat.AlarmInformation("1");
-                                    //}
-                                    //淇敼led灞忎俊鎭�
-                                    //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+                                    if (modTask.Origin == "WMS")
+                                    {
+                                        // 鍙嶉WMS
+                                        var requestMode = new TaskRequestWMS()
+                                        {
+                                            TaskNo = modTask.TaskNo,
+                                            PalletNo = modTask.PalletNo,
+                                            TaskType = ((int)TaskTypeEnum.In).ToString(),
+                                            TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
+                                        };
+                                        HttpService httpService = new HttpService();
+                                        var modResponseTask = httpService.RequestTask(requestMode).Result;
+                                        if (modResponseTask.StatusCode == 0)
+                                        {
+                                            modTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
+                                        }
+                                        else
+                                        {
+                                            Log.Error(string.Format("c锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+                                        }
+                                    }
+                                    // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+                                    modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.StartLocate).Select(s => s.LedIP).First();
+
+                                    // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
+                                    //涓嬪彂浠诲姟鏃ュ織
+                                    HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                                    // led鏄剧ず鍐呭
+                                    var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.StartLocate && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+                                    ledText += $"鍏ュ簱瀹屾垚\n\n";
+
+                                    ledText += $"浠诲姟鍙�:{modTask.TaskNo}\n";
+                                    ledText += $"鎵樼洏鍙�:{modTask.PalletNo}\n\n";
+
+                                    ledText += $"璧峰浣�:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
+                                    ledText += $"鐩爣浣�:{modTask.EndRoadway + " " + modTask.EndLocate}";
+
+                                    LedDisplay(ledDevice.LedIP, ledText);
+                                    // 姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
                                 }
-                            }
+                                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, ((int)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(plcConveyorConn.SetPlcDBValue(modPosTask.PosType, wcsDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+                                        //浠诲姟绫诲瀷
+                                        var modPosTaskType = listPos.FirstOrDefault(s => s.Text == "浠诲姟绫诲瀷");
+                                        listResult.Add(plcConveyorConn.SetPlcDBValue(modPosTaskType.PosType, wcsDevice.DbNumber, modPosTaskType.PlcPos, ((int)modTask.TaskType).ToString()));
+                                        //鎵樼洏鍙�
+                                        var modPosPalletNo = listPos.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+                                        listResult.Add(plcConveyorConn.SetPlcDBValue(modPosPalletNo.PosType, wcsDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+                                        //璧峰宸ヤ綅
+                                        var modPosLocatNo = listPos.FirstOrDefault(s => s.Text == "璧峰宸ヤ綅");
+                                        listResult.Add(plcConveyorConn.SetPlcDBValue(modPosLocatNo.PosType, wcsDevice.DbNumber, modPosLocatNo.PlcPos, taskInfo.EndStation));
+                                        // 鐩爣宸ヤ綅
+                                        var modPosEndLocatNo = listPos.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+                                        listResult.Add(plcConveyorConn.SetPlcDBValue(modPosEndLocatNo.PosType, wcsDevice.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();
+                                                    //涓嬪彂浠诲姟鏃ュ織
+                                                    HubUtil.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                        //姝ゅ娣诲姞涓嶇┖璺戜笟鍔�
+                                    }
+                                }
+                                break;
+                            case TaskTypeEnum.Move:       // 绉诲簱浠诲姟
+                                {
+                                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                                    var result = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
+                                    if (!result.IsSucceed)
+                                    {
+                                        Log.Error($"{modDevice.Text}鍐欏叆浠诲姟鍙峰け璐�");
+                                        break;
+                                    }
+                                    result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
+                                    if (!result.IsSucceed)
+                                    {
+                                        Log.Error($"{modDevice.Text}鎺у埗瀛楀啓鍏�870澶辫触");
+                                        break;
+                                    }
+                                    // 鏀瑰彉浠诲姟鐘舵��
+                                    modTask.Status = TaskStatusEnum.Complete;
+                                    modTask.FinishDate = DateTime.Now;
+                                    modTask.Levels = 999;
+                                    _db.Updateable(modTask).ExecuteCommand();
+                                    //涓嬪彂浠诲姟鏃ュ織
+                                    HubUtil.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 TaskRequestWMS()
+                                        {
+                                            TaskNo = modTask.TaskNo,
+                                            PalletNo = modTask.PalletNo,
+                                            TaskType = ((int)TaskTypeEnum.Move).ToString(),
+                                            TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
+                                        };
+                                        HttpService httpService = new HttpService();
+                                        var modResponseTask = httpService.RequestTask(requestMode).Result;
+                                        if (modResponseTask.StatusCode == 0)
+                                        {
+                                            modcTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
+                                            //淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
+                                        }
+                                        else
+                                        {
+                                            Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+                                        }
+                                    }
+                                    // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
+                                    //涓嬪彂浠诲姟鏃ュ織
+                                    HubUtil.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($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿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();
+                    HubUtil.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();
+                        //涓嬪彂浠诲姟鏃ュ織
+                        HubUtil.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();
+                        HubUtil.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($"銆愬爢鍨涙満銆戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿TaskNo}");
                         break;
                     }
-                    if (modTask.TaskType.Value == TaskTypeEnum.In)
+                    modTask.Status = TaskStatusEnum.Exception;
+                    _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+                    HubUtil.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));
+
+                        PlcTaskInfo taskInfo = new PlcTaskInfo();
+                        taskInfo = PLCCommon.GetEndPai(modTask.EndRoadway.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
+                                        modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
+                                        modTask.EndLocate.Substring(6, 2));
+
+                        // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+                        var listResult = new List<Result>();
+                        // 浠诲姟鍙锋墭鐩樺彿
+                        modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+                        listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+                        modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+                        listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+                        // 鐩爣鏀捐揣宸ヤ綅(鍥哄畾鎺掑垪灞�)
+                         modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鎺�");
+                        listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, taskInfo.EndPai));
+                        modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "鏀捐揣鍒�");
+                        listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, taskInfo.EndLie));
+                        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))
                         {
-                            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();
+                            //涓嬪彂浠诲姟鏃ュ織
+                            HubUtil.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();
-                        //閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
-                        //if (TaskAction.refresh)
-                        //{
-                        //    wSChat.AlarmInformation("1");
-                        //}
 
                     }
-                    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();
-                        //閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
-                        //if (TaskAction.refresh)
-                        //{
-                        //    wSChat.AlarmInformation("1");
-                        //}
-                    }
-                }
-                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();
-                                    // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
-                                    //if (TaskAction.refresh)
-                                    //{
-                                    //    wSChat.AlarmInformation("1");
-                                    //}
-                                }
-                                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();
-
-                                // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
-                                //if (TaskAction.refresh)
-                                //{
-                                //    wSChat.AlarmInformation("1");
-                                //}
-                                //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:
@@ -449,11 +758,1002 @@
         }
     }
     /// <summary>
+    /// 涓嶇┖璺�
+    /// </summary>
+    /// <param name="modTask">鎿嶄綔瀹屾垚鐨勪换鍔�</param>
+    /// <param name="plcConn">plc杩炴帴</param>
+    /// <param name="modDevice">璁惧淇℃伅</param>
+    private static void ContinuousOperation(WcsTask modTask, PLCUtil plcConn, WcsDeviceDto modDevice)
+    {
+        // 鏌ヨ鎵�鏈夊緟鎵ц鐨勪换鍔�
+        var listTask = _db.Queryable<WcsTask>().Where(s => s.Status == TaskStatusEnum.Wait).ToList();
+        WcsTask modNextTask = null;
+        switch (modTask.TaskType)
+        {
+            case TaskTypeEnum.In:
+                {
+                    // 鍏堟壘鍑哄搴旀帓鍒楀眰鐨勫叆搴撲换鍔�
+                    var listInTask = listTask.Where(s => s.TaskType == TaskTypeEnum.In)
+                                             .Select(s => s.EndLocate.Substring(0, 6))
+                                             .ToHashSet();
+
+                    // 鎵惧嚭搴撲换鍔★紝瀵瑰簲宸烽亾鐨勪换鍔�
+                    var listNextTask = listTask.Where(s => s.TaskType == TaskTypeEnum.Out && s.StartRoadway == modTask.EndRoadway).ToList();
+
+                    foreach (var modNext in listNextTask)
+                    {
+                        // 濡傛灉鏈夊搴旀帓鍒楀眰鐨勫叆搴撲换鍔★紝閭e氨涓嶈兘浼樺厛鎵ц
+                        if (listInTask.Contains(modNext.EndLocate.Substring(0, 6)))
+                        {
+                            continue;
+                        }
+
+                        // todo: 鍐欏叆modNext浠诲姟淇℃伅缁檖lc
+                        Console.WriteLine($"鍏ュ簱浠诲姟{modTask.TaskNo}鎵ц瀹屾垚鍚庯紝涓嶇┖璺戦�昏緫妫�娴嬩笅涓�浠诲姟涓簕modNext.TaskNo}");
+                        modNextTask = modNext;
+                        break;
+                    }
+                }
+                break;
+            case TaskTypeEnum.Out:
+                {
+                    // 鍏堟壘鍑哄搴旀帓鍒楀眰鐨勫嚭搴撲换鍔�
+                    var listInTask = listTask.Where(s => s.TaskType == TaskTypeEnum.Out)
+                                             .Select(s => s.EndLocate.Substring(0, 6))
+                                             .ToHashSet();
+
+                    // 鎵惧叆搴撲换鍔★紝瀵瑰簲宸烽亾鐨勪换鍔�
+                    var listNextTask = listTask.Where(s => s.TaskType == TaskTypeEnum.In && s.StartRoadway == modTask.EndRoadway).ToList();
+
+                    foreach (var modNext in listNextTask)
+                    {
+                        // 濡傛灉鏈夊搴旀帓鍒楀眰鐨勫嚭搴撲换鍔★紝閭e氨涓嶈兘浼樺厛鎵ц
+                        if (listInTask.Contains(modNext.EndLocate.Substring(0, 6)))
+                        {
+                            continue;
+                        }
+
+                        // todo: 鍐欏叆modNext浠诲姟淇℃伅缁檖lc
+                        Console.WriteLine($"鍑哄簱浠诲姟{modTask.TaskNo}鎵ц瀹屾垚鍚庯紝涓嶇┖璺戦�昏緫妫�娴嬩笅涓�浠诲姟涓簕modNext.TaskNo}");
+                        modNextTask = modNext;
+                        break;
+                    }
+                }
+                break;
+            case TaskTypeEnum.Move:
+                {
+                    var modDevicePos = _db.Queryable<WcsDevice>().Where(s => s.PlcId == plcConn.PlcId && s.DeviceType == DeviceTypeEnum.Show).First();
+                    var (result, value) = plcConn.GetPlcDBValue(modDevicePos.PosType, modDevicePos.DbNumber, modDevicePos.PlcPos);
+                    //褰撳墠鍫嗗灈鏈烘墍鍦ㄤ綅缃�
+                    var height = Math.Round(value / 790000d * 200).ToInt();
+                    //todo:杩欓噷鐪嬭兘涓嶈兘鎵惧埌鍫嗗灈鏈烘墍鍦ㄤ綅缃湪鍝釜鎺掑垪灞傦紝浼樺厛瀵绘壘闄勮繎鐨勪换鍔★紵
+                }
+                break;
+        }
+        if (modNextTask != null)
+        {
+            // 鑾峰彇杞崲鍚庣殑璧峰鎺掑垪灞� 06010101
+            PlcTaskInfo startTaskInfo = PLCCommon.GetEndPai(modTask.StartRoadway.Substring(1, 2), modTask.StartLocate.Substring(2, 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));
+            // 鐩爣鏀捐揣宸ヤ綅(鍥哄畾鎺掑垪灞�)
+            PlcTaskInfo taskInfo = PLCCommon.GetCTaskInfo(modTask.EndLocate, ((int)modTask.TaskType).ToString(),
+                        modTask.StartRoadway, modTask.EndRoadway);
+            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))
+            {
+                // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
+                var ret = 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();
+                HubUtil.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();
+                //涓嬪彂浠诲姟鏃ュ織
+                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                //淇敼led灞忎俊鎭�
+                //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+            }
+        }
+    }
+
+    /// <summary>
     /// 杈撻�佺嚎涓氬姟澶勭悊
     /// </summary>
     /// <param name="modDevice"></param>
     private static void ConveyorLine(WcsDeviceDto modDevice)
     {
+        var plcConn = modDevice.PLCUtil;
+        // 鑾峰彇妤煎眰鏁癱eshi
+        var louCeng = PLCCommon.GetRoadwayByStationNew(modDevice.StationNum);
+        if (louCeng == "") 
+        {
+            return;
+        }
+        var ledText = "";
+        switch (modDevice.Value.ToString())
+        {
+            case "320":
+                {
+                    // 鐢宠宸烽亾
+                    string strMsg = "";
+                    string taskModel = "";
+
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    if (!res.IsSucceed)
+                    {
+                        break;
+                    }
+                    var modPosEndLocat = modDevice.listStation.FirstOrDefault(s => s.Text == "鐩殑宸ヤ綅");
+                   
+
+                    //鍒ゆ柇鍏ュ簱閿佸畾鏄惁鎵撳紑
+                    if (PLCTaskAction.boEnterLock)
+                    {
+                        var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                        if (res350.IsSucceed && palletVal350 != "350") 
+                        {
+                            ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+                            ledText += $"鎵樼洏鍙�:{palletVal}\n";
+                            ledText += $"鍏ュ簱浠诲姟宸查攣瀹氾紝璇疯В閿佸悗閲嶈瘯!\n";
+                            LedDisplay(modDevice.LedIP, ledText);
+                        }
+
+                        // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+                        if (ret.IsSucceed) 
+                        {
+                            plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+                        }
+                        
+                        break;
+                    }
+
+                    if (palletVal == null) 
+                    {
+                        var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                        if (res350.IsSucceed && palletVal350 != "350")
+                        {
+                            ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+                            ledText += $"鎵樼洏鍙�:{palletVal}\n";
+                            ledText += $"鎵弿鎵樼洏鍙峰け璐�!\n";
+                            LedDisplay(modDevice.LedIP, ledText);
+                        }
+
+                        // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+                        if (ret.IsSucceed)
+                        {
+                            plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+                        }
+                       
+                        break;
+                    }
+
+                    var http = new HttpService();
+                    string TaskNo = "", EndLocate = "";
+
+                    //鏍规嵁宸ヤ綅鍒ゆ柇鏄惁涓哄彔鎵樻満宸ヤ綅鐢宠绌烘墭鐩樿泛鍏ュ簱锛屾槸锛氬悜WMS鐢宠绌烘墭鐩樿泛缁勬墭
+                    string groupMsg = "";
+                    if (modDevice.StationNum == "27")
+                    {
+                        var Qty = plcConn.GetPlcDBValue(PLCDataTypeEnum.Int,"DB135.0").ToString();//鑾峰彇鍙犳墭鏈哄彔鎵樻暟閲�
+                        groupMsg = http.BindPlnInHouseWcs(Qty, palletVal);
+
+                        if (!groupMsg.Contains("-1"))
+                        {
+                            var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                            if (res350.IsSucceed && palletVal350 != "350")
+                            {
+                                ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+                                ledText += $"鎵樼洏鍙�:{palletVal}\n";
+                                ledText += $"{strMsg}\n";
+                                LedDisplay(modDevice.LedIP, ledText);
+                            }
+
+                            // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+                            if (ret.IsSucceed)
+                            {
+                                plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+                            }
+                        }
+                        break;
+                    }
+                    string IsBale = "0";
+                    strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo);
+
+                    if (!strMsg.Contains("-1"))
+                    {
+                        // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+                        var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
+                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
+
+                        // 鍐欏叆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();
+
+                            //鍒ゆ柇鏄惁瑁瑰寘
+                            var gbPos = modDevice.listStation.FirstOrDefault(s => s.Text == "Element_1");
+                            strMsg = new HttpService().RequestPackWcs(palletVal);
+                            if (strMsg == "1")
+                            {
+                                //鍐欏叆瑁瑰寘鎸囦护
+                                ret = plcConn.SetPlcDBValue(gbPos.PosType, modDevice.DbNumber, gbPos.PlcPos, "2");
+                            }
+                            else
+                            {
+                                ret = plcConn.SetPlcDBValue(gbPos.PosType, modDevice.DbNumber, gbPos.PlcPos, "1");
+                            }
+
+                            // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            // led鏄剧ず鍐呭
+                            try
+                            {
+                                ledText += $"浠诲姟绫诲瀷:{taskInfo.TaskType.GetDescription()}\n\n";
+
+                                ledText += $"浠诲姟鍙�:{taskInfo.TaskNo}\n";
+                                ledText += $"鎵樼洏鍙�:{taskInfo.PalletNo}\n\n";
+
+                                ledText += $"璧峰浣�:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
+                                ledText += $"鐩爣浣�:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
+                                LedDisplay(modDevice.LedIP, ledText);
+                                
+                            }
+                            catch (Exception ex)
+                            {
+                                Log.Error(ex.Message);
+                            }
+                            
+                        }
+
+                    }
+                    else
+                    {
+                        var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                        if (res350.IsSucceed && palletVal350 != "350")
+                        {
+                            ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+                            ledText += $"鎵樼洏鍙�:{palletVal}\n";
+                            ledText += $"{strMsg}\n";
+                            LedDisplay(modDevice.LedIP, ledText);
+                        }
+
+                        // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+                        if (ret.IsSucceed)
+                        {
+                            plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+                        }
+                    }
+                }
+                break;
+            case "330":
+                {
+                    // 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
+
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    if (!res.IsSucceed)
+                    {
+                        break;
+                    }
+                    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);
+                    if (modTask == null)
+                    {
+                        // 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
+                        break;
+                    }
+                    //鍒ゆ柇鍏ュ簱閿佸畾鏄惁鎵撳紑
+                    if (PLCTaskAction.boEnterLock)
+                    {
+                        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 == "浠诲姟绫诲瀷");
+                    var taskTypeStr = (int)modTask.TaskType;
+                    listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, modDevice.DbNumber, modPosTaskType.PlcPos, taskTypeStr.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");
+
+                        // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.StartLocate).Select(s => s.LedIP).First();
+
+                        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();
+
+                            // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                        }
+                    }
+
+                }
+                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);
+                    if (!res.IsSucceed)
+                    {
+                        break;
+                    }
+                    var http = new HttpService();
+                    string TaskNo = "";
+                    // 鍚慦MS鐢宠鍌ㄤ綅淇℃伅
+                    strMsg = http.RequestLocate(palletVal, modDevice.StationNum, taskModel, roadway, ref TaskNo);
+
+                    if (!strMsg.Contains("-1"))
+                    {
+                        // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+                        var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == TaskNo);
+                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.StartLocate).Select(s => s.LedIP).First();
+                        // 鍐欏叆娴佺▼瀛� 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();
+
+                            // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                            
+                            var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+                            ledText += $"浠诲姟绫诲瀷:{taskInfo.TaskType.GetDescription()}\n\n";
+                            ledText += $"浠诲姟鍙�:{taskInfo.TaskNo}\n";
+                            ledText += $"鎵樼洏鍙�:{taskInfo.PalletNo}\n\n";
+                            ledText += $"璧峰浣�:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
+                            ledText += $"鐩爣浣�:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
+                            LedDisplay(modDevice.LedIP, ledText);
+                        }
+                    }
+                    else
+                    {
+                        // 鐢宠鍌ㄤ綅澶辫触锛丩ED鏄剧ず
+                        Log.Error(string.Format($"鐢宠鍌ㄤ綅澶辫触:{strMsg},璇诲啓plc閿欒"));
+                        // led鏄剧ず鍐呭
+                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
+                        ledText += $"鐢宠鍏ュ簱澶辫触\n\n";
+                        ledText += $"{strMsg}\n";
+                        LedDisplay(modDevice.LedIP, ledText);
+                    }
+
+                }
+                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);
+                    if (!res.IsSucceed || !taskRes.IsSucceed)
+                    {
+                        break;
+                    }
+                    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))
+                    {
+                        //闇�鍔犱笂LED鏄剧ず
+                        Log.Error(string.Format($"鏍规嵁宸烽亾鑾峰彇璺烘満IP澶辫触锛岃鑱旂郴绠$悊鍛�"));
+                        break;
+                    }
+                    // 璺烘満杩炴帴
+                    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;
+                        }
+
+                        // 杞崲鐩爣宸ヤ綅鎺掑垪灞� 03010301
+                        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 djmodel = _db.Queryable<WcsPlc>().First(m => m.IP == sInfo.Ip);
+
+                        var djMod = PLCTaskAction.plcDevices.First(m => m.PlcId == djmodel.Id
+                            && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
+                        var djInfos = PLCTaskAction.plcPositions.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 (!djRes.IsSucceed || djVal.ToString() != "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 == "浠诲姟绫诲瀷");
+                        var taskTypeStr = (int)modTask.TaskType;
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosTaskType.PosType, djMod.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
+                        var modPosPalletNo = djInfos.FirstOrDefault(s => s.Text == "鎵樼洏鐮�");
+                        listResult.Add(plcStackeConn.SetPlcDBValue(modPosPalletNo.PosType, djMod.DbNumber, modPosPalletNo.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();
+                                //涓嬪彂浠诲姟鏃ュ織
+                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                break;
+
+                            }
+                            modInsertTaskMonitor.InteractiveMsg = $"璺烘満鍐欏叆鎸囦护830锛歿modDevice.StationNum}宸ヤ綅====銆�" + modTask.EndLocate + "鍌ㄤ綅鍦板潃!";
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                            if (PLCTaskAction.boRefresh)
+                            {
+                                //涓嬪彂浠诲姟鏃ュ織
+                                HubUtil.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();
+
+                        // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+
+                        // 鏍规嵁浠诲姟鍙疯幏鍙栬捣濮嬪伐浣嶅湴鍧�锛屾牴鎹捣濮嬪伐浣嶅湴鍧�鑾峰彇LEDIP 鎺ㄩ�佸埌LED灞忓箷銆�
+                        var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == modInsertTaskMonitor.TaskNo);
+                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.EndLocate).Select(s => s.LedIP).First();
+
+                        // led鏄剧ず鍐呭
+                        // 鏍规嵁鐩爣宸ヤ綅鍙疯幏鍙栧搴旂殑LEDIP鍦板潃
+                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId == modDevice.PlcId);
+                        
+                        ledText += $"鍑哄簱瀹屾垚\n\n";
+                        ledText += $"浠诲姟鍙�:{taskInfo.TaskNo}\n";
+                        ledText += $"鎵樼洏鍙�:{taskInfo.PalletNo}\n\n";
+                        ledText += $"璧峰浣�:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
+                        ledText += $"鐩爣浣�:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
+                        LedDisplay(ledDevice.LedIP, ledText);
+                    }
+                    // 鍙嶉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);
+
+                        string tasknoVal = taskVal.ToString();
+                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
+                        if (modTask == null)
+                        {
+                            Log.Error(string.Format("杈撻�佺嚎440:鏈壘鍒板搴旂殑浠诲姟銆�"));
+                            break;
+                        }
+                        // 鏀瑰彉浠诲姟鐘舵��
+                        modTask.Status = TaskStatusEnum.Complete;
+                        modTask.FinishDate = DateTime.Now;
+                        modTask.Levels = 999;
+                        _db.Updateable(modTask).ExecuteCommand();
+                        HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                        // 鎻掑叆浠诲姟鏄庣粏 
+                        var modInsertTaskMonitor = new WcsTaskMonitor()
+                        {
+                            TaskNo = modTask.TaskNo,
+                            PlcId = modDevice.Id,
+                            PlcName = modDevice.Text,
+                            InteractiveMsg = $"鍐欏叆鎸囦护450锛歿modDevice.StationNum}鍑哄簱瀹屾垚",
+                            PalletNo = palletVal,
+                            Status = TaskStatusEnum.Complete,
+                            StartLocat = starVal.ToString(),
+                            EndLocat = modDevice.StationNum,
+                        };
+                        if (modTask.Origin == "WMS")
+                        {
+                            // 鍙嶉WMS
+                            var requestMode = new TaskRequestWMS()
+                            {
+                                TaskNo = modTask.TaskNo + modTask.EndLocate ,
+                                PalletNo = modTask.PalletNo,
+                                TaskType = ((int)TaskTypeEnum.Out).ToString(),
+                                TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
+                            };
+                            HttpService httpService = new HttpService();
+                            var modResponseTask = httpService.RequestTask(requestMode).Result;
+                            if (modResponseTask.StatusCode == 0)
+                            {
+                                modInsertTaskMonitor.InteractiveMsg += "锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
+                            }
+                            else
+                            {
+                                Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+                            }
+                        }
+
+                        // 鎻掑叆浜や簰鏃ュ織
+                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                        // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        // led鏄剧ず鍐呭
+                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId == modDevice.PlcId);
+                        
+                        ledText += $"鍑哄簱瀹屾垚\n\n";
+                        ledText += $"浠诲姟鍙�:{modTask.TaskNo}\n";
+                        ledText += $"鎵樼洏鍙�:{modTask.PalletNo}\n\n";
+                        ledText += $"璧峰浣�:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
+                        ledText += $"鐩爣浣�:{modTask.EndRoadway + " " + modTask.EndLocate}";
+                        LedDisplay(ledDevice.LedIP, ledText);
+                    }
+                    #endregion
+                }
+                break;
+
+            #endregion
+
+            #region 鍙┖鎵樼洏璺�
+            case "50":
+                // plc鐢宠绌烘墭
+                {
+                    // 闃叉閲嶅鍙┖鎵樿泛
+                    var (res, palletVal) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos);
+                    if (palletVal != 0) 
+                    {
+                        break;
+                    }
+
+                    // 璋冪敤WMS绌烘墭鍑哄簱鎺ュ彛锛岃繑鍥炲嚭搴撲换鍔″瓨鍏ュ嚭搴撹〃
+                    var strMsg = "";
+                    var http = new HttpService();
+                    strMsg = http.IssuePlnOutHouseWcs("1", "205");
+                    if (!strMsg.Contains("-1"))
+                    {
+                        // 鍐欏叆plc娴佺▼瀛�60
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "60");
+                    }
+                    else
+                    {
+                        // 鐢宠宸烽亾澶辫触锛丩ED鏄剧ず
+                        Log.Error(string.Format($"宸ヤ綅鍙凤細{modDevice.StationNum}鐢宠绌烘墭璺哄け璐�:{strMsg};"));
+                    }                    
+                }
+                break;
+            case "80":
+                // 绌烘墭鐩樿泛宸插埌浣�
+                {
+                    // 璋冪敤wms浠诲姟鍑哄簱浠诲姟瀹屾垚
+                    // 鑾峰彇璺烘満鐐逛綅閰嶇疆
+                    var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                    var (res, val) = plcConn.GetPlcDBValue(modPosTask.PosType, 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 == false);
+                        if (modTask == null)
+                        {
+                            //Log.Error(string.Format($"宸ヤ綅鍙凤細{modDevice.StationNum}绌烘墭鐩樺埌杈撅紝鏈壘鍒板搴旂殑浠诲姟!浠诲姟鍙穥tasknoVal};"));
+                            break;
+                        }
+                        // 鍐欏叆plc娴佺▼瀛�90
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "90");
+                        if (ret.IsSucceed)
+                        {
+                            // 鏀瑰彉浠诲姟鐘舵��
+                            modTask.Status = TaskStatusEnum.Complete;
+                            modTask.FinishDate = DateTime.Now;
+                            modTask.Levels = 999;
+                            _db.Updateable(modTask).ExecuteCommand();
+
+                            HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
+                            var modTaskMonitor = 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 TaskRequestWMS()
+                                {
+                                    TaskNo = modTask.TaskNo + modTask.EndLocate ,
+                                    PalletNo = modTask.PalletNo,
+                                    TaskType = ((int)TaskTypeEnum.Out).ToString(),
+                                    TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
+                                };
+                                HttpService httpService = new HttpService();
+                                var modResponseTask = httpService.RequestTask(requestMode).Result;
+                                if (modResponseTask.StatusCode == 0)
+                                {
+                                    modTaskMonitor.InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚";
+                                }
+                                else
+                                {
+                                    Log.Error(string.Format("浠诲姟鍙嶉澶辫触锛歋tatusCode锛歿0};Msg锛歿1}", modResponseTask.StatusCode, modResponseTask.Msg));
+                                }
+                            }
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modTaskMonitor).ExecuteCommand();
+                            //涓嬪彂浠诲姟鏃ュ織
+                            HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                        }
+                    }                    
+                }
+                break;
+            #endregion
+            case "10":
+                {
+                    #region 缂犺啘瀹屾垚 
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var strMsg = "";
+                    var http = new HttpService();
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+
+                    //鍚慦MS鍙嶉鎵樼洏缂犺啘瀹屾垚
+                    strMsg = http.RequestPackedWcs(palletVal);
+                    if (!strMsg.Contains("-1"))
+                    {
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "11");//鏀跺埌缂犺啘瀹屾垚11
+                        if (ret.IsSucceed)
+                        {
+                            // 鎻掑叆浠诲姟鏄庣粏 
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护11锛歿modDevice.StationNum}宸ヤ綅缂犺啘瀹屾垚",
+                                PalletNo = palletVal,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum
+                            };
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                        }
+                    }
+                    else
+                    {
+                         
+                    }
+                    #endregion
+                }
+                break;
+            case "20":
+                {
+                    #region 鏄惁鎷嗚啘    21锛氬惁 22锛氭槸 
+                    // 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
+                    var strMsg = "";
+                    var http = new HttpService();
+                    var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                    var (res, palletVal) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
+                    // 鑾峰彇鎵樼洏浠诲姟鍙�
+                    var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                    var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+                    // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�,鐩殑宸ヤ綅鏄�009鐨勫啀鍚慦MS鍙戝嚭鎷嗚啘鐢宠
+                    if (res1.IsSucceed)
+                    {
+                        string tasknoVal = val.ToString();
+                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+                        if (modTask == null)
+                        {
+                            break;
+                        }
+                    }
+
+                    strMsg = http.RequestUnPackWcs(palletVal);
+                    if (!strMsg.Contains("-1"))
+                    {
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "22");
+                        if (ret.IsSucceed)
+                        {
+                            // 鎻掑叆浠诲姟鏄庣粏 
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护22锛歿modDevice.StationNum}宸ヤ綅闇�瑕佹媶鑶�",
+                                PalletNo = palletVal,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum
+                            };
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                        }
+                    }
+                    else
+                    {
+                        var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "21");
+                        if (ret.IsSucceed)
+                        {
+                            // 鎻掑叆浠诲姟鏄庣粏 
+                            var modInsertTaskMonitor = new WcsTaskMonitor()
+                            {
+                                PlcId = modDevice.Id,
+                                PlcName = modDevice.Text,
+                                InteractiveMsg = $"鍐欏叆鎸囦护21锛歿modDevice.StationNum}宸ヤ綅涓嶉渶瑕佹媶鑶�",
+                                PalletNo = palletVal,
+                                Status = TaskStatusEnum.Complete,
+                                StartLocat = modDevice.StationNum
+                            };
+                            // 鎻掑叆浜や簰鏃ュ織
+                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                        }
+                    }
+
+
+                    #endregion
+                }
+                break;
+
+            default: break;
+        }
 
     }
     /// <summary>
@@ -470,57 +1770,1013 @@
     /// <param name="modDevice"></param>
     private static void PalletMachine(WcsDeviceDto modDevice)
     {
+        var plcConn = modDevice.PLCUtil;
+        switch (modDevice.Value.ToString()) 
+        {
+            case "220":
+                // 娉ㄩ噴1
+                {
+                    
+                }
+                break;
+            case "230":
+                // 娉ㄩ噴2
+                { 
+                
+                }
+                break;
+            case "240":
+                {
 
+                }
+                break;
+            default: break;
+        }
+    }
+
+    /// <summary>
+    /// 浠剁杈撻�佸拰鐮佸灈鏈哄櫒浜轰笟鍔″鐞�  閰嶇疆鐨勬槸浠剁杈撻��
+    /// </summary>
+    /// <param name="modDevice"></param>
+    private static async void BoxConveyorLine(WcsDeviceDto modDevice) 
+    {
+        var plcConn = modDevice.PLCUtil;
+
+        if (modDevice.DbNumber == "DB101")//&& modDevice.DbNumber == "DB102"&& (modDevice.DbNumber == "DB102"||modDevice.PlcIdIP == "10.18.51.110")
+        {
+            // 涓绘壂浜や簰娴佺▼
+            switch (modDevice.Value.ToString())
+            {
+                case "1":
+                    // 涓绘壂鐢宠鍒嗛亾 wcs鍐欏叆2
+                    {
+                        // 鍒ゆ柇鏄惁婕旂ず妯″紡 true锛氭紨绀烘ā寮�   false:鐢熶骇妯″紡
+                        if (PLCTaskAction.boDemo)   
+                        {
+                            // 閫氶亾鍙�
+                            var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
+
+                            // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
+                            var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
+                            if (ret.IsSucceed)
+                            {
+                                // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                if (!retVal.IsSucceed)
+                                {
+                                    Log.Error("婕旂ず妯″紡鍐欏叆鍒嗛亾鍙峰け璐�!");
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // 閫氶亾鍙�
+                            var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
+
+                            // 璇诲彇plc绠辩爜
+                            var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "绠辩爜");
+                            var (res, boxNo) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
+                            if (string.IsNullOrWhiteSpace(boxNo.ToString()))
+                            {
+                                // 绠辩爜涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
+                                var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                if (ret.IsSucceed)
+                                {
+                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                    if (retVal.IsSucceed)
+                                    {
+                                        Log.Error("绠辩爜涓簄ull杩涜鍓旈櫎");
+                                        break;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                // 鏍规嵁绠辩爜鑾峰彇绠卞唴淇℃伅
+                                string boxNoVal = boxNo.ToString();
+                                var boxInfo = _db.Queryable<WcsBoxInfo>().First(w => w.IsDelete == false && w.BoxNo == boxNoVal && string.IsNullOrEmpty(w.PalletNo));
+                                if (boxInfo == null)
+                                {
+                                    // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�
+                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                    if (ret.IsSucceed)
+                                    {
+                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                        if (retVal.IsSucceed)
+                                        {
+                                            Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
+                                            break;
+                                        }
+                                    }
+                                }
+
+
+                                // 楠岃瘉鏄惁闆剁
+                                if (boxInfo.BitBoxMark == "1")
+                                {
+                                    // 鏄浂绠辩洿鎺ュ墧闄わ紝杩涜浜哄伐缁勬墭
+                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                    if (ret.IsSucceed)
+                                    {
+                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                        if (retVal.IsSucceed)
+                                        {
+                                            Log.Error("闆剁锛岃繘琛屽墧闄ゃ��");
+                                            break;
+                                        }
+                                    }
+                                    break;
+                                }
+
+
+                                // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
+                                var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
+                                if (checkTaskInfo == null)
+                                {
+                                    // 鍒ゆ柇鏄惁鍏宠仈鍗曟嵁 wcsordertask
+                                    var orderModel = _db.Queryable<WcsOderTask>()
+                                        .First(m => m.SkuNo == boxInfo.SkuNo && m.Status== TaskStatusEnum.Wait && m.LotNo == boxInfo.LotNo && m.IsDelete == false);
+                                    if (orderModel != null)
+                                    {
+                                        // 鏍规嵁boxinfo琛ㄤ骇绾垮瓧娈佃嚜鍔ㄧ粦瀹氬垎閬�(1绾夸骇鍝佸彧鑳界粦瀹氬埌8閬�)
+                                        if (boxInfo.LineNo != "1")
+                                        {// 缁戝畾鍒伴櫎8閬撳鍏朵粬閬�
+
+                                            // 鑾峰彇鏈粦瀹氶亾
+                                            var lineNoModels = _db.Queryable<WcsCheckTask>()
+                                                .Where(m => m.Status == "0" && m.LineNo != "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer).ToList();
+                                            if (lineNoModels.Count > 0)
+                                            {
+                                                // 鑾峰彇褰撳墠鐗╂枡鍝佺鍙�
+                                                var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
+                                                if (skuInfo == null)
+                                                {
+                                                    // 姝や骇鍝佽嫢娌¤瀹氬搧瑙勶紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+                                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                    if (ret.IsSucceed)
+                                                    {
+                                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                        if (retVal.IsSucceed)
+                                                        {
+                                                            Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                            break;
+                                                        }
+                                                    }
+                                                    break;
+                                                }
+
+                                                foreach (var lineNoModel in lineNoModels) 
+                                                {
+                                                    // 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
+                                                    var (respg, pzNo) = plcConn.GetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos);
+                                                    if (respg.IsSucceed)
+                                                    {
+                                                        if (pzNo != 0)
+                                                        {
+                                                            // plc姝ゅ垎閬撴湭瑙g粦
+                                                            break;
+                                                        }
+                                                        else 
+                                                        {
+                                                            // 鑷姩缁戝畾鍒嗛亾
+                                                            lineNoModel.OrderNo = orderModel.OrderNo;
+                                                            lineNoModel.LotNo = boxInfo.LotNo;
+                                                            lineNoModel.SkuNo = boxInfo.SkuNo;
+                                                            lineNoModel.SkuName = boxInfo.SkuName;
+                                                            lineNoModel.Qty = orderModel.Qty;
+                                                            lineNoModel.Status = "1";//宸茬粦瀹�
+                                                            lineNoModel.PZNo = skuInfo.PZNo;
+
+                                                            // 缁橮LC鍐欏叆鍝佽
+                                                            var ret = plcConn.SetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos, skuInfo.PZNo);
+                                                            if (ret.IsSucceed)
+                                                            {
+                                                                //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+                                                                _db.Updateable(lineNoModel).ExecuteCommand();
+                                                                //鏇存柊WcsOderTask琛�
+                                                                orderModel.Status = TaskStatusEnum.Doing;
+                                                                _db.Updateable(orderModel).ExecuteCommand();
+                                                                // Liudl 閫氱煡鍓嶇鏇存柊鍒嗘嫞浠诲姟
+                                                                //涓嬪彂鍒嗘嫞浠诲姟
+                                                                HubUtil.PublicCheckTask(lineNoModel.Adapt<WcsDeviceTaskOrderDto>());
+                                                                break;
+                                                            }
+                                                            else
+                                                            {
+                                                                throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+                                                            }
+                                                        }
+                                                    }
+                                                    else 
+                                                    {
+                                                        // 璇诲彇plc澶辫触
+                                                        break;
+                                                    }
+                                                }
+
+                                            }
+                                            else 
+                                            {
+                                                // 鑻ユ病鏈夌┖闂查亾锛岃繘琛屽墧闄ゅ鐞嗐�傞槻姝㈠牭濉炰欢绠辩嚎
+                                                var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                if (ret.IsSucceed)
+                                                {
+                                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                    if (retVal.IsSucceed)
+                                                    {
+                                                        Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                        break;
+                                                    }
+                                                }
+                                                break;
+                                            }
+                                        }
+                                        else 
+                                        {// 缁戝畾鍒�8閬�
+                                         // 鑾峰彇鏈粦瀹氶亾
+                                            var lineNo8Model = _db.Queryable<WcsCheckTask>()
+                                                .First(m => m.Status == "0" && m.LineNo == "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer);
+                                            if (lineNo8Model != null)
+                                            {
+                                                // 鑾峰彇褰撳墠鐗╂枡鍝佺鍙�
+                                                var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
+                                                if (skuInfo == null)
+                                                {
+                                                    // 姝や骇鍝佽嫢娌¤瀹氬搧瑙勶紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+                                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                    if (ret.IsSucceed)
+                                                    {
+                                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                        if (retVal.IsSucceed)
+                                                        {
+                                                            Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                            break;
+                                                        }
+                                                    }
+                                                    break;
+                                                }
+
+
+                                                // 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
+                                                var (respg, pzNo) = plcConn.GetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos);
+                                                if (respg.IsSucceed)
+                                                {
+                                                    if (pzNo != 0)
+                                                    {
+                                                        // plc姝ゅ垎閬撴湭瑙g粦
+                                                        break;
+                                                    }
+                                                    else
+                                                    {
+                                                        // 鑷姩缁戝畾鍒嗛亾
+                                                        lineNo8Model.OrderNo = orderModel.OrderNo;
+                                                        lineNo8Model.LotNo = boxInfo.LotNo;
+                                                        lineNo8Model.SkuNo = boxInfo.SkuNo;
+                                                        lineNo8Model.SkuName = boxInfo.SkuName;
+                                                        lineNo8Model.Qty = orderModel.Qty;
+                                                        lineNo8Model.Status = "1";//宸茬粦瀹�
+                                                        lineNo8Model.PZNo = skuInfo.PZNo;
+
+                                                        // 缁橮LC鍐欏叆鍝佽
+                                                        var ret = plcConn.SetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos, skuInfo.PZNo);
+                                                        if (ret.IsSucceed)
+                                                        {
+                                                            //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+                                                            _db.Updateable(lineNo8Model).ExecuteCommand();
+                                                            //鏇存柊WcsOderTask琛�
+                                                            orderModel.Status = TaskStatusEnum.Doing;
+                                                            _db.Updateable(orderModel).ExecuteCommand();
+
+                                                            // Liudl 閫氱煡鍓嶇鏇存柊鍒嗘嫞浠诲姟
+                                                            //涓嬪彂鍒嗘嫞浠诲姟
+                                                            HubUtil.PublicCheckTask(lineNo8Model.Adapt<WcsDeviceTaskOrderDto>());
+                                                            break;
+                                                        }
+                                                        else
+                                                        {
+                                                            throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+                                                        }
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    // 璇诲彇plc澶辫触
+                                                    break;
+                                                }
+                                                
+
+                                            }
+                                            else
+                                            {
+                                                // 娌℃湁绌洪棽閬擄紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+                                                var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                if (ret.IsSucceed)
+                                                {
+                                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                    if (retVal.IsSucceed)
+                                                    {
+                                                        Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                        break;
+                                                    }
+                                                }
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    else 
+                                    {
+                                        // 涓嶅叧鑱斿崟鎹洿鎺ヨ繘琛屽墧闄ゅ鐞�
+                                        var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                        if (ret.IsSucceed)
+                                        {
+                                            // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                            var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                            if (retVal.IsSucceed)
+                                            {
+                                                Log.Error("绠辩爜鏈粦瀹氬垎鎷d换鍔★紝杩涜鍓旈櫎銆�");
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    // 涓巔lc浜や簰鍐欏叆鍒嗛亾鍙峰拰娴佺▼鎺у埗瀛�
+                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, checkTaskInfo.LineNo);
+                                    if (ret.IsSucceed)
+                                    {
+                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                        if (retVal.IsSucceed)
+                                        {
+                                            {  // liudl 姝ゆ绋嬪簭涓嶄細鎵ц 纭鍚庣洿鎺ュ垹闄�
+                                                if (modDevice.DbNumber == "DB102")//1L鎷嗚泛鍒嗘嫞鍚庨渶瑕佸洖浼犵鐮�
+                                                {
+                                                    var http = new HttpService();
+                                                    IsBaleModel2 ret1 = http.RequestBoxno(boxNoVal);
+                                                    if (ret1.Success == -1)
+                                                    {
+                                                        Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細"+boxNoVal);
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    break;
+                default: break;
+            }
+        }
+        else  
+        {
+            // 鎻掔爜浜や簰
+            switch (modDevice.Value.ToString()) 
+            {
+                case "1":
+                    // 鎵樼洏鏉$爜鍙
+                    {
+                        // 鑾峰彇鎵樼洏鏉$爜閰嶇疆
+                        var modPalletNo = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鏉$爜");
+                        // 璇诲彇PLC鎵樼洏鏉$爜鍙�
+                        var (res, palletVal) = plcConn.GetPlcDBValue(modPalletNo.PosType, modDevice.DbNumber, modPalletNo.PlcPos);
+                        string palletNo = palletVal.ToString();
+                        if (string.IsNullOrEmpty(palletNo)) 
+                        {
+                            Log.Error(string.Format("{0}锛岃鍙栫殑鎵樼洏鍙蜂负null", modDevice.Text));
+                            break;
+                        }
+
+                        // 鏍规嵁宸ヤ綅鍙峰皢鎵樼洏鍙蜂繚瀛樺湪鍒嗛亾琛�
+                        var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
+                        if (checkTaskMedel == null) 
+                        {
+                            Log.Error(string.Format("鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栧垎閬撳け璐�!", modDevice.StationNum));
+                            break;
+                        }
+                        checkTaskMedel.PalletNo = palletNo;
+                        var rowCount = _db.Updateable(checkTaskMedel).ExecuteCommand();
+                        if (rowCount > 0 ) 
+                        {
+                            // plc鍐欏叆璇诲彇鎴愬姛琛ㄧず 2
+                            var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                            if (retVal.IsSucceed) 
+                            {
+                                // liudl  姝ゅ闇�娣诲姞
+                                // 閫氱煡鍒嗘嫞鐮佸灈椤垫洿鏂�
+                            }
+                        }
+                    }
+                    break;
+                case "20":
+                    // 鐢宠鎻掔爜
+                    {
+                        // 鑾峰彇鎵樼洏鏉$爜閰嶇疆
+                        var modAddCode = modDevice.listStation.FirstOrDefault(m => m.Text == "鎻掔爜缁撴灉");
+                        // 鍒ゆ柇鏄惁婕旂ず妯″紡 true锛氭紨绀烘ā寮�   false:鐢熶骇妯″紡
+                        if (PLCTaskAction.boDemo)
+                        {
+                            // 婕旂ず妯″紡鐩存帴鍐欏叆鎻掔爜缁撴灉 1锛氭垚鍔�
+                            var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
+                            break;
+                        }
+                        else 
+                        {
+                            // 鑾峰彇绠辨潯鐮�
+                            // 鑾峰彇绠辨潯鐮侀厤缃�
+                            var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "绠辨潯鐮�");
+                            var (res, boxVal) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
+                            string boxNo = boxVal.ToString();
+                            if (string.IsNullOrEmpty(boxNo)) 
+                            {
+                                Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮佷负null鎻掔爜澶辫触!璇蜂汉宸ュ己鍒剁粨鎵广��" );
+                                // 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
+                                var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
+                                
+                                break;
+                            }
+                            // 楠岃瘉绠辩爜琛ㄦ槸鍚﹀瓨鍦ㄦ绠辩爜
+                            var boxInfo = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.BoxNo == boxNo).ToList();
+                            if (boxInfo.Count == 0) 
+                            {
+                                Log.Error($"鐮佸灈宸ヤ綅{modDevice.StationNum}锛岀鐮亄boxNo}涓嶅瓨鍦�!璇蜂汉宸ュ己鍒剁粨鎵广��");
+                                // 鍐欏叆鎻掑叆缁撴灉 2锛氭彃鐮佸け璐�
+                                var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
+                                break;
+                            }
+                            // 鑾峰彇褰撳墠鍒嗛亾鎵樼洏鍙�
+                            var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
+                            if (checkTaskMedel == null)
+                            {
+                                Log.Error(string.Format("鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栧垎閬撳け璐�!", modDevice.StationNum));
+                                break;
+                            }
+                            string palletNo = checkTaskMedel.PalletNo;
+                            if (string.IsNullOrEmpty(palletNo)) 
+                            {
+                                Log.Error(string.Format("鑾峰彇鐮佸灈宸ヤ綅{0}涓婄殑鎵樼洏鍙峰け璐ワ紒",modDevice.StationNum));
+                                break;
+                            }
+                            // 淇敼鎻掔爜琛�
+                            foreach (WcsBoxInfo item in boxInfo) 
+                            {
+                                item.PalletNo = palletNo;
+                                item.UpdateTime = DateTime.Now;
+                            }
+
+                            var rowCount = _db.Updateable(boxInfo).ExecuteCommand();
+                            Log.Information(string.Format("鎻掔爜鎴愬姛锛岀鐮佹槸锛�"+ boxNo, modDevice.StationNum));
+                            if (rowCount > 0)
+                            {
+                                // 鎻掔爜鎴愬姛
+                                var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "1");
+                                
+                                //鏄惁缁撴壒绠� 
+                                if (boxInfo[0].EndLotFlag == "1" && retVal.IsSucceed) 
+                                {
+                                    // 瑙﹀彂缁撴壒 鍒嗛亾鍙樹负缁撴壒涓�
+                                    AutoEndLot(boxInfo[0].LotNo, plcConn, "2");
+                                }
+                            }
+                            else 
+                            {
+                                // 鎻掔爜澶辫触
+                                Log.Error($"绠辩爜{boxNo};鐮佸灈宸ヤ綅{modDevice.StationNum}锛屾彃鐮佸け璐ワ紝璇峰己鍒剁粨鎵�");
+                                var retVal = plcConn.SetPlcDBValue(modAddCode.PosType, modDevice.DbNumber, modAddCode.PlcPos, "2");
+                                if (retVal.IsSucceed) 
+                                {
+                                    // 瑙﹀彂缁撴壒 涓嶈В缁戝垎閬�
+                                    AutoEndLot(boxInfo[0].LotNo, plcConn, "1");
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case "40":
+                    // 璇锋眰缁勬墭锛岀敵璇峰叆搴�
+                     {
+                        lock (OLock) 
+                        {
+                            // 鏍规嵁宸ヤ綅鍙凤紝鑾峰彇鎵樼洏鍙�
+                            var checkTaskMedel = _db.Queryable<WcsCheckTask>().First(m => m.Port == modDevice.StationNum && m.IsDelete == false);
+                            // 鏍规嵁宸ヤ綅鍙疯幏鍙� 鎵樼洏绾胯宸ヤ綅鍙风殑閰嶇疆淇℃伅
+                            var numModel = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId != modDevice.PlcId);
+                            var posModel = PLCTaskAction.plcPositions.First(m => m.DeviceId == numModel.Id && m.Text == "鐩殑宸ヤ綅" && m.IsDelete == false);
+                            if (checkTaskMedel == null)
+                            {
+                                Log.Error(string.Format("缁勬墭澶辫触鏍规嵁鐮佸灈宸ヤ綅{0}锛岃幏鍙栨墭鐩樺彿澶辫触!", modDevice.StationNum));
+
+                                // 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
+                                var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
+                                if (retVal.IsSucceed) 
+                                {
+                                    // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+                                    retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+                                }
+                                break;
+                            }
+
+                            // 鐮佸灈宸ヤ綅鎵樼洏鍙�
+                            string palletNo = checkTaskMedel.PalletNo;
+
+                            // 鏄惁婕旂ず妯″紡
+                            if (PLCTaskAction.boDemo)
+                            {
+                                // 鐩存帴绠眞ms鐢宠宸烽亾
+                                var http = new HttpService();
+                                string TaskNo = "", EndLocate = "";
+                                string strMsg = http.RequestRoadWay(palletNo, modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
+                                if (strMsg.Contains("-1"))
+                                {
+                                    Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
+                                    break;
+                                }
+                                else 
+                                {
+                                    // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
+                                    var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing));
+                                    if (taskModel != null) 
+                                    {
+                                        // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
+                                        string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
+
+                                        var listResult = new List<Result>();
+
+                                        // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+                                        listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue));    // 鐩爣宸ヤ綅
+                                        var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟鍙�" && s.IsDelete == false);
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
+                                        var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟绫诲瀷" && s.IsDelete == false);
+                                        var taskTypeStr = (int)taskModel.TaskType;
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
+
+                                        if (listResult.All(s => s.IsSucceed))
+                                        {
+                                            // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+                                            var retVal1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+                                            if (retVal1.IsSucceed)
+                                            {
+                                                // 灏嗗叆搴撲换鍔$敱姝e湪鎵ц鏀逛负姝e湪鎵ц
+                                                taskModel.Status = TaskStatusEnum.Doing;
+                                                _db.Updateable(taskModel).ExecuteCommand();
+
+                                                // 鎻掑叆浠诲姟鏄庣粏 
+                                                var modInsertTaskMonitor = new WcsTaskMonitor()
+                                                {
+                                                    TaskNo = TaskNo,
+                                                    PlcId = modDevice.Id,
+                                                    PlcName = modDevice.Text,
+                                                    InteractiveMsg = $"鍐欏叆鎸囦护50锛氱敵璇峰贩閬撴垚鍔�",
+                                                    PalletNo = palletNo,
+                                                    Status = TaskStatusEnum.Complete,
+                                                    StartLocat = modDevice.StationNum,
+                                                    EndLocat = strMsg,
+                                                };
+                                                // 鎻掑叆浜や簰鏃ュ織
+                                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                                // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                            }
+                                        }
+
+                                        //// 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+                                        //var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue);
+                                        //if (retVal.IsSucceed)
+                                        //{
+                                        //    // 鍐欏叆鐮佸灈浜や簰-缁勬墭鍥炲娴佺▼瀛�
+                                        //    retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+
+                                        //    // 灏嗗叆搴撲换鍔$敱姝e湪鎵ц鏀逛负姝e湪鎵ц
+                                        //    taskModel.Status = TaskStatusEnum.Doing;
+                                        //    _db.Updateable(taskModel).ExecuteCommand();
+                                        //}
+                                    }   
+                                }
+                            }
+                            else 
+                            {
+                                // 鏍规嵁鎵樼洏鍙凤紝灏嗙粍鎵樹俊鎭彃鍏oxinfolog琛� 骞跺垹闄oxinfo琛ㄦ暟鎹�
+                                var boxInfoList = _db.Queryable<WcsBoxInfo>().Where(w => w.IsDelete == false && w.PalletNo == palletNo).ToList();
+                                if (boxInfoList.Count <= 0)
+                                {
+                                    Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0}锛岀鐮佷俊鎭笉瀛樺湪", modDevice.StationNum));
+
+                                    // 鍐欏叆浜や簰宸ヤ綅鐩爣鍦板潃
+                                    var retVal = plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, "234");
+                                    if (retVal.IsSucceed)
+                                    {
+                                        // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+                                        retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+                                    }
+                                    break;
+                                }
+                                // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
+                                string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
+                                int insertCount = _db.Ado.ExecuteCommand(sqlStr);
+                                if (insertCount > 0)
+                                {
+                                    string sqlStr2 = $"delete from WCSBoxInfo where  IsDelete=0 and PalletNo='{palletNo}'";
+                                    _db.Ado.ExecuteCommand(sqlStr2);
+                                }
+                                
+                                // 鍚慦MS鐢宠宸烽亾
+                                var http = new HttpService();
+                                string TaskNo = "", EndLocate = "";
+                                string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo,palletNo, checkTaskMedel.BoxCount.ToDecimal(),"0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "","", boxInfoList, 
+                                    modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
+                                if (strMsg.Contains("-1"))
+                                {
+                                    Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
+                                    break;
+                                }
+                                else
+                                {
+                                    //鍒ゆ柇鏄惁缁撴壒涓�
+                                    var (res, jiepi) = plcConn.GetPlcDBValue(checkTaskMedel.PosType, modDevice.DbNumber, checkTaskMedel.PosLot);
+                                    if (jiepi == 2)//缁撴壒涓�
+                                    {
+                                        // 鍒嗛亾瑙g粦锛屾姄绠卞搧绉嶅啓鍏�0
+                                        var ret1 = plcConn.SetPlcDBValue(checkTaskMedel.PosTypeLot, modDevice.DbNumber, checkTaskMedel.PlcPos, "0");
+                                        if (ret1.IsSucceed)
+                                        {
+                                            //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟    liudl 鏈�鍚庝竴鎵樼洏鐢宠瀹屽叆搴撴墠鍙竻绌�
+                                            checkTaskMedel.OrderNo = "";
+                                            checkTaskMedel.TaskNo = "";
+                                            checkTaskMedel.LotNo = "";
+                                            checkTaskMedel.SkuNo = "";
+                                            checkTaskMedel.SkuName = "";
+                                            checkTaskMedel.BoxType = "";
+                                            checkTaskMedel.Qty = 0;
+                                            checkTaskMedel.PZNo = "";
+                                            checkTaskMedel.Status = "0";      // 缁戝畾鍒嗛亾 0锛氳В缁�  1锛氱粦瀹� 
+
+                                            //鏇存柊鍒嗘嫞浠诲姟
+                                            _db.Updateable(checkTaskMedel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+                                        }
+                                    }
+                                    // 鑾峰彇鍏ュ簱浠诲姟淇℃伅
+                                    var taskModel = _db.Queryable<WcsTask>().First(m => m.TaskNo == TaskNo && m.IsDelete == false && m.Status == TaskStatusEnum.Wait);
+                                    if (taskModel != null)
+                                    {
+                                        // 鑾峰彇鍏ュ簱鍙栬揣宸ヤ綅
+                                        string endLocatVlue = PLCCommon.RoadwayToStationNum(taskModel.EndRoadway, "2");
+
+                                        var listResult = new List<Result>();
+                                        // 鍐欏叆鎵樼洏杈撻�佺嚎鐮佸灈宸ヤ綅 鐩殑宸ヤ綅銆佷换鍔″彿锛屽啓鍏ヤ氦浜掓祦绋嬬粍鎵樻垚鍔� 鎵ц鍏ュ簱{鑻ラ渶瑕佸彲浠ュ啓鍏ヤ换鍔″彿绛夌瓑鍏朵粬淇℃伅}
+                                        listResult.Add(plcConn.SetPlcDBValue(posModel.PosType, numModel.DbNumber, posModel.PlcPos, endLocatVlue));    // 鐩爣宸ヤ綅
+                                        var modPosTask = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟鍙�" && s.IsDelete == false);
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, numModel.DbNumber, modPosTask.PlcPos, TaskNo));
+                                        var modPosTaskType = PLCTaskAction.plcPositions.First(s => s.DeviceId == numModel.Id && s.Text == "浠诲姟绫诲瀷" && s.IsDelete == false);
+                                        var taskTypeStr = (int)taskModel.TaskType;
+                                        listResult.Add(plcConn.SetPlcDBValue(modPosTaskType.PosType, numModel.DbNumber, modPosTaskType.PlcPos, taskTypeStr.ToString()));
+
+                                        if (listResult.All(s => s.IsSucceed))
+                                        {
+                                            // 鍐欏叆缁勬墭鍥炲娴佺▼瀛�
+                                            var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "50");
+                                            if (retVal.IsSucceed) 
+                                            {
+                                                // 灏嗗叆搴撲换鍔$敱姝e湪鎵ц鏀逛负姝e湪鎵ц
+                                                taskModel.Status = TaskStatusEnum.Doing;
+                                                _db.Updateable(taskModel).ExecuteCommand();
+
+                                                // 鎻掑叆浠诲姟鏄庣粏 
+                                                var modInsertTaskMonitor = new WcsTaskMonitor()
+                                                {
+                                                    TaskNo = TaskNo,
+                                                    PlcId = modDevice.Id,
+                                                    PlcName = modDevice.Text,
+                                                    InteractiveMsg = $"鍐欏叆鎸囦护50锛氱敵璇峰贩閬撴垚鍔�",
+                                                    PalletNo = palletNo,
+                                                    Status = TaskStatusEnum.Complete,
+                                                    StartLocat = modDevice.StationNum,
+                                                    EndLocat = strMsg,
+                                                };
+                                                // 鎻掑叆浜や簰鏃ュ織
+                                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                                // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                                                HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    break;
+                default:break;
+            }
+        }        
+    }
+
+    /// <summary>
+    /// 鍑哄簱浠剁杈撻�佸拰鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
+    /// </summary>
+    /// <param name="modDevice"></param>
+    private static void StackingRobot(WcsDeviceDto modDevice)
+    {
+        var plcConn = modDevice.PLCUtil;
+        if (modDevice.DbNumber == "DB131" || modDevice.DbNumber == "DB132" || modDevice.DbNumber == "DB133" || modDevice.DbNumber == "DB134")
+        {
+            switch (modDevice.Value.ToString())
+            {
+                case "10"://10  plc璇锋眰wcs璇绘墭鐩樼爜   20 wcs璇诲彇ok  wcs 鍐欏叆鏁伴噺鍙婅鏍�  30
+                    var strMsg = "";
+                    var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
+                    if (ret.IsSucceed)
+                    {
+                        //鑾峰彇鎵樼洏鐮�
+                        var modPosPallet = modDevice.listStation.FirstOrDefault(m => m.Text == "鎵樼洏鐮�");
+                        var (res, palletVal) = plcConn.GetPlcDBValue(modPosPallet.PosType, modDevice.DbNumber, modPosPallet.PlcPos);
+                        // 鑾峰彇鎵樼洏浠诲姟鍙�
+                        var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                        var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+                        string tasknoVal = val.ToString();
+
+                        // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
+                        if (res1.IsSucceed)
+                        {
+                            var modTask = _db.Queryable<WcsTask>().First(m => m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+                            if (modTask == null)
+                            {
+                                Log.Error(string.Format($"鍑哄簱浠诲姟鏈笅鍙戯紝璇蜂汉宸ュ鐞嗭紝鏃犳硶鎷嗗灈锛�"));
+                                break;
+                            }
+
+                            //閫氳繃浠诲姟鍙峰拰鎵樼洏鍙峰悜WMS鐢宠姝ゆ墭鐩樼殑鎷嗗灈淇℃伅
+                            var http = new HttpService();
+                            RequestBoxInfoCheckAll tasklist = http.RequestBoxCheckinfo(palletVal, tasknoVal);
+                            if (tasklist.Success != -1)
+                            {
+                                //鑾峰彇鎷嗗灈鐗╂枡鍝佺(闇�瑕佸鍔犵墿鏂欏垽鏂紝鍚屼竴涓墿鏂欏彿鍙兘浼氬嚭鐜颁笉鍚岀殑鐮佸灈瑙勫垯)
+                                var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.data[0].SkuNo);
+                                //涓嬪彂鎷嗘墭瑙勬牸锛屾媶绠辨暟鍜屾墭鐩樹笂鎬荤鏁帮紙涓嶇粦瀹氭満鍣ㄤ汉锛屾媶鍨涗换鍔′俊鎭彧涓嬪彂涓�娆★級
+                                // 缁橮LC鍐欏叆浠诲姟鏁版嵁
+                                var listResult = new List<Result>();
+                                // 鑾峰彇鎵樼洏瑙勫垯
+                                var Standard = modDevice.listStation.FirstOrDefault(m => m.Text == "瑙勬牸");
+                                listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, pz.PZNo));
+                                //鎶撶鏁�
+                                var qty = modDevice.listStation.FirstOrDefault(m => m.Text == "鎷嗙鏁伴噺");
+                                listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.data[0].Qty.ToString()));
+                                //鎬荤鏁�
+                                var qtycount = modDevice.listStation.FirstOrDefault(m => m.Text == "鎬荤鏁�");
+                                listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.data[0].QtyCount.ToString()));
+
+
+                                // 鏄惁鍐欏叆鎴愬姛
+                                if (listResult.All(s => s.IsSucceed))
+                                {
+                                    var ret1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+
+                                }
+                                else
+                                {
+                                    Log.Error(string.Format($"鐮佸灈淇℃伅鏈啓鍏ワ紒鎵樼洏鍙凤細" + palletVal + "锛岀爜鍨涗綅锛�" + modDevice.StationNum));
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    break;
+                default:
+                    break;
+            }
+        }
+        else 
+        {
+            switch (modDevice.Value.ToString())
+            {
+                case "1":
+                    // 1妤间欢绠盤LC璇锋眰WCS璇荤爜
+                    {
+                        // 璇诲彇plc绠辩爜
+                        var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "涓绘壂鏉$爜");
+                        var (res, boxNo) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
+                        if (string.IsNullOrWhiteSpace(boxNo.ToString()))
+                        {
+
+                            // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "0");
+                            if (ret.IsSucceed)
+                            {
+                                // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                if (retVal.IsSucceed)
+                                {
+                                    Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // 绠辩爜
+                            string boxNoVal = boxNo.ToString();     
+                            // 閫氶亾鍙�
+                            var modLineNo = modDevice.listStation.FirstOrDefault(m => m.Text == "閫氶亾鍙�");                                 
+
+                            // 璋冪敤wms鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�
+                            var http = new HttpService();
+                            RequestloadingAddre requesModel = http.ResultBoxInfoExportWcs(boxNoVal);
+                            if (requesModel.Success != "0")
+                            {
+                                // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+                                var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, "0");
+                                if (ret.IsSucceed)
+                                {
+                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                    if (retVal.IsSucceed)
+                                    {
+                                        Log.Error("鍑哄簱鍒嗘嫞鏍规嵁绠辩爜鑾峰彇瑁呰溅鍙eけ璐ワ紝杩涜鍓旈櫎銆�" + requesModel.Message);
+                                        break;
+                                    }
+                                }
+                            }
+                            else 
+                            {
+                                // 鍐欏叆鍑哄簱鍒嗛亾鍙�
+                                var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
+                                if (ret.IsSucceed)
+                                {
+                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                    if (retVal.IsSucceed)
+                                    {
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    };break;
+                case "10": 
+                    // 1妤间欢绠盤LC璇荤爜澶辫触锛學CS涓嶅仛澶勭悊鐩存帴鍓旈櫎鎵嬫寔鎷h揣銆�
+                    { 
+                        
+                    };break;
+                default:
+                    break;
+            }
+        }
+                
+    }
+
+    /// <summary>
+    /// Led灞忓睍绀轰俊鎭�
+    /// </summary>
+    /// <param name="ip">鍦板潃</param>
+    /// <param name="top">涓婃柟鍖哄煙</param>
+    /// <param name="content">涓棿鍖哄煙</param>
+    /// <param name="foot">搴曢儴鍖哄煙</param>
+    private static void LedDisplay(string ip, string top, string content, string foot)
+    {
+        try
+        {
+            LedDll Led = new LedDll();
+            Led.LEDstr(ip, top, content, foot);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex.Message);
+        }
+    }
+    /// <summary>
+    /// LED淇℃伅灞曠ず
+    /// </summary>
+    /// <param name="ip"></param>
+    /// <param name="text"></param>
+    private static void LedDisplay(string ip,string text) 
+    {
+        try
+        {
+            LedDll Led = new LedDll();
+            Led.ConsoleLeds(ip, text);
+            // 璁剧疆瀹炰緥
+            //Led.ConsoleLeds("10.18.51.238", $"浠诲姟绫诲瀷:{TaskTypeEnum.Move.GetDescription()}\n\n浠诲姟鍙�:TK2024102100001\n鎵樼洏鍙�:LN000145\n\n璧峰浣�:033\n鐩爣浣�:R01-02010102");
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// 鑷姩缁撴壒 骞� 瑙g粦鍒嗛亾
+    /// </summary>
+    /// <param name="lotNo">鎵规鍙�</param>
+    /// <param name="plcConn">Plc杩炴帴</param>
+    /// <param name="status">鏄惁瑙g粦鍒嗛亾 0锛氳В缁�  1锛氱粦瀹�</param> 
+    private static void AutoEndLot(string lotNo,PLCUtil plcConn,string status) 
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(lotNo))
+            {
+                Console.WriteLine("鎵规鍙蜂负nul");
+            }
+            var checkTaskList = _db.Queryable<WcsCheckTask>().Where(w => w.LotNo == lotNo && w.Status == "1").ToList();
+            if (checkTaskList.Count <= 0)
+            {
+                Console.WriteLine("鏈壘鍒板垎閬撶粦瀹氫俊鎭�");
+            }
+            foreach (var item in checkTaskList)
+            {
+                #region#缁橮LC鍐欏叆缁撴壒鎵规鍙�
+                // 鍐欏叆缁撴壒淇″彿
+                var ret = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
+                // 鍒嗛亾瑙g粦锛屾姄绠卞搧绉嶅啓鍏�0
+                //var ret1 = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PlcPos, "0");
+                if (ret.IsSucceed)
+                {
+                    //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟    liudl 鏈�鍚庝竴鎵樼洏鐢宠瀹屽叆搴撴墠鍙竻绌�
+                    //item.OrderNo = "";
+                    //item.TaskNo = "";
+                    //item.LotNo = "";
+                    //item.SkuNo = "";
+                    //item.SkuName = "";
+                    //item.BoxType = "";
+                    //item.Qty = 0;
+                    item.PZNo = "";
+                    item.Status = status;      // 缁戝畾鍒嗛亾 0锛氳В缁�  1锛氱粦瀹�  2:缁撴壒涓�
+
+                    //鏇存柊鍒嗘嫞浠诲姟
+                    _db.Updateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+                }
+                #endregion
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex.Message);
+            throw;
+        }
     }
 
     private static void Test(WcsDeviceDto modDevice)
     {
-        //鍐欐娴嬭瘯璇籹tring
-        var (res, val) = modDevice.PLCUtil.GetPlcDBValue(PLCDataTypeEnum.String, "DB100", "64");
-        Console.WriteLine("DB100.64----" + val);
-        //娴嬭瘯鎵归噺璇诲彇
-        Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
-        foreach (var modStation in modDevice.listStation)
-        {
-            listaddress.Add(modStation.PlcPos, modStation.PosType);
-        }
-        var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
-        if (result.Value.Count > 0)
-        {
-            foreach (var value in result.Value)
-            {
-                Console.WriteLine("鍦板潃" + value.Key + "----鍊�" + value, value);
-            }
-        }
-        if (!result.IsSucceed)
-        {
-            foreach (var err in result.ErrList)
-            {
-                Console.WriteLine(err);
-            }
-            if (result.Value.Count > 0)//鏈夐敊璇殑涔熸湁鎴愬姛鐨�
-            {
+        //var strMsg = new HttpService().RequestPackWcs("LN000001");
+        ////鍐欐娴嬭瘯璇籹tring
+        //var (res, val) = modDevice.PLCUtil.GetPlcDBValue(PLCDataTypeEnum.String, "DB100", "64");
+        //Console.WriteLine("DB100.64----" + val);
+        ////娴嬭瘯鎵归噺璇诲彇
+        //Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
+        //foreach (var modStation in modDevice.listStation)
+        //{
+        //    listaddress.Add(modStation.PlcPos, modStation.PosType);
+        //}
+        //var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
+        //if (result.Value.Count > 0)
+        //{
+        //    foreach (var value in result.Value)
+        //    {
+        //        Console.WriteLine("鍦板潃" + value.Key + "----鍊�" + value, value);
+        //    }
+        //}
+        //if (!result.IsSucceed)
+        //{
+        //    foreach (var err in result.ErrList)
+        //    {
+        //        Console.WriteLine(err);
+        //    }
+        //    if (result.Value.Count > 0)//鏈夐敊璇殑涔熸湁鎴愬姛鐨�
+        //    {
 
-            }
-        }
-        if (modDevice.Value == 820)
-        {
-            //娴嬭瘯鍐欏叆830
-            //var result = mod.PLCUtil.SetPlcDBValue(mod.PosType.Value, mod.DbNumber, mod.PlcPos, "830");
-            ////鍐欏叆鏄惁鎴愬姛
-            //if (result.IsSucceed)
-            //{
+        //    }
+        //}
+        //if (modDevice.Value == 820)
+        //{
+        //    //娴嬭瘯鍐欏叆830
+        //    //var result = mod.PLCUtil.SetPlcDBValue(mod.PosType.Value, mod.DbNumber, mod.PlcPos, "830");
+        //    ////鍐欏叆鏄惁鎴愬姛
+        //    //if (result.IsSucceed)
+        //    //{
 
-            //}
-        }
-        else if (modDevice.Value == 840)
-        {
+        //    //}
+        //}
+        //else if (modDevice.Value == 840)
+        //{
 
-        }
-        else if (modDevice.Value == 860)
-        {
+        //}
+        //else if (modDevice.Value == 860)
+        //{
 
-        }
+        //}
     }
 
+
+
 }

--
Gitblit v1.8.0