From 48335b93b2b2850a8540bbe8b0182c6f8f1f4626 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期日, 06 七月 2025 12:00:49 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 9636f3c..39134a4 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -78,9 +78,11 @@
if (bbbbbbb)
{
+ bbbbbbb = false;
//UpdateElevatorTask(mst);
//todo锛�濡傛灉鏄數姊嵏璐т换鍔＄數姊换鍔′腑闂磋〃鐘舵�锛屽
- if (BeenOver)
+ bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
+ if (BeenOver || (mst.S_TYPE.Contains("鎴愬搧婊℃") && bbbbbbb))
{
//if (mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
//{
@@ -399,7 +401,6 @@
//new List<string> { "鎴愬搧婊℃-鍏ュ簱", "" }
if (state == 6 || state == 5)
{
-
LogHelper.Info($"浠诲姟绫诲瀷锛歿mst.S_TYPE}- 鍔ㄤ綔锛歿state}. 鏄惁5绠�锛焮mst.S_TYPE.Contains("鎴愬搧婊℃") || mst.S_TYPE.Contains("澶囪揣")} ");
if (mst.S_TYPE.Contains("澶囪揣"))
{
@@ -1114,9 +1115,9 @@
}
if (state == 9)
{
+ CacheBitUpdate(mst, load: true);
var g = LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
var T = LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
- CacheBitUpdate(mst, load: true);
}
return r;
}
@@ -1308,7 +1309,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1480,7 +1481,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1495,7 +1496,7 @@
"start agv鐐�,
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
}
--
Gitblit v1.9.1