From dc600c6298a3231e05875813ec0fa2fa18151d84 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 14 七月 2025 10:14:38 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 5b96932..a058a04 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("缈绘枟鏈哄彨婊�))
//{
@@ -415,16 +417,14 @@
goto vvv;
}
- if (mst.S_TYPE.Trim() == "J绌虹摱鍧�鍑哄簱")
- {
- mst.S_CNTRS = "J" + Settings.GetTimeStamp();
- }
-
- if (mst.S_TYPE.Trim() == "F绌虹摱鍧�鍑哄簱")
- {
- mst.S_CNTRS = "F" + Settings.GetTimeStamp();
- }
-
+ //if (mst.S_TYPE.Trim() == "J绌虹摱鍧�鍑哄簱")
+ //{
+ // mst.S_CNTRS = "J" + Settings.GetTimeStamp();
+ //}
+ //if (mst.S_TYPE.Trim() == "F绌虹摱鍧�鍑哄簱")
+ //{
+ // mst.S_CNTRS = "F" + Settings.GetTimeStamp();
+ //}
//鎴愬搧绌烘 涓嶉渶瑕佺粦绛� if (!mst.S_TYPE.Trim().Contains("鎴愬搧-绌烘墭涓婄嚎")
&& mst.S_TYPE.Trim() != "婊＄摱鍧�鍏ュ簱"
@@ -844,7 +844,6 @@
return true;
});
}
-
}
else if (mst.S_TYPE.Trim() == "绌虹摱鍧�鍑哄簱" || mst.S_TYPE.Trim().Contains("鐡剁洊-绌轰笂鏈�) || mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
{
@@ -1307,7 +1306,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1353,6 +1352,19 @@
TRow = item_.trayHeight + "";
else return false;
}
+ }
+ else if (taskType.Contains("鐡跺澂缈绘枟鏈虹┖鎵�) && mst.S_END_LAREA == "QXPPXXQ")
+ {
+ start = LocationHelper.GetAgvSite(mst.S_START_LOC);
+ end = LocationHelper.GetAgvSite(mst.S_END_LOC, "2");
+ LogHelper.Info($"鐡跺澂鏈轰换鍔�璧风偣缁堢偣瀵瑰簲鐨刟gv绔欑偣 start {start} end {end} 浠诲姟:" + mst.S_TASK_NO);
+
+ }
+ else if (taskType.Contains("鐡跺澂缈绘枟鏈烘弧鎵�) && mst.S_START_LAREA == "QXPPXXQ")
+ {
+ start = LocationHelper.GetAgvSite(mst.S_START_LOC, "2");
+ end = LocationHelper.GetAgvSite(mst.S_END_LOC);
+ LogHelper.Info($"鐡跺澂鏈轰换鍔�璧风偣缁堢偣瀵瑰簲鐨刟gv绔欑偣 start {start} end {end} 浠诲姟:" + mst.S_TASK_NO);
}
//else if (taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満"))
//{
@@ -1479,7 +1491,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1494,7 +1506,7 @@
"start agv鐐�,
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
}
@@ -1582,6 +1594,7 @@
LogHelper.Info("SendTask " + mst.S_TASK_NO);
Console.WriteLine("start=" + start.ToString());
Console.WriteLine("end= " + end.ToString());
+
NDC.AGVResult res = NDC.AddNewOrder(TSNo, new Dictionary<string, string>
{
{
--
Gitblit v1.9.1