From 81f3d2205ff6ee8d173f6d30f57ad510ad86e0bf Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期三, 20 十一月 2024 16:04:07 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs"
index 318452b..fdac4dc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs"
@@ -56,16 +56,17 @@
CommonStackerCrane? stackerCraneOne = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC02") as CommonStackerCrane;
CommonStackerCrane? stackerCraneTwo = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC03") as CommonStackerCrane;
- Dt_DeviceInfo deviceSC02= _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
- Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
- if(deviceSC02.DeviceStatus=="0")
- {
- stackerCraneOne = null;
- }
- if(deviceSC03.DeviceStatus=="0")
- {
- stackerCraneTwo = null;
- }
+ //Dt_DeviceInfo deviceSC02= _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
+ //Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
+ //if(deviceSC02.DeviceStatus=="0")
+ //{
+ // stackerCraneOne = null;
+ //}
+ //if(deviceSC03.DeviceStatus=="0")
+ //{
+ // stackerCraneTwo = null;
+ //}
+ stackerCraneOne.CheckStackerCraneTaskCompleted();
Dt_Task? task = GetTask();
if (task != null)
{
@@ -159,9 +160,11 @@
}
}
- else//涓嶈兘姝ｅ父宸ヤ綔鐘舵��
+ else//SC02涓嶈兘姝ｅ父宸ヤ綔鐘舵��,杩欓噷闇�瑕佸垽鏂璼c02鏄惁绂佺敤锛屽鏋滃凡绂佺敤锛屾墠鍙互鍚姩sc03
{
- if (stackerCraneTwo != null)
+ Dt_DeviceInfo deviceSC02 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
+
+ if (deviceSC02.DeviceStatus=="0"&& stackerCraneTwo != null)
{
if (!stackerCraneTwo.IsEventSubscribed)
{
@@ -198,9 +201,10 @@
return stackerCraneTwo;
}
}
- else
+ else//SC03涓嶈兘姝ｅ父宸ヤ綔鐘舵��,杩欓噷闇�瑕佸垽鏂璼c03鏄惁绂佺敤锛屽鏋滃凡绂佺敤锛屾墠鍙互鍚姩sc02
{
- if (stackerCraneOne != null)
+ Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
+ if (deviceSC03.DeviceStatus=="0"&&stackerCraneOne != null)
{
if (!stackerCraneOne.IsEventSubscribed)
{
--
Gitblit v1.9.3