fix

WCS_Client/Frm/Equipment/SrmSignal.cs

@@ -70,8 +70,8 @@ namespace WCS_Client.Frm
         货物左后坍塌 = 1L << 54,
         货物右后坍塌 = 1L << 55,
         登梯口急停 = 1L << 56,
-        货物左超高1M9 = 1L << 57,
-        货物右超高1M9 = 1L << 58,
+        货物左超高70CM = 1L << 57,
+        货物右超高70CM = 1L << 58,
         松绳限位触发2 = 1L << 59,
         货叉右侧超行程 = 1L << 60,
         取放货托盘总数超限 = 1L << 61,

WCS_Client/Frm/Equipment/WCS_TASK.cs

@@ -76,7 +76,9 @@ namespace WCS_Client.Frm
         组盘 = 0,
         入库 = 1,
         出库 = 2,
+        移库 = 3,
         输送 = 5, 
+        倒库 = 6,
     }
 
     public enum TaskStatus

WCS_Client/Frm/MBtn_AgvTask/FrmCMByWorkShop.cs

@@ -42,25 +42,29 @@ namespace WCS_Client.Frm
             {
                 if (cmbWorkShopNO.Text == "205")
                 {                 
-                    cmbProLine.Items.Add("Opp_205_A1");
-                    cmbProLine.Items.Add("Opp_205_B1");
-                    cmbProLine.Items.Add("Opp_205_AA1");
-                    cmbProLine.Items.Add("Opp_205_AB1");
-                    cmbProLine.Items.Add("Opp_205_AC1");
-                    cmbProLine.Items.Add("Opp_205_AD1");
-                    cmbProLine.Items.Add("Opp_205_AE1");
-                    cmbProLine.Items.Add("Opp_205_AF1");
-                    cmbProLine.Items.Add("Opp_205_AG1");
-                    cmbProLine.Items.Add("Opp_205_AH1");
-                    cmbProLine.Items.Add("Opp_205_AJ1");
-                    cmbProLine.Items.Add("Opp_205_BK1");
-                    cmbProLine.Items.Add("Opp_205_BA1");
-                    cmbProLine.Items.Add("Opp_205_BB1");
-                    cmbProLine.Items.Add("Opp_205_BC1");
-                    cmbProLine.Items.Add("Opp_205_BD1");
-                    cmbProLine.Items.Add("Opp_205_BE1");
-                    cmbProLine.Items.Add("Opp_205_BF1");
-                    cmbProLine.Items.Add("Opp_205_BG1");
+                    cmbProLine.Items.Add("Opp_205_A1_OUT");                    
+                    cmbProLine.Items.Add("Opp_205_AA1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AB1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AC1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AD1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AE1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AF1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AG1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AH1_OUT");
+                    cmbProLine.Items.Add("Opp_205_AJ1_OUT");
+                    cmbProLine.Items.Add("Opp_205_B1_OUT");                                     
+                    cmbProLine.Items.Add("Opp_205_BA1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BB1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BC1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BD1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BE1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BF1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BG1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BH1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BJ1_OUT");
+                    cmbProLine.Items.Add("Opp_205_BK1_OUT");
+                    cmbProLine.Items.Add("Opp_205_CA1_OUT");
+                    cmbProLine.Items.Add("Opp_205_CK1_OUT");
                 }               
             });
         }

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.cs

@@ -212,7 +212,7 @@ namespace WCS_Client.Frm
                         //当前巷道
                         if (item.Code != null)
                         {
-                            ddjstatus.DdjPosCurr.Text = item.Code.ToString().Substring(3);
+                            //ddjstatus.DdjPosCurr.Text = item.Code.ToString().Substring(3);
                         }                                           
                         //模式
                         ddjstatus.DdjMode.Text = item.D521.SRMMode.ToString();
@@ -305,7 +305,7 @@ namespace WCS_Client.Frm
                                     ddjstatus.LblOutStatus.BackColor = Color.DarkGray;
 
                                     //起始位置
-                                    ddjstatus.DdjPosFrom.Text = item.D521.SLine_1.ToString();                                    
+                                    ddjstatus.DdjPosFrom.Text = item.D521.SLine_1.ToString();
                                     //目标位置
                                     ddjstatus.DdjPosTo.Text = item.D521.ELine_1.ToString() + "-" + item.D521.ECol_1.ToString() + "-" + item.D521.ELayer_1.ToString();
                                 }
@@ -317,6 +317,11 @@ namespace WCS_Client.Frm
                                     //目标位置
                                     ddjstatus.DdjPosTo.Text = item.D521.ELine_1.ToString();
                                 }
+                                else if (task_Temp.TYPE == TaskType.移库 || task_Temp.TYPE == TaskType.倒库)
+                                {
+                                    ddjstatus.DdjPosFrom.Text = item.D521.SLine_1.ToString() + "-" + item.D521.SCol_1.ToString() + "-" + item.D521.SLayer_1.ToString();
+                                    ddjstatus.DdjPosTo.Text = item.D521.ELine_1.ToString() + "-" + item.D521.ECol_1.ToString() + "-" + item.D521.ELayer_1.ToString();
+                                }
                                 else
                                 {
                                     ddjstatus.LblInStatus.BackColor = Color.DarkGray;

WCS_Client/Frm/MBtn_Monitor/Frm_YongGuanMontior.resx

@@ -467,7 +467,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -531,7 +531,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -595,7 +595,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -659,7 +659,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -723,7 +723,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -787,7 +787,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAAwlJREFUeF7t1DGqHgQQ
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAwlJREFUeF7t1DGqHgQQ
         hVF3Z+0ybCRY2du4jCQP87bhzn79k2KYl4ELl1cEPMXXzMAp709fvrz+8x49ocd79H+DPn56eXx++fu7
         +7OX/+7P/9v7Cf38y2+PXz/8+d392e9//PX1//YOmkDf+vGgJlAOlDshm70CTaA+UA6UOyGbvQJNoD5Q
         DpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGbvQJNoD5QDpQ7IZu9Ak2gPlAOlDshm70CTaA+UA6UOyGb
@@ -22623,7 +22623,7 @@
         Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2f/Z2cAAA==
 </value>
   </data>
-  <data name="pictureBox11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="GV2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
         DAAACwwBP0AiyAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj
@@ -22636,7 +22636,7 @@
         gg==
 </value>
   </data>
-  <data name="GV2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="pictureBox11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
         DAAACwwBP0AiyAAAAYNJREFUWEftVltuwzAMy2l3J19hZ8lvz9NZEmnRTprFWfu1EDAoKxb1sAt0uXHj