客户端监控更新

WCS_Client/Frm/Equipment/ConvSignal.cs

@@ -10,22 +10,22 @@ namespace WCS_Client.Frm
     [Flags]
     public enum ConvFaultEnum : ushort
     {
-        C009_超时故障 = 1 << 0,
-        C010_驱动故障 = 1 << 1,
-        C011_空气开关故障 = 1 << 2,
-        C012_前极限故障 = 1 << 3,
-        C013_后极限故障 = 1 << 4,
-        C014_无Ready信号_请检查柜内空开 = 1 << 5,
-        C015_上极限故障 = 1 << 6,
-        C016_下极限故障 = 1 << 7,
-        C001_总故障 = 1 << 8,
-        C002_急停故障 = 1 << 9,
-        C003_超时故障 = 1 << 10,
-        C004_驱动故障 = 1 << 11,
-        C005_空气开关故障 = 1 << 12,
-        C006_传感器异常故障 = 1 << 13,
-        C007_超边故障 = 1 << 14,
-        C008_无Ready信号_请检查柜内空开 = 1 << 15
+        总故障 = 1 << 0,
+        急停故障 = 1 << 1,
+        超时故障 = 1 << 2,
+        驱动故障 = 1 << 3,
+        空气开关故障 = 1 << 4,
+        传感器异常故障 = 1 << 5,
+        其它故障汇入 = 1 << 6,
+        无Ready信号请检查柜内空开 = 1 << 7,
+        超时故障2 = 1 << 8,
+        驱动故障2 = 1 << 9,
+        空气开关故障2 = 1 << 10,
+        左极限故障 = 1 << 11,
+        右极限故障 = 1 << 12,
+        无Ready信号请检查柜内空开2 = 1 << 13,
+        前极限故障 = 1 << 14,
+        后极限故障 = 1 << 15
     }
     public class ConvSignal : EquipmentSignal
     {

WCS_Client/Frm/Equipment/RGVSignal.cs

@@ -8,22 +8,22 @@ namespace WCS_Client.Frm
     [Flags]
     public enum RgvFault1Enum : ushort
     {
-        RGVF001_RGV前后防撞条故障 = 1 << 0,
-        RGVF002_RGV载货极限光电故障 = 1 << 1,
-        RGVF003_RGV输送线变频器故障 = 1 << 2,
-        RGVF004_RGV行走变频器故障 = 1 << 3,
-        RGVF005_RGV扫码器故障 = 1 << 4,
-        RGVF006_RGV位置值故障 = 1 << 5,
-        RGVF007_RGV定位失败 = 1 << 6,
-        RGVF008_RGV取放货时位置偏差过大 = 1 << 7,
-        RGVF009_RGV急停按下 = 1 << 8,
-        RGVF010_主柜急停按下 = 1 << 9,
-        RGVF011_站台货物超出 = 1 << 10,
-        RGVF012_RGV输送线超时 = 1 << 11,
-        RGVF013_RGV输送线光电异常 = 1 << 12,
-        RGVF014_RGV任务号与站台任务号不匹配 = 1 << 13,
-        RGVF015_RGV不支持此任务类型 = 1 << 14,
-        RGVF016_RGV目标站台与交互站台号不一致 = 1 << 15,
+        RGVF001_RGV主柜急停 = 1 << 0,
+        RGVF002_RGV分柜急停 = 1 << 1,
+        RGVF003_RGV站台货物超出 = 1 << 2,
+        RGVF004_RGV输送线运行超时 = 1 << 3,
+        RGVF005_RGV输送线光电异常 = 1 << 4,
+        RGVF006_RGV任务不一致 = 1 << 5,
+        RGVF007_RGV任务类型不一致 = 1 << 6,
+        RGVF008_RGV交互站台不一致 = 1 << 7,
+        RGVF009_RGV行走极限故障 = 1 << 8,
+        RGVF010_输送线极限故障 = 1 << 9,
+        RGVF011_输送线故障 = 1 << 10,
+        RGVF012_RGV行走变频器故障 = 1 << 11,
+        RGVF013_RGV扫码器故障 = 1 << 12,
+        RGVF014_RGV位置值错误 = 1 << 13,
+        RGVF015_RGV定位失败 = 1 << 14,
+        RGVF016_RGV位置值偏移过大 = 1 << 15,
     }
     [Flags]
     public enum RgvFault2Enum : ushort

WCS_Client/Frm/Equipment/SrmSignal.cs

@@ -6,24 +6,76 @@ using System.Text;
 namespace WCS_Client.Frm
 {
     [Flags]
-    public enum SrmFault1Enum : ushort
+    public enum SrmFault1Enum : ulong
     {
-        S100_主柜急停 = 1 << 0,
-        S101_分柜急停 = 1 << 1,
-        S102_取货点异常_双伸位 = 1 << 2,
-        S103_放货点有货 = 1 << 3,
-        S104_货叉取货完成后无货 = 1 << 4,
-        S105_货叉无任务有货异常 = 1 << 5,
-        S106_货叉运行超时 = 1 << 6,
-        S107_货叉左侧超行程 = 1 << 7,
-        S110_货物左前坍塌 = 1 << 8,
-        S111_货物右前坍塌 = 1 << 9,
-        S112_前限位触发 = 1 << 10,
-        S113_后限位触发 = 1 << 11,
-        S114_上限位触发 = 1 << 12,
-        S115_下限位触发 = 1 << 13,
-        S116_超载限位触发 = 1 << 14,
-        S117_松绳限位触发1 = 1 << 15,
+        //无 = 0,
+        无 = 0,
+        主柜急停 = 1L << 0,
+        分柜急停 = 1L << 1,
+        取货点异常 = 1L << 2,
+        放货点有货 = 1L << 3,
+        货叉取货完成后无货 = 1L << 4,
+        货叉无任务有货异常 = 1L << 5,
+        货叉运行超时 = 1L << 6,
+        货叉左侧超行程 = 1L << 7,
+        货物左前坍塌 = 1L << 8,
+        货物右前坍塌 = 1L << 9,
+        前限位触发 = 1L << 10,
+        后限位触发 = 1L << 11,
+        上限位触发 = 1L << 12,
+        下限位触发 = 1L << 13,
+        超载限位触发 = 1L << 14,
+        松绳限位触发1 = 1L << 15,
+        行走运动超行程 = 1L << 16,
+        起升运动超行程 = 1L << 17,
+        行走变频器报警 = 1L << 18,
+        提升变频器报警 = 1L << 19,
+        货叉变频器报警 = 1L << 20,
+        提升超速报警 = 1L << 21,
+        风扇, 灯, 插座空开 = 1L << 22,
+        触摸屏, 光通讯, 激光测距空开 = 1L << 23,
+        行走马达保护器 = 1L << 24,
+        行走抱闸空开 = 1L << 25,
+        起升马达保护器 = 1L << 26,
+        起升抱闸空开 = 1L << 27,
+        货叉马达保护器 = 1L << 28,
+        货叉抱闸空开 = 1L << 29,
+        安全门打开 = 1L << 30,
+        安全继电器报警 = 1L << 31,
+        当前货位已禁用 = 1L << 32,
+        组态中断报警 = 1L << 33,
+        货物左前超出 = 1L << 34,
+        货物左后超出 = 1L << 35,
+        货物右前超出 = 1L << 36,
+        货物右后超出 = 1L << 37,
+        相序保护 = 1L << 38,
+        货物右超高1M5 = 1L << 39,
+        安全门1报警 = 1L << 40,
+        安全门2报警 = 1L << 41,
+        行走测距信号丢失报警 = 1L << 42,
+        提升测距信号丢失报警 = 1L << 43,
+        行走定位失败 = 1L << 44,
+        提升定位失败 = 1L << 45,
+        回中定位失败 = 1L << 46,
+
+        //根据堆垛机通讯协议定义 下述报警暂时不存在
+        堆垛机巷道有人进入, 光通讯中断 = 1L << 47,
+
+        货叉位置错误 = 1L << 48,
+        货叉编码器报警 = 1L << 49,
+        货叉编码器报警中间位 = 1L << 50,
+        货叉中位光电异常 = 1L << 51,
+        载货台电源空开 = 1L << 52,
+        按钮, 安全回路空开 = 1L << 53,
+        货物左后坍塌 = 1L << 54,
+        货物右后坍塌 = 1L << 55,
+        登梯口急停 = 1L << 56,
+        货物左超高1M9 = 1L << 57,
+        货物右超高1M9 = 1L << 58,
+        松绳限位触发2 = 1L << 59,
+        货叉右侧超行程 = 1L << 60,
+        取放货托盘总数超限 = 1L << 61,
+        安全门急停 = 1L << 62,
     }
     [Flags]
     public enum SrmFault2Enum : ushort

WCS_Client/Frm/Equipment/WCS_RGV523.cs

@@ -19,24 +19,41 @@ namespace WCS_Client.Frm
 
 
 
-        public enum RGVFault : short
+        public enum RGVFault : ushort
         {
-            RGV前后防撞条故障 = 0,
-            RGV载货极限光电故障 = 1,
-            RGV输送线变频器故障 = 2,
-            RGV行走变频器故障 = 3,
-            RGV扫码器故障 = 4,
-            RGV位置值故障 = 5,
-            RGV定位失败 = 6,
-            RGV取放货时位置偏差过大 = 7,
-            RGV急停按下 = 8,
-            主柜急停按下 = 9,
-            站台货物超出 = 10,
-            RGV输送线超时 = 11,
-            RGV输送线光电异常 = 12,
-            RGV任务号与站台任务号不匹配 = 13,
-            RGV不支持此任务类型 = 14,
-            RGV目标站台与交互站台号不一致 = 15,
+            无 = 0,
+            //RGV主柜急停 = 1 << 0,
+            //RGV分柜急停 = 1 << 1,
+            //RGV站台货物超出 = 1 << 2,
+            //RGV输送线运行超时 = 1 << 3,
+            //RGV输送线光电异常 = 1 << 4,
+            //RGV任务不一致 = 1 << 5,
+            //RGV任务类型不一致 = 1 << 6,
+            //RGV交互站台不一致 = 1 << 7,
+            //RGV行走极限故障 = 1 << 8,
+            //输送线极限故障 = 1 << 9,
+            //输送线故障 = 1 << 10,
+            //RGV行走变频器故障 = 1 << 11,
+            //RGV扫码器故障 = 1 << 12,
+            //RGV位置值错误 = 1 << 13,
+            //RGV定位失败 = 1 << 14,
+            //RGV位置值偏移过大 = 1 << 15,
+            RGV前后防撞条故障 = 1 << 0,
+            RGV载货极限光电故障 = 1 << 1,
+            RGV输送线变频器故障 = 1 << 2,
+            RGV行走变频器故障 = 1 << 3,
+            RGV扫码器故障 = 1 << 4,
+            RGV位置值故障 = 1 << 5,
+            RGV定位失败 = 1 << 6,
+            RGV取放货时位置偏差过大 = 1 << 7,
+            RGV急停按下 = 1 << 8,
+            主柜急停按下 = 1 << 9,
+            站台货物超出 = 1 << 10,
+            RGV输送线超时 = 1 << 11,
+            RGV输送线光电异常 = 1 << 12,
+            RGV任务号与站台任务号不匹配 = 1 << 13,
+            RGV不支持此任务类型 = 1 << 14,
+            RGV目标站台与交互站台号不一致 = 1 << 15
         }
 
         public enum RGVPlatformFault : short

WCS_Client/Frm/Equipment/WCS_SC537.cs

@@ -13,72 +13,199 @@ namespace WCS_Client.Frm
     {
         [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
         public SCAlarm SCAlarmMessage { get; set; }
-        public enum SCAlarm : short
+
+        public enum SCAlarm : ulong
         {
+            #region notion
+            //无 = 0,
+            //主柜急停 = 1 << 0,
+            //分柜急停 = 1 << 1,
+            //工位1取货点异常 = 1 << 2,
+            //工位1放货点有货 = 1 << 3,
+            //工位1货叉取货完成后无货 = 1 << 4,
+            //工位1货叉无任务有货异常 = 1 << 5,
+            //货叉1运行超时 = 1 << 6,
+            //货叉1左侧超行程 = 1 << 7,
+            //货物左前坍塌 = 1 << 8,
+            //货物右前坍塌 = 1 << 9,
+            //前限位触发 = 1 << 10,
+            //后限位触发 = 1 << 11,
+            //上限位触发 = 1 << 12,
+            //下限位触发 = 1 << 13,
+            //超载限位触发 = 1 << 14,
+            //松绳限位触发1 = 1 << 15,
+            //行走运动超行程 = 1 << 16,
+            //起升运动超行程 = 1 << 17,
+            //行走变频器报警 = 1 << 18,
+            //提升变频器报警 = 1 << 20,
+            //货叉1变频器报警 = 1 << 21,
+            //提升超速报警 = 1 << 22,
+            ////插座空开 = 1 << 22,
+            //24V电源空开 = 1 << 23,
+            //行走马达保护器 = 1 << 24,
+            //行走抱闸空开 = 1 << 25,
+            //起升马达保护器 = 1 << 26,
+            //起升抱闸空开 = 1 << 27,
+            //货叉马达保护器 = 1 << 28,
+            //货叉抱闸空开 = 1 << 29,
+            //安全门打开 = 1 << 30,
+            //安全继电器报警 = 1 << 31,
+            //当前货位已禁用 = 1 << 32,
+            //组态中断报警 = 1 << 33,
+            //货物左前超出 = 1 << 34,
+            //货物左后超出 = 1 << 35,
+            //货物右前超出 = 1 << 36,
+            //货物右后超出 = 1 << 37,
+            //相序保护 = 1 << 38,
+            //货物右超高1M5 = 1 << 39,
+            //安全门1报警 = 1 << 40,
+            //安全门2报警 = 1 << 41,
+            //行走测距信号丢失报警 = 1 << 42,
+            //提升测距信号丢失报警 = 1 << 43,
+            //行走定位失败 = 1 << 44,
+            //提升定位失败 = 1 << 45,
+            //回中定位失败 = 1 << 46,
+            //堆垛机巷道有人进入, 光通讯中断 = 1 << 47,
+            //货叉位置错误 = 1 << 48,
+            //货叉编码器报警 = 1 << 49,
+            //货叉编码器报警中间位 = 1 << 50,
+            //货叉中位光电异常 = 1 << 51,
+            //载货台电源空开 = 1 << 52,
+            //按钮, 安全回路空开 = 1 << 53,
+            //货物左后坍塌 = 1 << 54,
+            //货物右后坍塌 = 1 << 55,
+            //登梯口急停 = 1 << 56,
+            //货物左超高1M9 = 1 << 57,
+            //货物右超高1M9 = 1 << 58,
+            //货物右超高 = 1 << 59,
+            //货叉右侧超行程 = 1 << 60,
+            //取放货托盘总数超限 = 1 << 61,
+            //安全门急停 = 1 << 62,
+            //工位2放货点有货 = 1 << 63,
+            //工位2货叉取货完成后无货 = 1 << 64,
+            //工位2货叉无任务有货异常 = 1 << 65,
+            //货叉2位置错误 = 1 << 66,
+            //货叉2编码器故障 = 1 << 67,
+            //货叉2中位光电异常 = 1 << 68,
+            //货叉2运行超时 = 1 << 69,
+            //货叉2左侧超行程 = 1 << 70,
+            //货叉2回中定位失败 = 1 << 71,
+            //松绳限位触发2 = 1 << 72,
+            //货叉右侧超行程2 = 1 << 73,
+            //货叉2变频器故障 = 1 << 74,
+            //货叉2马达保护器 = 1 << 75,
+            //货叉2抱闸空开 = 1 << 76,
+            //超载2限位触发 = 1 << 77,
+            //松绳2限位触发 = 1 << 78,
+            //货叉1编码器故障中间位 = 1 << 80
+            //24V电源空开 = 1 << 8,
+            //行走马达保护器 = 1 << 9,
+            //行走抱闸空开 = 1 << 10,
+            //起升马达保护器 = 1 << 11,
+            //起升抱闸空开 = 1 << 12,
+            //货叉马达保护器 = 1 << 13,
+            //货叉抱闸空开 = 1 << 14,
+            //安全门打开 = 1 << 15,
+            //安全继电器报警 = 31,
+            //当前货位已禁用 = 32,
+            //组态中断报警 = 33,
+            //货物左前超出 = 34,
+            //货物左后超出 = 35,
+            //货物右前超出 = 36,
+            //货物右后超出 = 37,
+            //相序保护 = 38,
+            //货物右超高1M5 = 39,
+            //安全门1报警 = 40,
+            //安全门2报警 = 41,
+            //行走测距信号丢失报警 = 42,
+            //提升测距信号丢失报警 = 43,
+            //行走定位失败 = 44,
+            //提升定位失败 = 45,
+            //回中定位失败 = 46,
+            //堆垛机巷道有人进入, 光通讯中断 = 47,
+            //货叉位置错误 = 48,
+            //货叉编码器报警 = 49,
+            //货叉编码器报警中间位 = 50,
+            //货叉中位光电异常 = 51,
+            //载货台电源空开 = 52,
+            //按钮, 安全回路空开 = 53,
+            //货物左后坍塌 = 54,
+            //货物右后坍塌 = 55,
+            //登梯口急停 = 56,
+            //货物左超高1M9 = 57,
+            //货物右超高1M9 = 58,
+            //松绳限位触发2 = 59,
+            //货叉右侧超行程 = 60,
+            //取放货托盘总数超限 = 61,
+            //安全门急停 = 62,
+            #endregion
             无 = 0,
-            主柜急停 =  0,
-            分柜急停 =  1,
-            取货点异常 = 2,
-            放货点有货 = 3,
-            货叉取货完成后无货 = 4,
-            货叉无任务有货异常 = 5,
-            货叉运行超时 = 6,
-            货叉左侧超行程 = 7,
-            货物左前坍塌 = 8,
-            货物右前坍塌 = 9,
-            前限位触发 = 10,
-            后限位触发 = 11,
-            上限位触发 = 12,
-            下限位触发 = 13,
-            超载限位触发 =14,
-            松绳限位触发1 = 15,
-            行走运动超行程 = 16,
-            起升运动超行程 = 17,
-            行走变频器报警 = 18,
-            提升变频器报警 = 19,
-            货叉变频器报警 = 20,
-            提升超速报警 = 21,
-            风扇, 灯, 插座空开 = 22,
-            触摸屏, 光通讯, 激光测距空开 = 23,
-            行走马达保护器 = 24,
-            行走抱闸空开 = 25,
-            起升马达保护器 = 26,
-            起升抱闸空开 = 27,
-            货叉马达保护器 = 28,
-            货叉抱闸空开 = 29,
-            安全门打开 = 30,
-            安全继电器报警 = 31,
-            当前货位已禁用 = 32,
-            组态中断报警 = 33,
-            货物左前超出 = 34,
-            货物左后超出 = 35,
-            货物右前超出 = 36,
-            货物右后超出 = 37,
-            相序保护 = 38,
-            货物右超高1M5 = 39,
-            安全门1报警 = 40,
-            安全门2报警 = 41,
-            行走测距信号丢失报警 = 42,
-            提升测距信号丢失报警 = 43,
-            行走定位失败 = 44,
-            提升定位失败 = 45,
-            回中定位失败 = 46,
-            堆垛机巷道有人进入, 光通讯中断 = 47,
-            货叉位置错误 = 48,
-            货叉编码器报警 = 49,
-            货叉编码器报警中间位 = 50,
-            货叉中位光电异常 = 51,
-            载货台电源空开 = 52,
-            按钮, 安全回路空开 = 53,
-            货物左后坍塌 = 54,
-            货物右后坍塌 = 55,
-            登梯口急停 = 56,
-            货物左超高1M9 = 57,
-            货物右超高1M9 = 58,
-            松绳限位触发2 = 59,
-            货叉右侧超行程 = 60,
-            取放货托盘总数超限 = 61,
-            安全门急停 = 62,
+            主柜急停 = 1L << 0,
+            分柜急停 = 1L << 1,
+            取货点异常 = 1L << 2,
+            放货点有货 = 1L << 3,
+            货叉取货完成后无货 = 1L << 4,
+            货叉无任务有货异常 = 1L << 5,
+            货叉运行超时 = 1L << 6,
+            货叉左侧超行程 = 1L << 7,
+            货物左前坍塌 = 1L << 8,
+            货物右前坍塌 = 1L << 9,
+            前限位触发 = 1L << 10,
+            后限位触发 = 1L << 11,
+            上限位触发 = 1L << 12,
+            下限位触发 = 1L << 13,
+            超载限位触发 = 1L << 14,
+            松绳限位触发1 = 1L << 15,
+            行走运动超行程 = 1L << 16,
+            起升运动超行程 = 1L << 17,
+            行走变频器报警 = 1L << 18,
+            提升变频器报警 = 1L << 19,
+            货叉变频器报警 = 1L << 20,
+            提升超速报警 = 1L << 21,
+            风扇, 灯, 插座空开 = 1L << 22,
+            触摸屏, 光通讯, 激光测距空开 = 1L << 23,
+            行走马达保护器 = 1L << 24,
+            行走抱闸空开 = 1L << 25,
+            起升马达保护器 = 1L << 26,
+            起升抱闸空开 = 1L << 27,
+            货叉马达保护器 = 1L << 28,
+            货叉抱闸空开 = 1L << 29,
+            安全门打开 = 1L << 30,
+            安全继电器报警 = 1L << 31,
+            当前货位已禁用 = 1L << 32,
+            组态中断报警 = 1L << 33,
+            货物左前超出 = 1L << 34,
+            货物左后超出 = 1L << 35,
+            货物右前超出 = 1L << 36,
+            货物右后超出 = 1L << 37,
+            相序保护 = 1L << 38,
+            货物右超高1M5 = 1L << 39,
+            安全门1报警 = 1L << 40,
+            安全门2报警 = 1L << 41,
+            行走测距信号丢失报警 = 1L << 42,
+            提升测距信号丢失报警 = 1L << 43,
+            行走定位失败 = 1L << 44,
+            提升定位失败 = 1L << 45,
+            回中定位失败 = 1L << 46,
+
+            //根据堆垛机通讯协议定义 下述报警暂时不存在
+            堆垛机巷道有人进入, 光通讯中断 = 1L << 47,
+
+            货叉位置错误 = 1L << 48,
+            货叉编码器报警 = 1L << 49,
+            货叉编码器报警中间位 = 1L << 50,
+            货叉中位光电异常 = 1L << 51,
+            载货台电源空开 = 1L << 52,
+            按钮, 安全回路空开 = 1L << 53,
+            货物左后坍塌 = 1L << 54,
+            货物右后坍塌 = 1L << 55,
+            登梯口急停 = 1L << 56,
+            货物左超高1M9 = 1L << 57,
+            货物右超高1M9 = 1L << 58,
+            松绳限位触发2 = 1L << 59,
+            货叉右侧超行程 = 1L << 60,
+            取放货托盘总数超限 = 1L << 61,
+            安全门急停 = 1L << 62
         }
     }
 }

WCS_Client/Frm/Equipment/WCS_STATION523.cs

@@ -20,24 +20,23 @@ namespace WCS_Client.Frm
 
         public enum StationFault : uint
         {
-            总故障 = 0,
-            急停故障 = 1,
-            超时故障 = 2,
-            驱动故障 = 3,
-            空气开关故障 = 4,
-            传感器异常故障 = 5,
-            超边故障 = 6,
-            无Ready信号 = 7,
-            超时故障2 = 8,
-            驱动故障2 = 9,
-            空气开关故障2 = 10,
-            前极限故障 = 11,
-            后极限故障 = 12,
-            托盘严重变形 =13,
-            上极限故障 =14,
-            下极限故障 = 15,
-            扫码失败 = 16,
-            未定义 = 24
+            无=0,
+            总故障 = 1 << 0,
+            急停故障 = 1 << 1,
+            超时故障 = 1 << 2,
+            驱动故障 = 1 << 3,
+            空气开关故障 = 1 << 4,
+            传感器异常故障 = 1 << 5,
+            其它故障汇入 = 1 << 6,
+            无Ready信号请检查柜内空开 = 1 << 7,
+            超时故障2 = 1 << 8,
+            驱动故障2 = 1 << 9,
+            空气开关故障2 = 1 << 10,
+            左极限故障 = 1 << 11,
+            右极限故障 = 1 << 12,
+            无Ready信号请检查柜内空开2 = 1 << 13,
+            前极限故障 = 1 << 14,
+            后极限故障 = 1 << 15
         }
         public enum StationStatus : short
         {

WCS_Client/Frm/FrmMain.cs

@@ -73,7 +73,9 @@ namespace WCS_Client
 
             if (eqpData.Redis == null)
             {
-                RedisClient Redis = new RedisClient("212.64.66.35,database=10");
+                RedisClient Redis = new RedisClient("192.168.249.150,password=123456,database=10");
+                //new RedisClient("212.64.66.35,database=10");
+
                 MessagePackSerializer.DefaultOptions = StandardResolver.Options.WithCompression(MessagePackCompression.Lz4Block);
                 Redis.Serialize = obj =>
                 {

WCS_Client/Frm/MBtn_Log/FrmLog.cs

@@ -42,6 +42,9 @@ namespace WCS_Client.Frm
             LCIList.Add(LCItemUtil.Add_TextboxX("MSG", "消息:", 20, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "MSG like '%{0}%'" };
 
+            LCIList.Add(LCItemUtil.Add_TextboxX("DEVICE", "设备:", 20, SubmitMethods, null));
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "DEVICE like '%{0}%'" };
+
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", "查询", 80, 30, SubmitMethods));
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QClear", "重置", 80, 30, SubmitMethods));
 

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -206,7 +206,14 @@ namespace WCS_Client.Frm
                     //    if (oldItem.ToString() == item.ToString()) return;
                     //}
 
+                    
+
                     var ddjstatus = DDJSatatusSet.FirstOrDefault(v => v.SrmName == item.Code);
+                    if (item.Code != null)
+                    {
+                        ddjstatus.DdjPosCurr.Text = item.Code.ToString().Substring(3);
+                    }
+
                     if (ddjstatus != null)
                     {
                         //模式
@@ -442,7 +449,7 @@ namespace WCS_Client.Frm
                             else if (item.D523.Status == 0) con.BackColor = Color.Yellow;
                             else con.BackColor = Color.FromArgb(0, 144, 154);
                             con.button1.Text = item.Code.ToString();
-                            if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.光电状态))
+                            if (item.D521.Status.HasFlag(WCS.Entity.Protocol.IstationStatus.光电状态)&&item.D521.Tasknum.ToString().Length>10000)
                             {
                                 if (con.button1.Tag.ToString() != "pall")
                                 {

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.resx

@@ -804,7 +804,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="tableCellLabel21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -862,7 +862,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel22.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel7.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -920,7 +920,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel23.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -978,7 +978,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel25.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1036,7 +1036,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel26.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel22.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1094,9 +1094,9 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel27.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel8.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
         bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
         iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
@@ -1141,18 +1141,24 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAahJREFUeF7t3bFpA1EU
-        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
-        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
-        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
-        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
-        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
-        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
-        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
-        AAAASUVORK5CYII=
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
+        +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
+        DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
+        vQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+
+        UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDsh
+        m70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2g
+        PlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7
+        IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJN
+        oD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6U
+        OyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70C
+        TaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAO
+        lDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9
+        Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlDunaDXx7/8Rgs+1wgFSwAAAABJRU5E
+        rkJggg==
 </value>
   </data>
-  <data name="tableCellLabel210.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel23.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1210,7 +1216,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel211.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel24.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1268,7 +1274,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel213.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel25.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1326,7 +1332,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel214.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel26.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1384,9 +1390,9 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel215.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
         bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
         iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
@@ -1431,18 +1437,24 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAahJREFUeF7t3bFpA1EU
-        RUF3p1hlOBHGkXInLkPyYqkNdWbDhstZ2PxNMOG5BTz4/LfH4/kHAAAAAMO8HMYAAAAAmMhhDAAAAICR
-        HMYAAAAAGMlhDAAAAICR9g9jp/PlkNt9yX6r2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
-        W+y1aou9Vm2x16ot9lq1xV6rtthb7R/G3j++DvlZfrPfqrbYa9UWe63aYq9VW+y1aou9Vm2x16ot9lq1
-        xV6rtthr1RZ7rdpir1Vb7LVqi71WbbHXqi32Vp5SAgAAADCSwxgAAAAAIzmMAQAAADCSwxgAAAAAIzmM
-        AQAAADDS/mHs8/p9yHLwl4Bqi71WbbHXqi32WrXFXqu22GvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVe
-        q7bYa9UWe63aYm+1fxg7nS+H3O5L9lvVFnut2mKvVVvstWqLvVZtsdeqLfZatcVeq7bYa9UWe63aYq9V
-        W+y1aou9Vm2x16ot9lq1xd7KU0oAAAAARnIYAwAAAGAkhzEAAAAARnIYAwAAAGCi5+sf9Z0LPvxaiMMA
-        AAAASUVORK5CYII=
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
+        hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
+        +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
+        DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
+        vQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+
+        UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDsh
+        m70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2g
+        PlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7
+        IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJN
+        oD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6U
+        OyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70C
+        TaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAO
+        lDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9
+        Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlDunaDXx7/8Rgs+1wgFSwAAAABJRU5E
+        rkJggg==
 </value>
   </data>
-  <data name="tableCellLabel24.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel27.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1558,65 +1570,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel212.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        AAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="tableCellLabel216.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel210.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1674,7 +1628,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel217.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel211.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1732,7 +1686,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel218.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel212.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1790,7 +1744,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel219.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel213.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1848,7 +1802,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel220.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel214.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1906,7 +1860,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel221.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel215.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAABMYAAAASCAYAAACw7dLmAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -1964,7 +1918,7 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <data name="tableCellLabel4.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
@@ -2028,7 +1982,7 @@
         rkJggg==
 </value>
   </data>
-  <data name="tableCellLabel7.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="tableCellLabel12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABIAAATGCAYAAAArLvR9AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
         DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp

WCS_Client/Frm/MBtn_Task/FrmWCS_Task.cs

@@ -33,7 +33,7 @@ namespace WCS_Client.Frm
                 SuperGridUtil.Get_GridColumn("ADDRCURRENT", "当前地址", 80),
                 SuperGridUtil.Get_GridColumn("ADDRNEXT", "下个地址", 80),
                 SuperGridUtil.Get_GridColumn("ADDRTO", "目的地址", 100),
-                SuperGridUtil.Get_GridColumn("ADDRline", "目标产线", 100),
+                SuperGridUtil.Get_GridColumn("Position", "目标产线", 100),//ADDRline
                 SuperGridUtil.Get_GridColumn("DEVICE", "堆垛机编号", 80),
                 SuperGridUtil.Get_GridColumn("TUNNEL", "巷道", 70),
                 SuperGridUtil.Get_GridColumn("Priority", "优先级", 60),

WCS_Client/Frm/MBtn_Task/FrmWCS_TaskDIS.cs

@@ -37,7 +37,7 @@ namespace WCS_Client.Frm
                 SuperGridUtil.Get_GridColumn("ADDRCURRENT", "当前地址", 80),
                 SuperGridUtil.Get_GridColumn("ADDRNEXT", "下个地址", 80),
                 SuperGridUtil.Get_GridColumn("ADDRTO", "目的地址", 100),
-                SuperGridUtil.Get_GridColumn("ADDRline", "目标产线", 100),
+                SuperGridUtil.Get_GridColumn("Position", "目标产线", 100),//ADDRline
                 SuperGridUtil.Get_GridColumn("DEVICE", "堆垛机编号", 80),
                 SuperGridUtil.Get_GridColumn("TUNNEL", "巷道", 70),
                 SuperGridUtil.Get_GridColumn("Priority", "优先级", 60),
@@ -65,28 +65,28 @@ namespace WCS_Client.Frm
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.ID like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("WMSTASK", "WMS任务号:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "WMSTASK like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.WMSTASK like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("BARCODE", "条码:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "BARCODE like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.BARCODE like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("ADDRFROM", "起始地址:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRFROM like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.ADDRFROM like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("ADDRCURRENT", "当前地址:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRCURRENT like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.ADDRCURRENT like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("ADDRNEXT", "下个地址:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRNEXT like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.ADDRNEXT like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("ADDRTO", "目的地址:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "ADDRTO like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.ADDRTO like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("Position", "目标产线:", 20, SubmitMethods, null));
             LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Position like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_TextboxX("DEVICE", "堆垛机编号:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "DEVICE like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.DEVICE like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_ComboBoxEx("TYPE", "任务类型:", 20, null, SubmitMethods));
             TryCachHelper.TryExecute((db) =>
@@ -105,7 +105,7 @@ namespace WCS_Client.Frm
                     dt.Rows.Add(dr);
                 }
                 LCItemUtil.Refresh_LCItem(LCIList[LCIList.Count - 1], dt, "MEP_MAPPINGNO", "MEP_MAPPINGCHNAME");
-                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "TYPE like '%{0}%'" };
+                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.TYPE like '%{0}%'" };
             });
 
 
@@ -126,7 +126,7 @@ namespace WCS_Client.Frm
                     dt.Rows.Add(dr);
                 }
                 LCItemUtil.Refresh_LCItem(LCIList[LCIList.Count - 1], dt, "MEP_MAPPINGNO", "MEP_MAPPINGCHNAME");
-                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "STATUS like '%{0}%'" };
+                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.STATUS like '%{0}%'" };
             });
 
 
@@ -142,7 +142,14 @@ namespace WCS_Client.Frm
         }
         private PageData QueryPageDataMethods(int PageIndex, int PageSize)
         {
-            string _SQLText = @"select t.*,m.MEP_MAPPINGCHNAME task_comtypech,me.MEP_MAPPINGCHNAME task_wkstatusch,a.Position from dbo.WCS_TASK t 
+            string _SQLText = @"select t.*,m.MEP_MAPPINGCHNAME task_comtypech,me.MEP_MAPPINGCHNAME task_wkstatusch,a.Position from (SELECT A.ID,A.ADDRFROM,A.ADDRNEXT,A.ADDRTO,A.AgvTask,A.BARCODE,A.CREATETIME,A.DEVICE,A.DOCID,A.ENABLED,A.ENDTIME,A.FLOOR,A.FULLQTY,A.HEIGHT,
+A.PRODLINE,A.ManualRemarks,A.PALLETTYPE,A.Priority,A.SRMSTATION,A.STARTTIME,A.STATUS,A.TaskGroupKey,A.TUNNEL,A.TYPE,A.UPDATETIME,A.UPDATEUSER,
+A.UPLOADED,A.WMSTASK
+FROM WCS_TASK A
+UNION SELECT B.ID,B.ADDRFROM,B.ADDRNEXT,B.ADDRTO,B.AgvTask,B.BARCODE,B.CREATETIME,B.DEVICE,B.DOCID,B.ENABLED,B.ENDTIME,B.FLOOR,B.FULLQTY,B.HEIGHT,
+B.PRODLINE,B.ManualRemarks,B.PALLETTYPE,B.Priority,B.SRMSTATION,B.STARTTIME,B.STATUS,B.TaskGroupKey,B.TUNNEL,B.TYPE,B.UPDATETIME,B.UPDATEUSER,
+B.UPLOADED,B.WMSTASK
+FROM WCS_TASK_OLD B) t 
 left join WCS_MAPPINGENTRY m on t.TYPE = m.MEP_MAPPINGNO and m.MEP_MAPPINGTYPE = 'TYPE' 
 left join WCS_MAPPINGENTRY me on t.STATUS = me.MEP_MAPPINGNO and me.MEP_MAPPINGTYPE = 'STATUS'
 left join WCS_AGVTASK a on a.ID=t.AgvTask 

WCS_Client/Workflow/BaseWorkflow.cs

@@ -2,10 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
+using WCS_Client.Frm;
 using WCS_Client.Models;
 using WCS_Client.Utility;
 using WCS_Client.Workflow;
+using static WCS_Client.Frm.WCS_RGV521;
 using static WCS_Client.Frm.WCS_RGV523;
 using static WCS_Client.Frm.WCS_SC537;
 using static WCS_Client.Frm.WCS_STATION523;
@@ -174,7 +177,7 @@ namespace WCS_Client
                 TryCachHelper.TryExecute((db) =>
                 {
                     dt = db.Ado.GetDataTable(sql);
-                    if (sql.Contains("dbo.WCS_TASK")) TaskWorkflow.DataTableAddColumn(dt, db);
+                    if (sql.Contains("dbo.WCS_TASK") && sql.Contains("STATUS < 99")) TaskWorkflow.DataTableAddColumn(dt, db);
                     //else if (sql.Contains("[dbo].[WCS_EXCEPTION]")) ExceptionLogWorkflow.DataTableAddColumn(dt, db);
                     count = Convert.ToInt32(db.Ado.GetScalar(CountStr));
                 });
@@ -183,8 +186,7 @@ namespace WCS_Client
                     PageCount += 1;
 
                 if (dt != null && dt.Rows.Count > 0)
-                {
-                    //设备报警赋值
+                {                   
                     if (dt.Rows[0][1].ToString() == "设备报警")
                     {
                         for (int i = 0; i < dt.Rows.Count; i++)
@@ -194,22 +196,104 @@ namespace WCS_Client
                                 Type eType;
                                 if (dt.Rows[i]["DEVICECODE"].ToString().Substring(0, 3) == "RGV")
                                 {
-                                    eType = typeof(RGVFault);
+                                    eType = typeof(RgvFault1Enum);// RGVFault
+                                    var eItem = Enum.Parse(eType, dt.Rows[i]["alarm"].ToString());
+                                    if (eItem.ToString() == "无")
+                                        dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.RGVDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                                    else
+                                        dt.Rows[i]["ALARAMMSG"] = eItem.ToString() + "  "+ eqpData.deviceDataPack.RGVDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
                                 }
-                                else if (dt.Rows[i]["DEVICECODE"].ToString().Substring(0, 2) == "SC")
+                                else if (dt.Rows[i]["DEVICECODE"].ToString().Substring(0, 3) == "SRM")
                                 {
-                                    eType = typeof(SCAlarm);
+                                    eType = typeof(SrmFault1Enum);//  SCAlarm
+                                    var eItem = Enum.Parse(eType, dt.Rows[i]["alarm"].ToString());
+                                    if (eItem.ToString() == "无")
+                                        dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.SCDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                                    else
+                                        dt.Rows[i]["ALARAMMSG"] = eItem.ToString() + "  " + eqpData.deviceDataPack.SCDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
                                 }
                                 else
                                 {
-                                    eType = typeof(StationFault);
+                                    eType = typeof(ConvFaultEnum);//ConvFaultEnum StationFault
+                                    var eItem = Enum.Parse(eType, dt.Rows[i]["alarm"].ToString());
+                                    if (eItem.ToString() == "无")
+                                        dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.StationDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                                    else
+                                        dt.Rows[i]["ALARAMMSG"] = eItem.ToString() + "  " + eqpData.deviceDataPack.StationDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
                                 }
-                                var eItem = Enum.Parse(eType, dt.Rows[i]["alarm"].ToString());
-                                var a = Enum.Parse(eType, "65");
-                                dt.Rows[i]["ALARAMMSG"] = eItem.ToString();
                             });
                         }
                     }
+                    //if (dt.Rows[0][1].ToString() == "设备信息")
+                    //{
+                    //    for (int i = 0; i < dt.Rows.Count; i++)
+                    //    {
+                    //        TryCachHelper.TryExecute((db) =>
+                    //        {
+                    //            Type eTypeAlarm;
+                    //            Type eTypeMode;
+                    //            Type eTypeStatus;
+                    //            string mode = "";
+                    //            string status = "";
+                    //            if (dt.Rows[i]["DEVICECODE"].ToString().Substring(0, 3) == "RGV")
+                    //            {
+                    //                eTypeAlarm = typeof(RGVPlatformFault);
+                    //                eTypeMode = typeof(RGVMode);
+                    //                eTypeStatus = typeof(RGVRunStatus);
+                    //                var eItem = Enum.Parse(eTypeAlarm, dt.Rows[i]["alarm"].ToString());
+                    //                if (eItem.ToString() == "无")
+                    //                    dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.RGVDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //                else
+                    //                    dt.Rows[i]["ALARAMMSG"] = eItem.ToString() + "  " + eqpData.deviceDataPack.RGVDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //            }
+                    //            else if (dt.Rows[i]["DEVICECODE"].ToString().Substring(0, 2) == "SC")
+                    //            {
+                    //                eTypeAlarm = typeof(SCAlarm);
+                    //                //eTypeMode = typeof(SCMode);
+                    //                //eTypeStatus = typeof(SCRunStatus);
+                    //                var eItem = Enum.Parse(eTypeAlarm, dt.Rows[i]["alarm"].ToString());
+                    //                if (eItem.ToString() == "无")
+                    //                    dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.SCDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //                else
+                    //                    dt.Rows[i]["ALARAMMSG"] = eItem.ToString() + "  " + eqpData.deviceDataPack.SCDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //            }
+                    //            //else if (dt.Rows[i]["DEVICECODE"].ToString().Substring(0, 2) == "Ro")
+                    //            //{
+                    //            //    eTypeMode = typeof(RobotMode1);
+                    //            //    eTypeStatus = typeof(RobotStatus1);
+                    //            //    dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.RobotData.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //            //}
+                    //            else
+                    //            {
+                    //                eTypeAlarm = typeof(StationFault);
+                    //                if (dt.Rows[i]["mode"].ToString() == "0")
+                    //                    mode = "自动";
+                    //                else
+                    //                    mode = "手动";
+                    //                if (dt.Rows[i]["status"].ToString() == "0")
+                    //                    status = "无光电";
+                    //                else
+                    //                    status = "有光电";
+                    //                //eTypeMode = typeof(SCMode);
+                    //                //eTypeStatus = typeof(SCRunStatus);
+                    //                var eItem = Enum.Parse(eTypeAlarm, dt.Rows[i]["alarm"].ToString());
+                    //                if (eItem.ToString() == "无")
+                    //                    dt.Rows[i]["ALARAMMSG"] = eqpData.deviceDataPack.StationDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //                else
+                    //                    dt.Rows[i]["ALARAMMSG"] = eItem.ToString() + "  " + eqpData.deviceDataPack.StationDatas.Datas.FirstOrDefault(v => v.Code == dt.Rows[i]["DEVICECODE"].ToString()).Info;
+                    //            }
+                    //            if (mode == "")
+                    //                mode = Enum.Parse(eTypeMode, dt.Rows[i]["mode"].ToString()).ToString();
+                    //            if (status == "")
+                    //                status = Enum.Parse(eTypeStatus, dt.Rows[i]["status"].ToString()).ToString();
+
+                    //            dt.Rows[i]["mode"] = mode;
+                    //            dt.Rows[i]["status"] = status;
+                    //        });
+                    //    }
+                    //}
+
+
                     PageData PageDataItem = new PageData();
                     PageDataItem.PageIndex = PageIndex;
                     PageDataItem.PageSize = PageSize;
@@ -853,7 +937,15 @@ namespace WCS_Client
                 }
                 else
                 {
-                    if (task.STATUS < WCS.Entity.TaskStatus.已完成)
+                    if (task.TYPE == WCS.Entity.TaskType.入库 && task.TaskGroupKey.Contains('_'))
+                    {
+                        var arr = task.TaskGroupKey.Split('_');
+                        if (!string.IsNullOrEmpty(arr[1].ToString()))
+                        {                          
+                            throw new Exception(string.Format("该任务[{0}]为任务组任务，不可取消", task_no));
+                        }      
+                    }
+                    else if (task.STATUS < WCS.Entity.TaskStatus.已完成)
                     {
                         if (db.Updateable<WCS_TASK>()
                               .UpdateColumns(it => new WCS_TASK