From 4efebef143f1ed702bc5bc1c29349e2a7f2af414 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 08:17:26 +0800
Subject: [PATCH] Merge branch 'master' into hwh
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 281 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 213 insertions(+), 68 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 3b8b3f3..7f56930 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -147,7 +147,7 @@
if (listResult.All(s => s.IsSucceed))
{
// 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
- plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "10");
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "10");
// 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝ｅ湪鎵ц
_db.Updateable<WcsTask>()
@@ -246,7 +246,7 @@
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");
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
if (!res.IsSucceed)
break;
// 鏍规嵁璺烘満鍙风‘璁ゅ彇璐у伐浣�
@@ -304,7 +304,7 @@
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");
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
if (!res.IsSucceed)
break;
//淇敼浠诲姟鐘舵��
@@ -354,77 +354,129 @@
}
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;
- }
- // 鏍规嵁鐩爣鍙ｈ幏鍙栫洰鏍囧伐浣�
- 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()
+ // 浠庡嚭搴撲换鍔¤幏鍙栧贩閬撳彿
+ string num = ""; // 鏀捐揣宸ヤ綅鍙�
+ if (modTask.StartRoadway == "R01")
{
- 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();
+ 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;
+ }
+ // 鏍规嵁鐩爣鍙ｈ幏鍙栫洰鏍囧伐浣�
+ string outCode = modTask.EndLocate.IsNullOrEmpty() ? "-1" : modTask.EndLocate;
- //涓嬪彂浠诲姟鏃ュ織
- _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- //todo:鍨涙満鍑哄簱涓嶇┖璺�
+ var listStation = _db.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice2.Id).ToList();
+ //缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ //浠诲姟鍙�
+ var modPosTask = listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ //鎵樼洏鍙�
+ var modPosPalletNo = listStation.FirstOrDefault(s => s.Text == "PalletNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+ //璧峰宸ヤ綅
+ var modPosLocatNo = listStation.FirstOrDefault(s => s.Text == "StartLocatNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosLocatNo.PosType, modDevice.DbNumber, modPosLocatNo.PlcPos, num));
+ // 鐩爣宸ヤ綅
+ var modPosEndLocatNo = listStation.FirstOrDefault(s => s.Text == "EndLocatNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndLocatNo.PosType, modDevice.DbNumber, modPosEndLocatNo.PlcPos, outCode));
+ //鍏ㄩ儴鍐欏叆鎴愬姛
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍐欏叆宸ヤ綅wcs鎺у埗瀛�
+ var res = plcConn.SetPlcDBValue(modDevice2.PosType, modDevice2.DbNumber, modDevice2.WcsPos, "120");
+ if (!res.IsSucceed)
+ break;
+ //鍐欏叆plc浠诲姟鍙�
+ var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, modTask.TaskNo);
+ if (!res.IsSucceed)
+ break;
+ //鍐欏叆璺烘満wcs鎺у埗瀛楁祦绋�30 杩斿洖鍨涙満鎵ц瀹屾垚
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+ if (!res.IsSucceed)
+ break;
+ //璁板綍浠诲姟鏄庣粏
+ var modTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice2.PlcId,
+ PlcName = modDevice2.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护锛氭敹鍒拌泛鏈烘斁璐у畬鎴愶紱鏀捐揣{num}宸ヤ綅===銆媨outCode}鍑哄簱鍙�",
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = num, //璧峰浣嶇疆
+ EndLocat = outCode, //鐩爣宸ヤ綅
+ };
+ _db.Insertable(modTaskMonitor).ExecuteCommand();
+
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ //todo:鍨涙満鍑哄簱涓嶇┖璺�
+ }
}
-
break;
case TaskTypeEnum.Move:
+ {
+ //绉诲簱浠诲姟
+ var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ // 鍐欏叆plc浠诲姟鍙�
+ var res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, taskNo);
+ if (!res.IsSucceed)
+ break;
+ //鍐欏叆plc鎺у埗瀛�
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+ if (!res.IsSucceed)
+ break;
+ modTask.Status = TaskStatusEnum.Complete;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestTask(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ //todo:淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
+ //
+
+ //璁板綍浠诲姟鏄庣粏
+ var modTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.PlcId,
+ PlcName = modDevice.Text,
+ InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚",
+ StartLocat = modTask.StartLocate,
+ EndLocat = modTask.EndLocate,
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete
+ };
+ _db.Insertable(modTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ }
+
+ //todo:LED灞�
+
+ }
break;
default:
@@ -432,6 +484,99 @@
}
}
break;
+ case "100":
+ {
+ //绌哄彇璐у紓甯�
+ var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
+ if (!result.IsSucceed)
+ break;
+ string taskNo = Convert.ToString(TaskNo);
+ var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+ if (modTask == null)
+ {
+ Log.Error($"銆愯泛鏈恒�戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ break;
+ }
+ var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
+ if (!res.IsSucceed)
+ break;
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "100");
+ if (!res.IsSucceed)
+ break;
+ modTask.Status = TaskStatusEnum.Exception;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ Log.Information($"銆愯泛鏈恒�憌cs浠诲姟鍙樻洿绌哄彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ }
+ //todo:LED灞�
+ }
+ break;
+ case "101":
+ {
+ //婊℃斁璐у紓甯�
+ var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "PalletNo");
+ var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
+ if (!result.IsSucceed)
+ break;
+ string taskNo = Convert.ToString(TaskNo);
+ var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+ if (modTask == null)
+ {
+ Log.Error($"銆愯泛鏈恒�戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ break;
+ }
+ modTask.Status = TaskStatusEnum.Exception;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ Log.Information($"銆愯泛鏈恒�憌cs浠诲姟鍙樻洿婊″彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ var modInsertTask = modResponseTask.TaskList;
+ modInsertTask.TaskType = TaskTypeEnum.In;
+ modInsertTask.Origin = "WMS";
+ modInsertTask.StartLocate = modTask.StartLocate;
+ modInsertTask.Levels = 1;
+ _db.Insertable(modInsertTask);
+
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTask(modInsertTask.Adapt<WcsTaskOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ }
+ //todo:LED灞�
+
+ }
+ break;
default:
break;
}
--
Gitblit v1.8.0