From 8c8a68df710d568f5f2b358c1e8c4b4799547d0b Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 31 十月 2025 15:24:34 +0800
Subject: [PATCH] 安全门，出入库
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
index 0145c70..257ffb9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
@@ -17,6 +17,7 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -52,23 +53,62 @@
public class AQMReturnnormal
{
+
/// <summary>
- /// 瀹夊叏闂ㄩ攣鐘舵��(0涓哄紑闂紝1涓哄叧闂�)
+ /// 1#瀹夊叏闂ㄦ寚绀虹伅鐘舵��(0锛氭棤杈撳嚭锛�1锛氱孩鐏父浜�+铚傞福 2锛氱豢鐏父浜紱3锛氶粍鐏棯鐑�(2HZ)锛�4锛氶粍鐏父浜�)
/// </summary>
- public ushort SafetyLockStatus { get; set; }
+ public short IndicatorStatus { get; set; }
/// <summary>
- /// 鎬ュ仠鐘舵��(0涓烘�ュ仠锛�1涓烘甯�)
+ /// 1#瀹夊叏闂ㄨ姹傚紑闂�(0涓烘甯革紝1涓鸿姹�)
/// </summary>
- public ushort EmergencyStopStatus { get;set; }
+ public short DoorRequest { get; set; }
/// <summary>
- /// 澶嶄綅鐘舵��(0涓哄紑闂紝1涓哄叧闂�)
+ /// 1#瀹夊叏闂ㄦ柇鐢电姸鎬�(0涓烘柇鐢碉紝1涓轰笂鐢�)
/// </summary>
- public ushort ResetStatus { get; set; }
+ public short PowerOffStatus { get; set; }
/// <summary>
- /// 鎬ュ仠鐘舵��(0涓烘�ュ仠锛�1涓烘甯�)
+ /// 1#瀹夊叏闂ㄦ�ュ仠鐘舵��(0涓烘�ュ仠锛�1涓烘甯�)
/// </summary>
- public ushort PowerOffStatus { get; set; }
+ public short EmergencyStopStatus { get;set; }
+ /// <summary>
+ /// 1#瀹夊叏闂ㄩ攣鐘舵��(0涓哄紑闂紝1涓哄叧闂�)
+ /// </summary>
+ public short SafetyLockStatus { get; set; }
+ /// <summary>
+ /// 1#瀹夊叏闂ㄥ浣嶇姸鎬�(0涓烘甯革紝1涓哄浣嶄腑)
+ /// </summary>
+ public short ResetStatus { get; set; }
}
+
+ public enum SafetyDoorStatus
+ {
+ /// <summary>
+ /// 鏃犺緭鍑�
+ /// </summary>
+ [Description("鏃犺緭鍑�")]
+ AQMOff = 0,
+ /// <summary>
+ /// 绾㈢伅甯镐寒+铚傞福
+ /// </summary>
+ [Description("绾㈢伅甯镐寒+铚傞福")]
+ RedBeep = 1,
+ /// <summary>
+ /// 缁跨伅甯镐寒
+ /// </summary>
+ [Description("缁跨伅甯镐寒")]
+ GreenOn = 2,
+ /// <summary>
+ /// 榛勭伅闂儊(2HZ)
+ /// </summary>
+ [Description("榛勭伅闂儊(2HZ)")]
+ YellowBlink2Hz = 3,
+ /// <summary>
+ /// 榛勭伅甯镐寒
+ /// </summary>
+ [Description("榛勭伅甯镐寒")]
+ YellowOn = 4
+ }
+
@@ -77,6 +117,16 @@
{
public static List<string> ConveyorAQMCommand = new List<string>() { "DoorRequest", "ResetStatus" };
- public static List<string> ConveyorAQMReturnnormal = new List<string>() { "SafetyLockStatus", "EmergencyStopStatus", "ResetStatus", "PowerOffStatus" };
+ public static List<string> ConveyorAQMReturnnormal = new List<string>() { "IndicatorStatus", "DoorRequest", "PowerOffStatus", "EmergencyStopStatus", "SafetyLockStatus", "ResetStatus" };
+ }
+
+
+
+ public class PlatformStatus
+ {
+ /// <summary>
+ /// 0鏃犺揣锛�1鏈夎揣
+ /// </summary>
+ public ushort HCJ_GoodsStatus { get; set; }
}
}
--
Gitblit v1.9.3