From 96a77e69b0577c50adfaacd5fd8b89009242d3bd Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期日, 07 十二月 2025 18:25:00 +0800
Subject: [PATCH] 更新
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index d85ccb2..582dfa7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -101,8 +101,20 @@
bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand);
if (sendFlag)
{
- commonStackerCrane.LastTaskType = task.TaskType;
- _taskService.UpdateTaskStatusToNext(task.TaskNum);
+ WebResponseContent webResponseContent=_taskService.UpdateTaskStatusToNext(task.TaskNum);
+ if (webResponseContent.Status)
+ {
+ wcs_PLCto09("浠诲姟涓嬪彂鎴愬姛", $"浠诲姟鍙凤細{task.TaskNum}", $"鎵樼洏鏉＄爜锛歿task.PalletCode},鏃堕棿锛歿DateTime.Now}");
+ }
+ else
+ {
+ wcs_PLCto09("浠诲姟涓嬪彂澶辫触", $"浠诲姟鍙凤細{task.TaskNum}", $"澶辫触鍘熷洜锛歿webResponseContent.Message}");
+ }
+ }
+ else
+ {
+
+ wcs_PLCto09("浠诲姟涓嬪彂澶辫触", $"浠诲姟鍙凤細{task.TaskNum}", $"涓嬪彂缁欏爢鍨涙満浠诲姟澶辫触锛岀姸鎬侊細{sendFlag}");
}
}
}
@@ -112,6 +124,7 @@
}
catch (Exception ex)
{
+ wcs_PLCto09("鍫嗗灈鏈篔ob", $"鏁呴殰", $"鍘熷洜锛歿ex.Message}");
//Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
}
return Task.CompletedTask;
@@ -174,6 +187,25 @@
}
}
+ //1宸风┖鐩樹紭鍏堝叆搴�
+ Dt_Task Inkongtuo= TasksList.Where(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && (x.TargetAddress == "R01-002-043-001-01" || x.SourceAddress == "R01-002-043-001-01")).OrderBy(x => x.CreateDate).FirstOrDefault();
+ if( Inkongtuo != null)
+ {
+ string[] targetCodes = Inkongtuo.TargetAddress.Split("-");
+ if (targetCodes[4] == "01") return Inkongtuo; //濡傛灉鏄祬搴撲綅锛屽垯鐩存帴杩斿洖璇ヤ换鍔�
+
+ //濡傛灉涓烘繁搴撲綅锛屽垯鏌ョ湅鏄惁鏈夐渶瑕佹墽琛岀殑浠诲姟
+ if (targetCodes[4] == "02")
+ {
+
+ Dt_Task taskst = InTaskMove(Inkongtuo);
+ if (taskst != null)
+ {
+ return taskst;
+ }
+ }
+ }
+
foreach (var item in TasksList)
{
@@ -195,6 +227,7 @@
}
else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
+
string[] targetCodes = item.SourceAddress.Split("-");//杩涜瑙ｆ瀽璐т綅
if (targetCodes[4] == "02")
{
@@ -542,7 +575,7 @@
if (deviceProDTO != null)
{
int B_Event_Test = GetLine(conveyorLine, deviceProDTO.DeviceProDataBlock); //鍒ゆ柇杈撻�佺嚎鏄惁鍏佽鍙栬揣淇″彿
- if (B_Event_Test == 1)
+ if (B_Event_Test == 1 || (task.SourceAddress== "R01-002-043-001-01" && B_Event_Test==6))
{
if (Releasespermitted2(commonStackerCrane, task.SourceAddress,true)) //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
{
@@ -1327,5 +1360,10 @@
{
WriteLog.Write_Log("鍑哄簱绔欏彴淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
}
+
+ public void wcs_PLCto09(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("鍫嗗灈鏈轰笅鍙戞儏鍐�", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
}
}
--
Gitblit v1.9.3