From e2a5657e3a0b8615bcd78a3149e5ba9ce5579bb8 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 02 十二月 2024 16:25:35 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 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 9013f1b..84ea5c9 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"
@@ -602,7 +602,14 @@
{
return true;
}
-
+ }
+ DeviceProDTO? deviceProDTO6 = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryRequest_A2in"); //绌烘墭鍑哄叆搴�
+ if (deviceProDTO6 != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO6.DeviceProAddress).Status)
+ {
+ return true;
+ }
}
}
return false;
@@ -652,6 +659,15 @@
if (deviceProDTO != null)
{
if(SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+ }
+ }
+
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryPermission_A2in");
+ if (deviceProDTO != null)
+ {
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
@@ -719,7 +735,17 @@
}
}
}
-
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompleted_A2in");
+ if (deviceProDTO != null)
+ {
+ if (GetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress).Status)
+ {
+ return true;
+ }
+ }
+ }
return false;
}
@@ -768,7 +794,14 @@
if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
}
}
-
+ if (Destinationaddress == "R01-002-043-001-01")
+ {
+ DeviceProDTO? deviceProDTO = GetDeviceProDTO2(commonStackerCrane, commonStackerCrane.DeviceCode, "DeliveryCompletion_A2in");
+ if (deviceProDTO != null)
+ {
+ if (SetStacker(commonStackerCrane, deviceProDTO.DeviceProAddress, SCcrane).Status) { return true; }
+ }
+ }
return false;
}
--
Gitblit v1.9.3