From f317e966ce0872e04d1455305845c3e19fb4a532 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期日, 06 七月 2025 12:00:53 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 3abdf18..39134a4 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -81,7 +81,7 @@
bbbbbbb = false;
//UpdateElevatorTask(mst);
//todo锛�濡傛灉鏄數姊嵏璐т换鍔＄數姊换鍔′腑闂磋〃鐘舵�锛屽
- //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
+ bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
if (BeenOver || (mst.S_TYPE.Contains("鎴愬搧婊℃") && bbbbbbb))
{
//if (mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
@@ -401,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("澶囪揣"))
{
@@ -1310,7 +1309,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1482,7 +1481,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1497,7 +1496,7 @@
"start agv鐐�,
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
}
--
Gitblit v1.9.1