From 692f6b474db06bf7e8b713474531018faf69388d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 18 十月 2025 10:35:53 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 55f5a0c..6e6c87e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -67,7 +67,7 @@
StackerCraneTaskFinish(commonStackerCrane, commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum));
}
- if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running))
+ if (commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Automatic) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Fault) && !commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.Running)&&!commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.InStock))
{
Dt_Task? task = GetTask(commonStackerCrane);
@@ -134,7 +134,7 @@
LevelPoint = commonStackerCrane.GetValue<StackerCraneDBName, int>(StackerCraneDBName.LevelPoint),
CurrentTaskNum = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.CurrentTaskNum),
StackerAlarm = GetAlarm(commonStackerCrane.GetValue<StackerCraneDBName, uint>(StackerCraneDBName.StackerAlarm)),
-
+ InStock=commonStackerCrane.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.InStock),
commonStackerCrane.DeviceCode,
commonStackerCrane.DeviceName,
};
@@ -163,6 +163,7 @@
}
return "";
}
+
public string StackerCraneAlarm(int alarm) => alarm switch
{
0 => "鎸囦护鎴栧湴鍧�閿欒",
@@ -195,8 +196,8 @@
27 => "鏀捐揣鏃惰揣鏋舵湁璐�",
28 => "鏀捐揣鍚庤浇璐у彴鏈夎揣",
29 => "鏀炬繁璐ф椂娴呰揣浣嶆湁璐�",
- 30 => "",
- 31 => "",
+ 30 => "琛岃蛋浣嶇疆寮傚父",
+ 31 => "鎻愬崌浣嶇疆寮傚父",
_ => $"鏈煡鎶ヨ({alarm})"
};
--
Gitblit v1.9.3