From 8e49faa42ff419efa0641478702ce7d5f8455bd9 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 30 七月 2025 20:47:56 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs"
index 52840da..a17c0ed 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs"
@@ -79,7 +79,7 @@
public Task Execute(IJobExecutionContext context)
{
- Console.WriteLine(DateTime.Now.ToString() + "锛岀嚎绋婭D锛�" + Thread.CurrentThread.ManagedThreadId);
+ //Console.WriteLine(DateTime.Now.ToString() + "锛岀嚎绋婭D锛�" + Thread.CurrentThread.ManagedThreadId);
try
{
//鐢ㄨ繖绉嶆柟寮忚兘纭繚绫诲瀷杞崲涓嶄細鏈夐棶棰�
@@ -164,6 +164,7 @@
Running = RGVWorkStatus(FirstRgv.GetValue<RGVDBName, bool>(RGVDBName.Running)),
LevelPoint = FirstRgv.GetValue<RGVDBName, int>(RGVDBName.LevelPoint),
CurrentTaskNum = FirstRgv.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum),
+ RGVAlarm = FirstRgv.GetValue<RGVDBName, uint>(RGVDBName.RGVAlarm),
FirstRgv.DeviceCode,
FirstRgv.DeviceName,
};
@@ -175,16 +176,16 @@
}
else
{
- if (commonRGVFirst == null)
- Console.WriteLine($"RGV01鏈壘鍒拌澶囧璞＄殑鍊�");
- else
- Console.WriteLine($"RGV01璁惧瀵硅薄绫诲瀷閿欒");
+ //if (commonRGVFirst == null)
+ // Console.WriteLine($"RGV01鏈壘鍒拌澶囧璞＄殑鍊�");
+ //else
+ // Console.WriteLine($"RGV01璁惧瀵硅薄绫诲瀷閿欒");
}
#endregion
#region RGV02璋冨害
- if (commonRGVSecond != null && commonRGVFirst is CommonRGV_FirstFloor SecondRgv)//杩欐牱鑳界湅鍑烘潵浼犲弬鍒板簳鍝噷鏈夐棶棰�
+ if (commonRGVSecond != null && commonRGVSecond is CommonRGV_FirstFloor SecondRgv)//杩欐牱鑳界湅鍑烘潵浼犲弬鍒板簳鍝噷鏈夐棶棰�
{
if (SecondRgv.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.WorkCompleted))
{
@@ -254,6 +255,7 @@
Running = RGVWorkStatus(SecondRgv.GetValue<RGVDBName, bool>(RGVDBName.Running)),
LevelPoint = SecondRgv.GetValue<RGVDBName, int>(RGVDBName.LevelPoint),
CurrentTaskNum = SecondRgv.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum),
+ RGVAlarm = SecondRgv.GetValue<RGVDBName, uint>(RGVDBName.RGVAlarm),
SecondRgv.DeviceCode,
SecondRgv.DeviceName,
};
@@ -265,10 +267,10 @@
}
else
{
- if (commonRGVSecond == null)
- Console.WriteLine($"RGV02鏈壘鍒拌澶囧璞＄殑鍊�");
- else
- Console.WriteLine($"RGV02璁惧瀵硅薄绫诲瀷閿欒");
+ //if (commonRGVSecond == null)
+ // Console.WriteLine($"RGV02鏈壘鍒拌澶囧璞＄殑鍊�");
+ //else
+ // Console.WriteLine($"RGV02璁惧瀵硅薄绫诲瀷閿欒");
}
#endregion
//}
@@ -435,7 +437,7 @@
{
var tasks = _taskService.QueryRGVTask();
Dt_Task task;
- if (tasks == null && tasks.Count() == 0)
+ if (tasks.Count() == 0)
{
return null;
}
--
Gitblit v1.9.3