From 209a219fd924ab0bbf88b1fd6b1534421c735666 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期二, 14 四月 2026 14:29:52 +0800
Subject: [PATCH] 添加强制结托
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/AGV_CPExtend.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs"
index 28dbd16..1bd94d0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/AGV_CPExtend.cs"
@@ -103,7 +103,7 @@
throw new Exception("鏈壘鍒癆GV绔欑偣");
}
//鍙栨斁浠诲姟妯＄増
- if (stationMangerStart.StationCode.Contains("PNT") && !stationMangerEnd.StationCode.Contains("PNT") && stationMangerEnd.IsManual==0)//璇锋眰鏀�
+ if ((stationMangerStart.StationCode.Contains("PNT") || stationMangerStart.IsManual == 1) && !stationMangerEnd.StationCode.Contains("PNT") && stationMangerEnd.IsManual == 0)//璇锋眰鏀�
{
agvTaskSend.TaskCode = "DUIGAO1";
if (stationMangerStart.StationType == 998 || stationMangerEnd.StationType == 998)//娼滀紡椤跺崌杞�
@@ -111,7 +111,7 @@
agvTaskSend.TaskCode = "DUOLUN1";
}
}
- else if (!stationMangerStart.StationCode.Contains("PNT") && stationMangerEnd.StationCode.Contains("PNT") && stationMangerStart.IsManual == 0)//璇锋眰鍙�
+ else if (!stationMangerStart.StationCode.Contains("PNT") &&(stationMangerEnd.StationCode.Contains("PNT") || stationMangerEnd.IsManual == 1) && stationMangerStart.IsManual == 0)//璇锋眰鍙�
{
agvTaskSend.TaskCode = "DUIGAO2";
if (stationMangerStart.StationType==998 || stationMangerEnd.StationType == 998)//娼滀紡椤跺崌杞�
@@ -139,7 +139,7 @@
{
agvTaskSend.Variables.FirstOrDefault(x => x.Code == "FHMH").Value = "0";
agvTaskSend.Variables.FirstOrDefault(x => x.Code == "GoodPoint").Value = "";
- //鍒ゆ柇浜哄伐鎵嬪姩
+ //鍒ゆ柇浜哄伐鎵嬪姩 1 闇�鏀捐揣瀹屾垚 2闇�鍙栬揣瀹屾垚 3 鍙栬揣瀹屾垚鍜屾斁璐у畬鎴愰兘闇�瑕� 0 鍙栬揣鏀捐揣瀹屾垚閮戒笉闇�瑕�
PointDetail complete = new();
if (stationMangerStart.IsManual==1 && stationMangerEnd.IsManual==0)
{
@@ -197,7 +197,7 @@
}
catch (Exception ex)
{
- task.TaskState = TaskStatusEnum.Exception.ObjToInt();
+ task.TaskState = TaskStatusEnum.AGV_Exception.ObjToInt();
task.ExceptionMessage = ex.Message;
}
}
--
Gitblit v1.9.3