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 | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index ac280b4..68db574 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -89,7 +89,7 @@
Task task3 = Task.Run(() =>
{
- EmptyInStackArea(tN_Task);
+ EmptyInStackArea(tN_Task);//绌烘墭涓嬬嚎鍫嗗彔
});
Task task1 = Task.Run(() =>
@@ -149,7 +149,6 @@
}
});
-
Task task12 = Task.Run(() =>
{
if (tN_Task.S_TYPE == "PDA婊℃墭涓嬬嚎鍏ュ簱" || tN_Task.S_TYPE == "PLC婊℃墭涓嬬嚎鍏ュ簱")
@@ -208,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
{
@@ -589,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