From 693584e6c84f6292a29ba242aa9e47be200e451e Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:25:12 +0800
Subject: [PATCH] feat: 更新仓库枚举值和过滤条件,添加不等操作符支持 refactor: 重构任务和库存相关界面的查询逻辑 fix: 修复库存状态过滤条件错误问题 style: 统一代码格式和命名规范
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/StackerCrane/Spec/SpeFormationStackerCrane.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/StackerCrane/Spec/SpeFormationStackerCrane.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/StackerCrane/Spec/SpeFormationStackerCrane.cs
index 7c56dab..b9c3938 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/StackerCrane/Spec/SpeFormationStackerCrane.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/StackerCrane/Spec/SpeFormationStackerCrane.cs
@@ -6,6 +6,7 @@
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.StackerCrane;
using WIDESEAWCS_QuartzJob.StackerCrane.Enum;
+using WIDESEAWCS_QuartzJob.StackerCrane.Common;
namespace WIDESEAWCS_QuartzJob
{
@@ -13,7 +14,7 @@
/// 鑷畾涔夊爢鍨涙満
/// </summary>
[Description("鍖栨垚鍒嗗鍫嗗灈鏈�")]
- public class SpeFormationStackerCrane : IStackerCrane
+ public class SpeFormationStackerCrane : StackerCraneBase, IStackerCrane
{
#region Private Member
@@ -130,14 +131,14 @@
public object StackerCraneTaskCommand { get; set; }
/// <summary>
- /// 鍫嗗灈鏈轰换鍔″畬鎴愪簨浠�
- /// </summary>
- public event EventHandler<StackerCraneTaskCompletedEventArgs> StackerCraneTaskCompletedEventHandler;
-
- /// <summary>
/// 鍫嗗灈鏈哄畬鎴愪簨浠舵槸鍚﹀凡璁㈤槄
/// </summary>
public bool IsEventSubscribed => StackerCraneTaskCompletedEventHandler != null;
+
+ /// <summary>
+ /// 鍫嗗灈鏈轰换鍔″畬鎴愪簨浠�
+ /// </summary>
+ public event EventHandler<StackerCraneTaskCompletedEventArgs> StackerCraneTaskCompletedEventHandler;
#endregion Public Member
@@ -169,7 +170,7 @@
{
if (!Communicator.IsConnected)
{
- return StackerCraneStatus.Unkonw.ToString();
+ return StackerCraneStatus.Unknown.ToString();
}
List<DeviceProDTO> devicePros = _deviceProDTOs.Where(x => x.DeviceProParamType == protocolParamType).ToList();
@@ -192,7 +193,7 @@
}
}
- return StackerCraneStatus.Unkonw.ToString();
+ return StackerCraneStatus.Unknown.ToString();
}
/// <summary>
--
Gitblit v1.9.3