From daf541c51a7687b338e17b1543266bacee4ff2d3 Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期四, 09 一月 2025 09:34:53 +0800
Subject: [PATCH] 同步上游系统job修改
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index c8c7638..bb707d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -44,7 +44,7 @@
{
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
try
- {
+ {
//CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
{
@@ -59,14 +59,17 @@
if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
{
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈哄紑濮嬫墽琛岋紝鑾峰彇浠诲姟鍙�");
Dt_Task? task = GetTask(commonStackerCrane);
if (task != null)
{
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈哄紑濮嬫墽琛岋紝浠诲姟鍙凤細{task.TaskNum}");
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
int isIn = commonStackerCrane.Communicator.Read<byte>("DB106.12.0");
if((task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory) &&isIn==1)//濡傛灉鍦ㄥ叆搴撲腑锛屼笉鍏佽涓嬪彂鍑哄簱浠诲姟
{
- return Task.CompletedTask;
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍑哄簱鏍￠獙锛屽湪鍏ュ簱涓紝涓嶅厑璁′笅鍙戝嚭搴撶被鍨嬩换鍔★紝浠诲姟鍙凤細{task.TaskNum}");
+ return Task.CompletedTask;
}
if (stackerCraneTaskCommand != null)
{
@@ -77,13 +80,30 @@
{
_taskService.UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InExecuting);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撴墽琛屼腑");
+ WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽紑濮嬪洖鍐橶MS浠诲姟鐘舵�侊紝浠诲姟鍙凤細{task.TaskNum}");
var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
+ if(response.Status==true)
+ {
+ WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佹垚鍔燂紝浠诲姟鍙凤細{task.TaskNum}");
+ }
+ else
+ {
+ WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佸け璐ワ紝浠诲姟鍙凤細{task.TaskNum}锛屽け璐ュ師鍥爗response.Message}");
+ }
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound|| task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
{
_taskService.UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutExecuting);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撴墽琛屼腑");
var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "鏇存柊浠诲姟鐘舵��");
+ if (response.Status == true)
+ {
+ WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佹垚鍔燂紝浠诲姟鍙凤細{task.TaskNum}");
+ }
+ else
+ {
+ WriteDebug(nameof(CommonStackerCraneJob), $"WCS鍫嗗灈鏈哄叆搴撴墽琛屼腑锛屽洖鍐橶MS浠诲姟鐘舵�佸け璐ワ紝浠诲姟鍙凤細{task.TaskNum}锛屽け璐ュ師鍥爗response.Message}");
+ }
}
}
}
@@ -94,30 +114,39 @@
}
catch (Exception ex)
{
- Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈烘墽琛屽紓甯革紝{ex.Message}");
}
- if (commonStackerCrane != null)
+ try
{
- //璇诲彇澶у爢鍨涙満浠诲姟鍙峰拰浠诲姟瀹屾垚纭鐘舵�侊紙鍥犱负灏佽鐨勪簨浠剁粡甯镐笉瑙﹀彂锛屾墍浠ュ姞涓洿鎺ヨ鐨勯�昏緫锛屼互鍏嶅嚭鐜板爢鍨涙満涓�鐩存帴澶勪簬绛夊緟wcs纭锛�
- byte IsOver = commonStackerCrane.Communicator.Read<byte>("DB106.22");
- int tasknum = commonStackerCrane.Communicator.Read<int>("DB106.18");
- //WriteDebug(nameof(CommonStackerCraneJob), $"澶у爢鍨涙満SC01浠诲姟鍙峰爢鍨涙満浠诲姟鍙凤細{tasknum}鐘舵�侊細{IsOver}");
- if (IsOver == 6)
+ if (commonStackerCrane != null)
{
- if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
+ //璇诲彇澶у爢鍨涙満浠诲姟鍙峰拰浠诲姟瀹屾垚纭鐘舵�侊紙鍥犱负灏佽鐨勪簨浠剁粡甯镐笉瑙﹀彂锛屾墍浠ュ姞涓洿鎺ヨ鐨勯�昏緫锛屼互鍏嶅嚭鐜板爢鍨涙満涓�鐩存帴澶勪簬绛夊緟wcs纭锛�
+ byte IsOver = commonStackerCrane.Communicator.Read<byte>("DB106.22");
+ int tasknum = commonStackerCrane.Communicator.Read<int>("DB106.18");
+ //WriteDebug(nameof(CommonStackerCraneJob), $"澶у爢鍨涙満SC01浠诲姟鍙峰爢鍨涙満浠诲姟鍙凤細{tasknum}鐘舵�侊細{IsOver}");
+ if (IsOver == 6)
{
- _taskService.StackCraneTaskCompleted(tasknum);
- Console.Out.WriteLine("TaskCompleted" + tasknum);
- bool issuccess = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
- if (issuccess)
+ if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
{
- WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈轰换鍔″彿锛歿tasknum},鍫嗗灈鏈哄洖鍐�5鎴愬姛");
+ _taskService.StackCraneTaskCompleted(tasknum);
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈篧CS浠诲姟鎵ц瀹屾垚锛屼换鍔″彿锛歿tasknum}");
+ Console.Out.WriteLine("TaskCompleted" + tasknum);
+ bool issuccess = commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
+ if (issuccess)
+ {
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈轰换鍔″彿锛歿tasknum},鍫嗗灈鏈哄洖鍐�5鎴愬姛");
+ }
}
}
}
}
+ catch(Exception ex)
+ {
+ WriteDebug(nameof(CommonStackerCraneJob), $"鍫嗗灈鏈轰换鍔″畬鎴愬紓甯革紝{ex.Message}");
+ }
+
return Task.CompletedTask;
}
--
Gitblit v1.9.3