From 41ca2b65f055b9c7b8f3ce68418423bac15c8e46 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 27 八月 2024 17:00:45 +0800
Subject: [PATCH] plc基础信息优化;堆垛机出库逻辑

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |  500 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 381 insertions(+), 119 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index b8210fa..cf5a94c 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1,8 +1,6 @@
-锘縰sing Flurl.Util;
-using Furion.DatabaseAccessor;
+锘�
 using Furion.Logging;
 using IoTClient;
-using StackExchange.Redis;
 using System.Data;
 
 namespace WCS.Application;
@@ -49,64 +47,384 @@
         switch (modDevice.ToString())
         {
             case "820":
-                var modTask = _db.Queryable<WcsTask>().First(s => s.Status == TaskStatusEnum.Wait && s.TaskType == TaskTypeEnum.Out && s.StartRoadway == modDevice.StationNum);
-                if (modTask == null)
                 {
-                    break;
-                }
-                var modTaskMonitor = new WcsTaskMonitor()
-                {
-                    TaskNo = modTask.TaskNo,
-                    StartLocat = modTask.StartLocate,
-                    EndLocat = modTask.EndLocate,
-                    PalletNo = modTask.PalletNo,
-                };
-                // 鏍规嵁璺烘満鍙风‘璁ゆ斁璐у伐浣�
-                string outStationNum = "0";
-                string endRow = "", endColumn = "", endStorey = "";
-                switch (modDevice.StationNum)
-                {
-                    case "R01":
-                        outStationNum = "11";
-                        endRow = "1";
-                        endColumn = "100";
-                        endStorey = "1";
-                        break;
-                    case "R02":
-                        outStationNum = "7";
-                        endRow = "1";
-                        endColumn = "100";
-                        endStorey = "1";
-                        break;
-                    default: break;
-                }
-                var modD = modDevice.listDevice.FirstOrDefault();
-                if (modD == null)
-                {
-                    Log.Error($"IP{modDevice.PlcId}.璁惧id锛歿modDevice.Id}缂哄皯宸ヤ綅绾у埆璁惧淇℃伅");
-                    break;
-                }
-                var (result, value) = plcConn.GetPlcDBValue(modD.PosType.Value, modD.DbNumber, modD.PlcPos);
-                if (result.IsSucceed)
-                {
-                    if (value == 120)// 鏀捐揣宸ヤ綅绌洪棽 鍙斁璐�
+                    var modTask = _db.Queryable<WcsTask>().First(s => s.Status == TaskStatusEnum.Wait && s.TaskType == TaskTypeEnum.Out && s.StartRoadway == modDevice.StationNum);
+                    if (modTask == null)
                     {
-                        if (int.Parse(outStationNum) > 0)
+                        break;
+                    }
+                    var modTaskMonitor = new WcsTaskMonitor()
+                    {
+                        TaskNo = modTask.TaskNo,
+                        StartLocat = modTask.StartLocate,
+                        EndLocat = modTask.EndLocate,
+                        PalletNo = modTask.PalletNo,
+                    };
+                    // 鏍规嵁璺烘満鍙风‘璁ゆ斁璐у伐浣�
+                    string outStationNum = "0";
+                    string endRow = "", endColumn = "", endStorey = "";
+                    switch (modDevice.StationNum)
+                    {
+                        case "R01":
+                            outStationNum = "11";
+                            endRow = "1";
+                            endColumn = "100";
+                            endStorey = "1";
+                            break;
+                        case "R02":
+                            outStationNum = "7";
+                            endRow = "1";
+                            endColumn = "100";
+                            endStorey = "1";
+                            break;
+                        default: break;
+                    }
+                    var modD = modDevice.listDevice.FirstOrDefault();
+                    if (modD == null)
+                    {
+                        Log.Error($"IP{modDevice.PlcId}.璁惧id锛歿modDevice.Id}缂哄皯宸ヤ綅绾у埆璁惧淇℃伅");
+                        break;
+                    }
+                    var (result, value) = plcConn.GetPlcDBValue(modD.PosType, modD.DbNumber, modD.PlcPos);
+                    if (result.IsSucceed)
+                    {
+                        if (value == 120)// 鏀捐揣宸ヤ綅绌洪棽 鍙斁璐�
                         {
-                            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
+                            if (int.Parse(outStationNum) > 0)
                             {
-                                row = (int.Parse(row) - 2).ToString();
-                            }
-                            else
-                            {
-                                // 璧峰鍌ㄤ綅鍦板潃涓虹┖锛岃烦杩� 鍐欏叆浠诲姟鏄庣粏琛�
-                                modTaskMonitor.StartLocat = "";
-                                modTaskMonitor.InteractiveMsg = "璧峰鍌ㄤ綅涓虹┖!";
+                                var row = int.Parse(modTaskMonitor.StartLocat.Substring(0, 2)).ToString();
+                                var column = int.Parse(modTaskMonitor.StartLocat.Substring(2, 2)).ToString();
+                                var layer = int.Parse(modTaskMonitor.StartLocat.Substring(4, 2)).ToString();
+                                var deep = int.Parse(modTaskMonitor.StartLocat.Substring(6, 2)).ToString();
+                                if (int.Parse(row) > 2) //澶т簬4
+                                {
+                                    row = (int.Parse(row) - 2).ToString();
+                                }
+                                else
+                                {
+                                    // 璧峰鍌ㄤ綅鍦板潃涓虹┖锛岃烦杩� 鍐欏叆浠诲姟鏄庣粏琛�
+                                    modTaskMonitor.StartLocat = "";
+                                    modTaskMonitor.InteractiveMsg = "璧峰鍌ㄤ綅涓虹┖!";
 
+                                    _db.Insertable(modTaskMonitor).ExecuteCommand();
+
+                                    // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                                    //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));
+
+                                // 鐩爣鏀捐揣宸ヤ綅
+                                var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "EndRow");
+                                listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType, modDevice.DbNumber, modPosEndRow.PlcPos, endRow));
+                                var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "EndColumn");
+                                listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType, modDevice.DbNumber, modPosEndColumn.PlcPos, endColumn));
+                                var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "EndLayer");
+                                listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType, modDevice.DbNumber, modPosEndStorey.PlcPos, endColumn));
+                                //鍏ㄩ儴鍐欏叆鎴愬姛
+                                if (listResult.All(s => s.IsSucceed))
+                                {
+                                    // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
+                                    plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "10");
+
+                                    // 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝e湪鎵ц
+                                    _db.Updateable<WcsTask>()
+                                        .SetColumns(s => s.FinishDate == DateTime.Now)
+                                        .SetColumns(s => s.Status == TaskStatusEnum.Doing)
+                                        .SetColumns(s => s.Levels == 2)
+                                        .Where(s => s.Id == modTask.Id)
+                                        .ExecuteCommand();
+                                    var modInsertTaskMonitor = new WcsTaskMonitor()
+                                    {
+                                        TaskNo = modTask.TaskNo,
+                                        PlcId = modDevice.Id,
+                                        PlcName = modDevice.Text,
+                                        InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨outStationNum}宸ヤ綅",
+                                        PalletNo = modTask.PalletNo,
+                                        Status = TaskStatusEnum.Complete,
+                                        StartLocat = modTask.StartLocate,
+                                        EndLocat = outStationNum,
+                                    };
+                                    _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                    // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                                    //if (TaskAction.refresh)
+                                    //{
+                                    //    wSChat.AlarmInformation("1");
+                                    //}
+                                    //淇敼led灞忎俊鎭�
+                                    //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Log.Error(string.Join(',', result.ErrList));
+                    }
+                }
+                break;
+            case "20":
+                {
+                    var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
+                    var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+                    var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
+                    if (!result.IsSucceed)
+                        break;
+                    string taskNo = Convert.ToString(TaskNo);
+                    var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+                    if (modTask == null)
+                    {
+                        Log.Error("銆愯泛鏈恒�戝綋鍓嶆墭鐩樺彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟");
+                        break;
+                    }
+                    if (modTask.TaskType.Value == TaskTypeEnum.In)
+                    {
+                        //鍏ュ簱浠诲姟
+                        var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
+                        if (!res.IsSucceed)
+                            break;
+                        // 鏍规嵁璺烘満鍙风‘璁ゅ彇璐у伐浣�
+                        string outStationNum = "0";
+                        switch (modDevice.StationNum)
+                        {
+                            case "R01":
+                                outStationNum = "10";
+                                break;
+                            case "R02":
+                                outStationNum = "6";
+                                break;
+                            default: break;
+                        }
+                        var modDevice2 = modDevice.listDevice.Where(s => s.StationNum == outStationNum).FirstOrDefault();
+                        var modStation = _db.Queryable<WcsPosition>().First(s => s.DeviceId == modDevice2.Id && s.Text == "TaskNo");
+                        // 鍚戝彇璐у伐浣嶅啓鍏ヤ换鍔″彿
+                        res = plcConn.SetPlcDBValue(modStation.PosType, modDevice2.DbNumber, modStation.PlcPos, taskNo);
+                        if (!res.IsSucceed)
+                            break;
+                        // 鍚戝彇璐у伐浣嶅啓鍏ユ祦绋嬫帶鍒跺瓧
+                        res = plcConn.SetPlcDBValue(modDevice2.PosType, modDevice2.DbNumber, modDevice2.WcsPos, "100");
+                        if (!res.IsSucceed)
+                            break;
+                        var modTaskMonitor = new WcsTaskMonitor()
+                        {
+                            TaskNo = modTask.TaskNo,
+                            PlcId = modDevice2.PlcId,
+                            PlcName = modDevice2.Text,
+                            InteractiveMsg = "璺烘満鍙栬揣瀹屾垚",
+                            StartLocat = outStationNum,
+                            EndLocat = modTask.EndLocate,
+                            PalletNo = modTask.PalletNo,
+                            Status = TaskStatusEnum.Complete
+                        };
+                        _db.Insertable(modTaskMonitor).ExecuteCommand();
+                        //閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
+                        //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();
 
                                 // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
@@ -114,72 +432,16 @@
                                 //{
                                 //    wSChat.AlarmInformation("1");
                                 //}
-                                break;
+                                //todo:鍨涙満鍑哄簱涓嶇┖璺�
                             }
-                            //缁橮LC鍐欏叆浠诲姟鏁版嵁
-                            var listResult = new List<Result>();
-                            //浠诲姟鍙�
-                            var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType.Value, modDevice.DbNumber, modPosTask.PlcPos, modTaskMonitor.TaskNo));
-                            //鎵樼洏鍙�
-                            var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "PalletNo");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType.Value, modDevice.DbNumber, modPosPalletNo.PlcPos, modTaskMonitor.PalletNo));
-                            //璧峰鎺�
-                            var modPosRow = modDevice.listStation.FirstOrDefault(s => s.Text == "StartRow");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosRow.PosType.Value, modDevice.DbNumber, modPosRow.PlcPos, row));
-                            // 璧峰鍒�
-                            var modPosColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "StartColumn");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosColumn.PosType.Value, modDevice.DbNumber, modPosColumn.PlcPos, column));
-                            // 璧峰灞�
-                            var modPosStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "StartLayer");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosStorey.PosType.Value, modDevice.DbNumber, modPosStorey.PlcPos, layer));
 
-                            // 鐩爣鏀捐揣宸ヤ綅
-                            var modPosEndRow = modDevice.listStation.FirstOrDefault(s => s.Text == "EndRow");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosEndRow.PosType.Value, modDevice.DbNumber, modPosEndRow.PlcPos, endRow));
-                            var modPosEndColumn = modDevice.listStation.FirstOrDefault(s => s.Text == "EndColumn");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosEndColumn.PosType.Value, modDevice.DbNumber, modPosEndColumn.PlcPos, endColumn));
-                            var modPosEndStorey = modDevice.listStation.FirstOrDefault(s => s.Text == "EndLayer");
-                            listResult.Add(plcConn.SetPlcDBValue(modPosEndStorey.PosType.Value, modDevice.DbNumber, modPosEndStorey.PlcPos, endColumn));
-                            //鍏ㄩ儴鍐欏叆鎴愬姛
-                            if (listResult.All(s => s.IsSucceed))
-                            {
-                                // 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
-                                plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "10");
+                            break;
+                        case TaskTypeEnum.Move:
 
-                                // 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝e湪鎵ц
-                                _db.Updateable<WcsTask>()
-                                    .SetColumns(s => s.FinishDate == DateTime.Now)
-                                    .SetColumns(s => s.Status == TaskStatusEnum.Doing)
-                                    .SetColumns(s => s.Levels == 2)
-                                    .Where(s => s.Id == modTask.Id)
-                                    .ExecuteCommand();
-                                var modInsertTaskMonitor = new WcsTaskMonitor()
-                                {
-                                    TaskNo = modTask.TaskNo,
-                                    PlcId = modDevice.Id,
-                                    PlcName = modDevice.Text,
-                                    InteractiveMsg = $"鍐欏叆鎸囦护锛歿modTask.StartLocate}鍌ㄤ綅====銆媨outStationNum}宸ヤ綅",
-                                    PalletNo = modTask.PalletNo,
-                                    Status = TaskStatusEnum.Complete,
-                                    StartLocat = modTask.StartLocate,
-                                    EndLocat = outStationNum,
-                                };
-                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
-                                // 閫氱煡浠诲姟鐣岄潰浠诲姟宸插瓨鍦ㄦ洿鏂� 璇锋洿鏂扮晫闈�
-                                //if (TaskAction.refresh)
-                                //{
-                                //    wSChat.AlarmInformation("1");
-                                //}
-                                //淇敼led灞忎俊鎭�
-                                //LedDisplay(modDevice.LedIP, "宸ヤ綅:" + modTask.EndLocate, "鍑哄簱涓� " + $"鍌ㄤ綅鍦板潃锛歿modTask.StartLocate}", "鎵樼洏鍙�:" + modTask.PalletNo);
-                            }
-                        }
+                            break;
+                        default:
+                            break;
                     }
-                }
-                else
-                {
-                    Log.Error(string.Join(',', result.ErrList));
                 }
                 break;
             default:
@@ -220,7 +482,7 @@
         Dictionary<string, PLCDataTypeEnum> listaddress = new Dictionary<string, PLCDataTypeEnum>();
         foreach (var modStation in modDevice.listStation)
         {
-            listaddress.Add(modStation.PlcPos, modStation.PosType.Value);
+            listaddress.Add(modStation.PlcPos, modStation.PosType);
         }
         var result = modDevice.PLCUtil.GetPlcBatchDBValue(listaddress);
         if (result.Value.Count > 0)

--
Gitblit v1.8.0