From 9d34ec27aa5bb9310abd23c6f542b6e4e79a3637 Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期日, 09 三月 2025 10:44:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJiPingKu
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 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 a1027df..4f6742d 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"
@@ -138,35 +138,40 @@
{
if (oHTReadData.R_RunState == (int)RunStateEnum.Standby)
{
- Dt_Task? task = GetTask(InorOut);
- if (task != null)
+ //鏌ョ湅浠诲姟姹犱腑鏄惁瀛樺湪鎵ц涓殑浠诲姟
+ var tasking = _taskService.QueryTasking();
+ if (tasking==null)
{
- OHTTaskCommand? oHTTaskCommand = ConvertToOHTTaskCommand(task);
- if (oHTTaskCommand != null)
+ Dt_Task? task = GetTask(InorOut);
+ if (task != 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);
- device.SetValue(DeviceDBName.W_Pick_Column, oHTTaskCommand.W_Pick_Column);
- device.SetValue(DeviceDBName.W_Put_Line, oHTTaskCommand.W_Put_Line);
- device.SetValue(DeviceDBName.W_Put_Column, oHTTaskCommand.W_Put_Column);
- device.SetValue(DeviceDBName.W_Catch_1, oHTTaskCommand.W_Catch_1);
- device.SetValue(DeviceDBName.W_Catch_2, oHTTaskCommand.W_Catch_2);
- device.SetValue(DeviceDBName.W_TaskNumber, oHTTaskCommand.W_TaskNumber);
- device.SetValue(DeviceDBName.W_CheckValue, oHTTaskCommand.W_CheckValue);
- //纭淇″彿鍐欏叆1锛屼换鍔′笅杈惧畬鎴�
- device.SetValue(DeviceDBName.W_ConfirmSignal, 1);
- Thread.Sleep(500);
- //WCS妫�娴嬪埌澶╄溅鐨凴_TaskState=1锛岄�氳繃W_ConfirmSignal缃�2琛ㄧず璁╁ぉ杞﹀紑濮嬫墽琛屼换鍔�
- int R_TaskState = device.GetValue<DeviceDBName, short>(DeviceDBName.R_TaskState);
- if (R_TaskState == 1)
+ OHTTaskCommand? oHTTaskCommand = ConvertToOHTTaskCommand(task);
+ if (oHTTaskCommand != null)
{
- device.SetValue(DeviceDBName.W_ConfirmSignal, 2);
+ //缁欏ぉ杞︿笅鍙戜换鍔′箣鍓嶅皢姝ゅ�煎啓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);
+ device.SetValue(DeviceDBName.W_Pick_Column, oHTTaskCommand.W_Pick_Column);
+ device.SetValue(DeviceDBName.W_Put_Line, oHTTaskCommand.W_Put_Line);
+ device.SetValue(DeviceDBName.W_Put_Column, oHTTaskCommand.W_Put_Column);
+ device.SetValue(DeviceDBName.W_Catch_1, oHTTaskCommand.W_Catch_1);
+ device.SetValue(DeviceDBName.W_Catch_2, oHTTaskCommand.W_Catch_2);
+ device.SetValue(DeviceDBName.W_TaskNumber, oHTTaskCommand.W_TaskNumber);
+ device.SetValue(DeviceDBName.W_CheckValue, oHTTaskCommand.W_CheckValue);
+ //纭淇″彿鍐欏叆1锛屼换鍔′笅杈惧畬鎴�
+ device.SetValue(DeviceDBName.W_ConfirmSignal, 1);
+ Thread.Sleep(500);
+ //WCS妫�娴嬪埌澶╄溅鐨凴_TaskState=1锛岄�氳繃W_ConfirmSignal缃�2琛ㄧず璁╁ぉ杞﹀紑濮嬫墽琛屼换鍔�
+ int R_TaskState = device.GetValue<DeviceDBName, short>(DeviceDBName.R_TaskState);
+ if (R_TaskState == 1)
+ {
+ device.SetValue(DeviceDBName.W_ConfirmSignal, 2);
+ }
+ //涓嬪彂鎴愬姛锛屼慨鏀逛换鍔＄姸鎬�
+ _taskService.UpdateTaskStatus(task.TaskId, oHTTaskCommand.W_Task_Type);
}
- //涓嬪彂鎴愬姛锛屼慨鏀逛换鍔＄姸鎬�
- _taskService.UpdateTaskStatus(task.TaskNum, oHTTaskCommand.W_Task_Type);
}
}
}
--
Gitblit v1.9.3