From c321182cdcbc7d6489d969810f0610e48ac2b5ed Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 23 七月 2025 17:40:22 +0800
Subject: [PATCH] 双钱-需求变更：增加了两个搬送流程，增加了两个库区，主要是修改对空托上线脱皮机的逻辑
---
core/WCSCore.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 364926e..68db574 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -35,8 +35,9 @@
}
else if (model.state == 1012)
{
- Task task5 = Task.Run(() =>
+ Task task5 = Task.Run(async () =>
{
+ await Task.Delay(3000);//寤舵椂3绉� PostScanCode(model.task_no, model.forklift_no);//鍙嶉鎵爜缁撴灉
});
}
@@ -68,7 +69,15 @@
WCSHelper.Begin(tN_Task, model.forklift_no);//宸叉帹閫佺殑浠诲姟鐨勭姸鎬佹敼鎴愭墽琛� Task task4 = Task.Run(() =>
{
- OpenScanCode(model.task_no, model.forklift_no);//寮�惎鎵爜
+ if (tN_Task.S_TYPE.Contains("鐐瑰鐐�) || tN_Task.S_TYPE.Contains("婊℃墭鍑哄簱涓婄嚎") || tN_Task.S_TYPE.Contains("婊℃墭鍑哄簱澶嶆"))
+ {
+ //涓嶅紑鍚壂鐮�+ }
+ else
+ {
+ OpenScanCode(model.task_no, model.forklift_no);//寮�惎鎵爜
+ }
+
});
break;
case 3:
@@ -80,12 +89,17 @@
Task task3 = Task.Run(() =>
{
- EmptyInStackArea(tN_Task);
+ EmptyInStackArea(tN_Task);//绌烘墭涓嬬嚎鍫嗗彔
});
Task task1 = Task.Run(() =>
{
returnS7Ok(tN_Task);
+ });
+
+ Task task27 = Task.Run(() =>
+ {
+ SpecHelper.DeleteInventoryM(tN_Task);
});
break;
@@ -96,6 +110,8 @@
case 6:
WCSHelper.UpdateStatus(tN_Task, "鍗歌揣瀹屾垚");//浠诲姟鐘舵�鏀规垚鍗歌揣瀹屾垚
TaskProcess.OperateStatus(tN_Task, 6);//缁堢偣瀹瑰櫒璐т綅缁戝畾,瑙ｉ攣缁堢偣
+
+ SpecHelper.RestEndLoc(tN_Task);
Task task2 = Task.Run(() =>
{
@@ -132,7 +148,6 @@
SpecHelper.UpdateComponentDetail(tN_Task.S_CODE);
}
});
-
Task task12 = Task.Run(() =>
{
@@ -192,9 +207,8 @@
else
{
//瀹夊叏璇锋眰绛�- TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
+ //TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
}
-
}
else
{
@@ -473,7 +487,6 @@
{
//鎺ㄩ�鎴愬姛
LogHelper.Info($"NDC鍙嶉鎵爜缁撴灉鎴愬姛锛屾壂鐮佺粨鏋滐細{TcpServer.saoMa[agv.ScanAddress].ToString()}");
-
}
else
{
@@ -574,7 +587,7 @@
//鏌ヨ绗﹀悎鐨勬湭閿佸畾宸插惎鐢ㄦ寚瀹氳揣鍖虹殑褰撳墠鏁伴噺鍚堣鍚庢渶鎺ヨ繎瀹归噺鐨勮揣浣嶏紝缁堢偣
var endLoc = db.Queryable<TN_Location>().
Where(a => a.N_CURRENT_NUM + item.N_CURRENT_NUM <= a.N_CAPACITY && a.S_AREA_CODE == Settings.Areas[3] && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y").
- OrderBy(a => a.N_CURRENT_NUM + item.N_CURRENT_NUM - a.N_CAPACITY, OrderByType.Desc).First();
+ ToList().OrderByDescending(a => a.N_CURRENT_NUM + item.N_CURRENT_NUM - a.N_CAPACITY).ThenBy(a=>a.N_ROW).ThenBy(a => a.N_COL).ToList().First();
if (endLoc == null)
{
--
Gitblit v1.9.1