From 8d558cb173873004cd8a0d6c12f37865f03d7a4f Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 22 十月 2025 10:32:15 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/GetStackerObject.cs | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/GetStackerObject.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/GetStackerObject.cs"
index 17c59f3..4ed386b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/GetStackerObject.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/GetStackerObject.cs"
@@ -32,11 +32,16 @@
public RgvCraneAutoStatus RgvCraneAutoStatusValue => GetRgvCraneAutoStatus();
/// <summary>
+ /// 鍒濆鍖栧姛鑳斤紙0锛氬凡鍒濆鍖栵紝1锛氭湭鍒濆鍖栵級
+ /// </summary>
+ public RGVInitialize RGVInitializationValue=> GetRGVInitializationValue();
+
+ /// <summary>
/// 浠诲姟鐘舵�侊紙0绌洪棽銆�1鎵ц涓��2宸插畬鎴愩��3寮傚父瀹屾垚锛�
/// </summary>
/// <param name="speStackerCrane"></param>
/// <returns></returns>
- public RgvJobCraneStatus StaclerkJobJobStatusValue => GetRgvJobCraneWorkStatus();
+ public RGV_Rgvtaskstutas StaclerkJobJobStatusValue => GetRgvJobCraneWorkStatus();
/// <summary>
/// 姝ヨ繘鐘舵�侊紙0鏃犲姩浣溿��1鍙栬揣琛岃蛋銆�2鍙栬揣銆�3鏀捐揣琛岃蛋銆�4鏀捐揣銆�5浠呰璧颁腑锛�
@@ -49,6 +54,11 @@
/// 褰撳墠锛屽瓙姣嶈溅鐨勫湴鍧�
/// </summary>
public int RGVCurrentlocation => GetRGVCurrentlocation();
+
+ /// <summary>
+ /// 褰撳墠瀛愭瘝杞︾殑鐩爣浣嶅瓙
+ /// </summary>
+ public int RGVNdexlocation => GetRGVNdexlocation();
/// <summary>
/// 褰撳墠rgv浠诲姟
@@ -78,6 +88,15 @@
}
/// <summary>
+ /// 鑾峰彇rgv鎵嬭嚜鍔ㄧ姸鎬�
+ /// </summary>
+ /// <returns></returns>
+ private RGVInitialize GetRGVInitializationValue()
+ {
+ return Enum.Parse<RGVInitialize>(GetStatus(nameof(RGVInitialize)));
+ }
+
+ /// <summary>
/// 鑾峰彇rgv宸ヤ綔鐘舵��
/// </summary>
/// <returns></returns>
@@ -90,11 +109,10 @@
/// 鑾峰彇rgv浣滀笟鐘舵��
/// </summary>
/// <returns></returns>
- private RgvJobCraneStatus GetRgvJobCraneWorkStatus()
+ private RGV_Rgvtaskstutas GetRgvJobCraneWorkStatus()
{
- return Enum.Parse<RgvJobCraneStatus>(GetStatus(nameof(RgvJobCraneStatus)));
+ return Enum.Parse<RGV_Rgvtaskstutas>(GetStatus(nameof(RGV_Rgvtaskstutas)));
}
-
/// <summary>
/// 鑾峰彇褰撳墠鍦板潃
@@ -103,10 +121,33 @@
private int GetRGVCurrentlocation()
{
- DeviceProDTO deviceProDTO = _speStackerCrane.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == "RGVCurrentlocation");
+ try
+ {
+ DeviceProDTO deviceProDTO = _speStackerCrane.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == "RGVCurrentlocation");
+ if (deviceProDTO != null)
+ {
+ return (short)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, "int", 1);
+ }
+ return 0;
+ }
+ catch (Exception ex)
+ {
+ return 0;
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 鐩爣浣嶇疆
+ /// </summary>
+ /// <returns></returns>
+ private int GetRGVNdexlocation()
+ {
+
+ DeviceProDTO deviceProDTO = _speStackerCrane.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == "RGVCurrentlocationt");
if (deviceProDTO != null)
{
- return (int)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, deviceProDTO.DeviceDataType, 1);
+ return (short)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, "int", 1);
}
return 0;
}
@@ -117,11 +158,10 @@
/// <returns></returns>
private int GetCurrentRgvtaskid()
{
-
DeviceProDTO deviceProDTO = _speStackerCrane.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == "RGV_Rgvtaskid");
if (deviceProDTO != null)
{
- return (int)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, deviceProDTO.DeviceDataType, 1);
+ return (short)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, "int", 1);
}
return 0;
}
@@ -136,7 +176,7 @@
DeviceProDTO deviceProDTO = _speStackerCrane.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == "RGV_Lanjiantaskid");
if (deviceProDTO != null)
{
- return (int)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, deviceProDTO.DeviceDataType, 1);
+ return (short)_speStackerCrane.Communicator.ReadAsObj(deviceProDTO.DeviceProAddress, "int", 1);
}
return 0;
}
@@ -192,10 +232,10 @@
{
if(_speStackerCrane.IsConnected)
{
- _speStackerCrane.SetValue(RgvCraneDBName.RGV_RGVTasklocation, command.RGV_RGVTasklocation);
- _speStackerCrane.SetValue(RgvCraneDBName.RGV_RGVtasktype, command.RGV_RGVtasktype);
- _speStackerCrane.SetValue(RgvCraneDBName.RGV_Rgvtaskid, command.RGV_Rgvtaskid);
- _speStackerCrane.SetValue(RgvCraneDBName.RGV_Lanjiantaskid, command.RGV_Lanjiantaskid);
+ _speStackerCrane.SetValue(RgvCraneDBName.RGV_RGVTasklocationt, command.RGV_RGVTasklocation);
+ _speStackerCrane.SetValue(RgvCraneDBName.RGV_RGVtasktypet, command.RGV_RGVtasktype);
+ _speStackerCrane.SetValue(RgvCraneDBName.RGV_Rgvtaskidt, command.RGV_Rgvtaskid);
+ _speStackerCrane.SetValue(RgvCraneDBName.RGV_Lanjiantaskidt, command.RGV_Lanjiantaskid);
return true;
}
return false;
--
Gitblit v1.9.3