From 68343df577836d29f8bd106823b1805d365f4a54 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 17 七月 2025 16:23:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs | 340 ++++++++++++++++----------------------------------------
1 files changed, 100 insertions(+), 240 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 ac89d7e..184d0b1 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"
@@ -36,290 +36,150 @@
public int TaskNum { get; set; }
}
-
-
- public class R_ConveyorLineInfo : DeviceCommand
- {
- /// <summary>
- /// 绔欏彴缂栧彿
- /// </summary>
- public short ConveyorNo { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public byte Status { get; set; }
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- public byte Undefined { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public int TaskNum { get; set; }
-
- /// <summary>
- /// 璧峰鍦板潃
- /// </summary>
- public short StartPos { get; set; }
-
- /// <summary>
- /// 鐩爣鍦板潃
- /// </summary>
- public short EndPos { get; set; }
-
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- public short GoodsWeight { get; set; }
-
- /// <summary>
- /// 璐х墿绫诲瀷
- /// </summary>
- public short GoodsType { get; set; }
-
- /// <summary>
- /// 0闈欐1鍓嶈繘2鍚庨��3涓婂崌/椤烘椂閽堟棆杞�4涓嬮檷/閫嗘椂閽堟棆杞�
- /// </summary>
- public short RunStatus { get; set; }
-
- private string _barcode;
- /// <summary>
- /// 鏉＄爜
- /// </summary>
- [DataLength(20)]
- public string Barcode
- {
- get { return _barcode; }
- set { _barcode = value.Replace("\0", "").Replace("\\0", ""); }
- }
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- public short Spare1 { get; set; }
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- public short Spare2 { get; set; }
-
- /// <summary>
- /// 浜や簰淇″彿
- /// </summary>
- public byte Signal { get; set; }
-
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- public byte Undefined2 { get; set; }
- }
public class R_ConveyorLineCPInfo : DeviceCommand
{
/// <summary>
- /// 鍒颁綅鎸囦护
+ /// 蹇冭烦
/// </summary>
- public short ConveyArrivaled { get; set; }
-
+ public short Heart { get; set; }
/// <summary>
- /// 璧峰鍦板潃
+ /// 棰勭暀
/// </summary>
- public short StartPos { get; set; }
-
+ public short Reserve { get; set; }
/// <summary>
- /// 缁堢偣鍦板潃
+ /// 鐘舵��
/// </summary>
- public short EndPos { get; set; }
-
+ public short StatusPV { get; set; }
+ /// <summary>
+ /// 鍛戒护
+ /// 0锛氭棤鍛戒护
+ ///1锛氶潪灏辩华锛堜笉鎵ц涓嬪彂鍛戒护锛�
+ ///2锛氬彇璐х珯鍙板伐浣嶅氨缁紙鏈夋枡锛�
+ ///3锛氭斁璐х珯鍙板伐浣嶅氨缁紙鏃犳枡锛�
+ ///4锛氭斁璐х珯鍙板伐浣嶅氨缁紙鏈夋枡锛�
+ ///5锛氭壂鐮佸伐浣嶅氨缁紙宸叉壂鐮侊紝绛夊緟涓婁綅鏈轰笅鍙戜换鍔″強鍛戒护锛�
+ ///6锛氫换鍔″伐浣嶅氨缁紙涓婁綅鏈洪�氳繃浠诲姟鍙疯鍙栨墭鐩樹俊鎭苟涓嬪彂浠诲姟锛�
+ ///7锛氱敵璇锋枡妗�
+ ///8锛氭枡妗嗗埌浣�
+ ///9锛氭墽琛屽懡浠や腑
+ ///11锛氬紓甯�
+ /// </summary>
+ public short Command { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public int TaskNo { get; set; }
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
/// <summary>
-
- [DataLength(20)]
- public string Barcode { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- [DataLength(20)]
- public string TaskNum { get; set; }
-
- /// <summary>
- /// 绫诲瀷
- /// </summary>
- public short WorkType { get; set; }
-
- /// <summary>
- /// 妯″紡
- /// </summary>
- public short WorkMode { get; set; }
-
- /// <summary>
- /// 鏍￠獙浣�
- /// </summary>
- public short CheckPos { get; set; }
+ [DataLength(10)]
+ public string PalletCode { get; set; }
}
- public class R_ConveyorLineGMInfo : DeviceCommand
+ public class R_RGVCPInfo : DeviceCommand
{
/// <summary>
- /// 绠卞彿
+ /// 妯″紡<br/>
+ /// 1鎵嬪姩<br/>
+ /// 2缁翠慨<br/>
+ /// 3鍗婅嚜鍔�<br/>
+ /// 4鑷姩<br/>
+ /// 5鑱旀満鑷姩<br/>
/// </summary>
+ public short Mode { get; set; }
/// <summary>
- [DataLength(120)]
- public string Boxcode { get; set; }
+ /// 鐘舵��<br/>
+ /// 0绌洪棽<br/>
+ /// 1鏈変换鍔�<br/>
+ /// </summary>
+ public short State { get; set; }
+ /// <summary>
+ /// RGV鎺ユ敹浠诲姟鍙�<br/>
+ /// </summary>
+ public int RgvTask { get; set; }
+ /// <summary>
+ /// RGV缁撴潫浠诲姟鍙�<br/>
+ /// </summary>
+ public int RgvEndTask { get; set; }
+ /// <summary>
+ /// RGV涓婃浠诲姟鍙�<br/>
+ /// </summary>
+ public int RgvLastTask { get; set; }
+ /// <summary>
+ /// 浠诲姟鐘舵�佸弽棣�<br/>
+ /// </summary>
+ public short TaskDone { get; set; }
+ /// <summary>
+ /// 蹇冭烦<br/>
+ /// </summary>
+ public short HeartBeat { get; set; }
}
- public class R_ConveyorLineFLInfo : DeviceCommand
+ public class W_RGVCPInfo : DeviceCommand
{
/// <summary>
- /// 鎵樼洏鍙�
+ /// 浠诲姟鍙�1<br/>
/// </summary>
+ public int WcsTask1 { get; set; }
/// <summary>
-
- [DataLength(20)]
- public string Barcode { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
+ /// 浠诲姟鍙�2<br/>
/// </summary>
- [DataLength(20)]
- public string TaskNum { get; set; }
- }
- public class R_ConveyorLineStatus
- {
+ public int WcsTask2 { get; set; }
/// <summary>
- /// 鎻℃墜淇″彿
+ /// 浠诲姟鍙�3<br/>
/// </summary>
- [BoolIndex(0)]
- public bool HandShake { get; set; }
-
+ public int WcsTask3 { get; set; }
/// <summary>
- /// 1鑱旀満 0鑴辨満
+ /// 浠诲姟绫诲瀷<br/>
+ /// 1瀹氫綅<br/>
+ /// 2鍙栬揣<br/>
+ /// 3鏀捐揣<br/>
+ /// 4鍙栨斁璐�<br/>
/// </summary>
- [BoolIndex(1)]
- public bool Online { get; set; }
-
+ public short TaskType { get; set; }
/// <summary>
- /// 1绌洪棽 0绻佸繖
+ /// 鎵ц宸ヤ綅<br/>
+ /// 1:1宸ヤ綅<br/>
+ /// 2:2宸ヤ綅<br/>
+ /// 3:3宸ヤ綅<br/>
+ /// 4:12宸ヤ綅<br/>
+ /// 5:13宸ヤ綅<br/>
+ /// 6:23宸ヤ綅<br/>
+ /// 7:123宸ヤ綅<br/>
/// </summary>
- [BoolIndex(2)]
- public bool Free { get; set; }
-
+ public short WorkStation { get; set; }
/// <summary>
- /// 1鏈夎揣 0鏃犺揣
+ /// 鍙栬揣鍦板潃1<br/>
/// </summary>
- [BoolIndex(3)]
- public bool Goods { get; set; }
-
+ public short Qu1 { get; set; }
/// <summary>
- /// 1鏁呴殰 0姝ｅ父
+ /// 鍙栬揣鍦板潃2<br/>
/// </summary>
- [BoolIndex(4)]
- public bool Alarm { get; set; }
-
+ public short Qu2 { get; set; }
/// <summary>
- /// 1璇锋眰琛ョ洏 0鏃�
+ /// 鍙栬揣鍦板潃3<br/>
/// </summary>
- [BoolIndex(5)]
- public bool RequestPakcPallet { get; set; }
-
+ public short Qu3 { get; set; }
/// <summary>
- /// 1璇锋眰鎷嗙洏 0鏃�
+ /// 鏀捐揣鍦板潃1<br/>
/// </summary>
- [BoolIndex(6)]
- public bool RequestUnpackPellet { get; set; }
- }
-
- public class ConveyorLineSignal
- {
+ public short Fang1 { get; set; }
/// <summary>
- /// 璇锋眰淇″彿
+ /// 鏀捐揣鍦板潃2<br/>
/// </summary>
- [BoolIndex(0)]
- public bool STB { get; set; }
-
+ public short Fang2 { get; set; }
/// <summary>
- /// 鍝嶅簲淇″彿
+ /// 鏀捐揣鍦板潃3<br/>
/// </summary>
- [BoolIndex(1)]
- public bool ACK { get; set; }
- }
-
- public class W_ConveyorLineInfo : DeviceCommand
- {
-
+ public short Fang3 { get; set; }
/// <summary>
- /// 绔欏彴缂栧彿
+ /// 蹇冭烦<br/>
/// </summary>
- public short ConveyorNo { get; set; }
-
- public byte Operate { get; set; }
-
- public byte Undefined { get; set; }
-
+ public short HearBeat { get; set; }
/// <summary>
- /// 浠诲姟鍙�
+ /// 涓嬪彂/瀹屾垚浠诲姟鏍囪瘑<br/>
+ /// 1纭浠诲姟涓嬪彂<br/>
+ /// 2纭浠诲姟瀹屾垚<br/>
/// </summary>
- public int TaskNum { get; set; }
-
- /// <summary>
- /// 璧峰鍦板潃
- /// </summary>
- public short StartPos { get; set; }
-
- /// <summary>
- /// 鐩爣鍦板潃
- /// </summary>
- public short EndPos { get; set; }
-
- /// <summary>
- /// 璐х墿绫诲瀷
- /// </summary>
- public short GoodsType { get; set; }
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- public short Spare1 { get; set; }
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- public short Spare2 { get; set; }
-
- /// <summary>
- /// 浜や簰淇″彿
- /// </summary>
- public byte Signal { get; set; }
-
-
- /// <summary>
- /// 棰勭暀
- /// </summary>
- 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; }
+ public short TaskReceivedDone { get; set; }
}
}
--
Gitblit v1.9.3