From 820c23dcc1d6464db9bae3e46554cf49e1bdbb0e Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 10 一月 2025 09:34:21 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
index 4e4952a..887955e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
@@ -51,6 +51,11 @@
public byte Status { get; set; }
/// <summary>
+ /// 棰勭暀
+ /// </summary>
+ public byte Undefined { get; set; }
+
+ /// <summary>
/// 浠诲姟鍙�
/// </summary>
public int TaskNum { get; set; }
@@ -80,11 +85,16 @@
/// </summary>
public short RunStatus { get; set; }
+ private string _barcode;
/// <summary>
/// 鏉＄爜
/// </summary>
[DataLength(20)]
- public string Barcode { get; set; }
+ public string Barcode
+ {
+ get { return _barcode; }
+ set { _barcode = value.Replace("\0", "").Replace("\\0", ""); }
+ }
/// <summary>
/// 棰勭暀
@@ -100,6 +110,12 @@
/// 浜や簰淇″彿
/// </summary>
public byte Signal { get; set; }
+
+
+ /// <summary>
+ /// 棰勭暀
+ /// </summary>
+ public byte Undefined2 { get; set; }
}
public class R_ConveyorLineStatus
@@ -147,20 +163,22 @@
public bool RequestUnpackPellet { get; set; }
}
- public class R_ConveyorLineSignal
+ public class ConveyorLineSignal
{
/// <summary>
/// 璇锋眰淇″彿
/// </summary>
+ [BoolIndex(0)]
public bool STB { get; set; }
/// <summary>
/// 鍝嶅簲淇″彿
/// </summary>
+ [BoolIndex(1)]
public bool ACK { get; set; }
}
- public class W_ConveyorLineInfo
+ public class W_ConveyorLineInfo : DeviceCommand
{
/// <summary>
@@ -168,20 +186,9 @@
/// </summary>
public short ConveyorNo { get; set; }
- /// <summary>
- /// 鎻℃墜淇″彿
- /// </summary>
- public bool HandShake { get; set; }
+ public byte Operate { get; set; }
- /// <summary>
- /// 澶嶄綅鎶ヨ
- /// </summary>
- public bool ClearAlarm { get; set; }
-
- /// <summary>
- /// 閫�鍥�
- /// </summary>
- public bool Return { get; set; }
+ public byte Undefined { get; set; }
/// <summary>
/// 浠诲姟鍙�
@@ -214,13 +221,35 @@
public short Sapre2 { get; set; }
/// <summary>
- /// 璇锋眰淇″彿
+ /// 浜や簰淇″彿
/// </summary>
- public bool STB { get; set; }
+ public byte Signal { get; set; }
+
/// <summary>
- /// 鍝嶅簲淇″彿
+ /// 棰勭暀
/// </summary>
- public bool ACK { get; set; }
+ public byte Undefined2 { get; set; }
+ }
+
+ public class W_ConveyorLineOperate
+ {
+ /// <summary>
+ /// 鎻℃墜淇″彿
+ /// </summary>
+ [BoolIndex(0)]
+ public bool HandShake { get; set; }
+
+ /// <summary>
+ /// 澶嶄綅鎶ヨ
+ /// </summary>
+ [BoolIndex(1)]
+ public bool ClearAlarm { get; set; }
+
+ /// <summary>
+ /// 閫�鍥�
+ /// </summary>
+ [BoolIndex(2)]
+ public bool Return { get; set; }
}
}
--
Gitblit v1.9.3