From 4ece6686d7751eb7c9c7a9e7fc793cde0c2b4e76 Mon Sep 17 00:00:00 2001
From: qinchulong <qinchulong@hnkhzn.com>
Date: 星期二, 04 三月 2025 20:49:34 +0800
Subject: [PATCH] t
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs"
index 43608d4..07f4c0a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs"
@@ -45,7 +45,6 @@
}
public Task Execute(IJobExecutionContext context)
{
-
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
if (flag && value != null)
{
@@ -55,10 +54,10 @@
var ZXJdevice = Storage.Devices.Find(v => v.DeviceName == "闃虫瀬鏁村舰鏈�");
//瑙勬暣鏈篜LC瀵硅薄
var GZJevice = Storage.Devices.Find(v => v.DeviceName == "闃虫瀬瑙勬暣鏈�");
- if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
- {
- return Task.CompletedTask;
- }
+ //if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
+ //{
+ // return Task.CompletedTask;
+ //}
try
{
#region 澶╄溅瀹屾垚浠诲姟閫昏緫
@@ -96,6 +95,14 @@
}
}
}
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ {
+ WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
+ if (result.Status)
+ {
+ device.SetValue(DeviceDBName.W_ConfirmSignal, 3);
+ }
+ }
return Task.CompletedTask;
}
else if (oHTReadData.R_RunState == (int)RunStateEnum.PutCompleted && oHTReadData.R_TaskState == (int)TaskStateEnum.TaskComplete)
@@ -111,7 +118,7 @@
#endregion
#region 澶╄溅鍙戦�佷换鍔￠�昏緫
- if (oHTReadData.R_RunMode == (int)RunModeEnum.Automatic && oHTReadData.R_AlarmCode == (int)AlarmCodeEnum.Normal)
+ if (oHTReadData.R_RunMode == (int)RunModeEnum.Automatic )
{
if (oHTReadData.R_RunState == (int)RunStateEnum.Standby)
{
@@ -121,6 +128,8 @@
OHTTaskCommand? oHTTaskCommand = ConvertToOHTTaskCommand(task);
if (oHTTaskCommand != null)
{
+ //缁欏ぉ杞︿笅鍙戜换鍔′箣鍓嶅皢姝ゅ�煎啓0
+ device.SetValue(DeviceDBName.W_ConfirmSignal, 0);
//todo锛氬啓鍏ヤ换鍔″懡浠�
device.SetValue(DeviceDBName.W_Task_Type, oHTTaskCommand.W_Task_Type);
device.SetValue(DeviceDBName.W_Pick_Line, oHTTaskCommand.W_Pick_Line);
@@ -184,7 +193,7 @@
_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"浠诲姟婧愬湴鍧�閰嶇疆閿欒锛�");
return null;
}
- oHtTaskCommand.W_CheckValue = task.TaskType + Convert.ToInt16(SourceCodes[0]) + Convert.ToInt16(SourceCodes[1]);
+ oHtTaskCommand.W_CheckValue = 2 + Convert.ToInt16(SourceCodes[0]) + Convert.ToInt16(SourceCodes[1]);
}
else if (task.TaskState == (int)TaskInStatusEnum.Line_Ingrab || task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
{
@@ -203,7 +212,7 @@
_taskService.UpdateTaskExceptionMessage(task.TaskNum, $"浠诲姟婧愬湴鍧�閰嶇疆閿欒锛�");
return null;
}
- oHtTaskCommand.W_CheckValue = task.TaskType + Convert.ToInt16(SourceCodes[0]) + Convert.ToInt16(SourceCodes[1]);
+ oHtTaskCommand.W_CheckValue = 3 + Convert.ToInt16(SourceCodes[0]) + Convert.ToInt16(SourceCodes[1]);
}
if (task.WMSId==1)
@@ -249,6 +258,17 @@
InorOut = "In";
}
}
+ else
+ {
+ if (workType.Equals("In"))
+ {
+ InorOut = "Out";
+ }
+ else
+ {
+ InorOut = "In";
+ }
+ }
return task;
}
}
--
Gitblit v1.9.3