From 3799054e5cd8a42a49cc902cc9d9cb46059b3a7d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期日, 14 九月 2025 10:54:54 +0800
Subject: [PATCH] 添加WebSocket将设备运行信息推送到前端，前端将数据接收赋值到对应设备监控页面
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs | 136 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 127 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
index 5fbd015..754a34d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
@@ -27,14 +27,49 @@
{
public class ConveyorLineTaskCommand : DeviceCommand
{
- public ushort InteractiveSignal { get; set; }
-
- [DataLength(25)]
- public string Barcode { get; set; }
-
- public int TargetAddress { get; set; }
-
+ // <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
public int TaskNum { get; set; }
+ /// <summary>
+ /// 鐩爣绔欏彴
+ /// </summary>
+ public short TargetAddress { get; set; }
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ public short Weight { get; set; }
+ /// <summary>
+ /// 骞呭
+ /// </summary>
+ public short Width { get; set; }
+ /// <summary>
+ /// 鐩村緞/楂樺害
+ /// </summary>
+ public short Height { get; set; }
+
+ /// <summary>
+ /// 鐢宠<br/>
+ /// 86涓虹敵璇�
+ /// </summary>
+ public short InteractiveSignal { get; set; }
+
+ /// <summary>
+ /// 鐢宠鍙嶉 86鎴愬姛
+ /// </summary>
+ public short ResponState { get; set; }
+
+ private string _barcode;
+ /// <summary>
+ /// 鏉＄爜
+ /// </summary>
+ /// <summary>
+ [DataLength(40)]
+ public string Barcode
+ {
+ get { return _barcode; }
+ set { _barcode = value.Replace("\0", "").Replace("\\0", ""); }
+ }
}
public class R_ConveyorLineCPInfo : DeviceCommand
{
@@ -62,7 +97,7 @@
///7锛氱敵璇锋枡妗�
///8锛氭枡妗嗗埌浣�
///9锛氭墽琛屽懡浠や腑
- ///11锛氬紓甯�
+ ///11锛氭弧鐩樺噯澶�
/// </summary>
public short Command { get; set; }
/// <summary>
@@ -261,7 +296,8 @@
public short WR_Height { get; set; }
/// <summary>
- /// 鐢宠
+ /// 鐢宠<br/>
+ /// 86涓虹敵璇�
/// </summary>
public short WR_Request { get; set; }
@@ -350,4 +386,86 @@
/// </summary>
public short TaskReceivedDone { get; set; }
}
+
+ /// <summary>
+ /// 鎺ラ┏鍙版湁鏃犺揣
+ /// </summary>
+ public class C_RequestTakeStatus
+ {
+ /// <summary>
+ /// 鏈敵璇峰彇鏂�
+ /// </summary>
+ [BoolIndex(0)]
+ public bool NoTakeRequest { get; set; }
+
+ /// <summary>
+ /// 宸茬敵璇峰彇鏂�
+ /// </summary>
+ [BoolIndex(1)]
+ public bool OkTakeRequest { get; set; }
+ }
+
+ public class CoveryorInfo : DeviceCommand
+ {
+ /// <summary>
+ /// 鏈夋棤璐х姸鎬�
+ /// </summary>
+ public byte C_GoodsStatus { get; set; }
+ /// <summary>
+ /// 鏁呴殰鐘舵��
+ /// </summary>
+ public short C_Error { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鐢宠鏀捐揣
+ /// </summary>
+ public byte C_RequestPut { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏀捐揣瀹屾垚
+ /// </summary>
+ public byte C_PutFinish { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鍏佽鏀捐揣
+ /// </summary>
+ public byte C_AllowFinish { get; set; }
+ /// <summary>
+ /// 鍑哄簱鐢宠鍙栬揣
+ /// </summary>
+ public byte C_RequestTake { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍏佽鍙栬揣
+ /// </summary>
+ public byte C_AllowTake { get; set; }
+ /// <summary>
+ /// 鍑哄簱浠诲姟鍙�
+ /// </summary>
+ public int C_OutTaskNum { get; set; }
+ /// <summary>
+ /// 鍑哄簱鐢宠鍥炲簲
+ /// </summary>
+ public byte C_OutResponse { get; set; }
+ /// <summary>
+ /// 鍑哄簱鍙栨枡瀹屾垚
+ /// </summary>
+ public byte C_TakeFinish { get; set; }
+ /// <summary>
+ /// 鍏ュ簱浠诲姟鍙�
+ /// </summary>
+ public int C_InTaskNum { get; set; }
+ }
+
+
+ public class ConveyorLineTaskCommandWrite : DeviceCommand
+ {
+ public ushort ResponState { get; set; } = 86;
+
+ [DataLength(25)]
+ public string Barcode { get; set; }
+
+ public short TargetAddress { get; set; }
+
+ public short TaskNum { get; set; }
+
+ public short Weight { get; set; }
+
+ }
}
--
Gitblit v1.9.3