From c9259bb264b7ca591a326f0297020c3b07b5076b Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期三, 16 十月 2024 10:48:35 +0800
Subject: [PATCH] 转换排
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 058b15d..0c8d371 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -64,12 +64,17 @@
// 璺烘満绌洪棽锛岃幏鍙栧嚭搴撲换鍔°�佺Щ搴撲换鍔�
{
// 鑾峰彇浠诲姟淇℃伅
- var modTask = _db.Queryable<WcsTask>().OrderBy(m => m.CreateTime).OrderBy(m => m.Levels, OrderByType.Desc)
+ var modTask = _db.Queryable<WcsTask>().OrderBy(m => m.CreateTime).OrderBy(m => m.Levels, OrderByType.Asc)
.First(s => s.Status == TaskStatusEnum.Wait && (s.TaskType == TaskTypeEnum.Out || s.TaskType == TaskTypeEnum.Move)
&& s.StartRoadway == modDevice.StationNum);
if (modTask == null)
{
break;
+ }
+ //鍒ゆ柇鍑哄簱閿佸畾鏄惁鎵撳紑
+ if (PLCTaskAction.boOutLock)
+ {
+ break;//鍑哄簱閿佸畾鎵撳紑鍒欎笉鎵ц鍑哄簱浠诲姟
}
PlcTaskInfo taskInfo = new PlcTaskInfo();
@@ -529,6 +534,7 @@
// 鏀瑰彉浠诲姟鐘舵��
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
+ modTask.Levels = 999;
_db.Updateable(modTask).ExecuteCommand();
//涓嬪彂浠诲姟鏃ュ織
HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
@@ -950,7 +956,6 @@
break;
case "330":
{
-
// 鍐欏叆浠诲姟 鎵樼洏绉诲姩 340
// 鑾峰彇宸ヤ綅鎵樼洏鐮佷俊鎭�
@@ -967,6 +972,11 @@
{
// 姝ゆ墭鐩樻病鏈夊搴旂殑杞Щ浠诲姟 led鏄剧ず
break;
+ }
+ //鍒ゆ柇鍏ュ簱閿佸畾鏄惁鎵撳紑
+ if (PLCTaskAction.boEnterLock)
+ {
+ break;//鍏ュ簱閿佸畾鎵撳紑鍒欎笉鎵ц鍏ュ簱浠诲姟
}
// 鑾峰彇宸烽亾鍙ｅ叆搴撳伐浣�
@@ -1144,6 +1154,7 @@
break;
}
+ // 杞崲鐩爣宸ヤ綅鎺掑垪灞�
var paiVal = PLCCommon.GetDjAdress(modTask.EndRoadway.Substring(1, 2), endLocate.Substring(0, 2), endLocate.Substring(6, 2));
string pai = paiVal.ToString();
string lie = int.Parse(endLocate.Substring(2, 2)).ToString();
@@ -1317,6 +1328,7 @@
// 鏀瑰彉浠诲姟鐘舵��
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
+ modTask.Levels = 999;
_db.Updateable(modTask).ExecuteCommand();
HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
// 鎻掑叆浠诲姟鏄庣粏
@@ -1419,6 +1431,7 @@
// 鏀瑰彉浠诲姟鐘舵��
modTask.Status = TaskStatusEnum.Complete;
modTask.FinishDate = DateTime.Now;
+ modTask.Levels = 999;
_db.Updateable(modTask).ExecuteCommand();
HubUtil.PublicTask(modTask.Adapt<WcsTaskOutput>());
--
Gitblit v1.8.0