bug修改

RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.Designer.cs

@@ -145,6 +145,7 @@
             this.lblName = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.chbMoveStop = new System.Windows.Forms.CheckBox();
+            this.lblAgvInfo = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -782,6 +783,7 @@
             this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox6.Controls.Add(this.lblAgvInfo);
             this.groupBox6.Controls.Add(this.chbPrint);
             this.groupBox6.Controls.Add(this.btnPrint);
             this.groupBox6.Controls.Add(this.label6);
@@ -925,7 +927,7 @@
             this.lblMoveInfo.AutoSize = true;
             this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblMoveInfo.Location = new System.Drawing.Point(18, 29);
+            this.lblMoveInfo.Location = new System.Drawing.Point(18, 52);
             this.lblMoveInfo.Name = "lblMoveInfo";
             this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
             this.lblMoveInfo.TabIndex = 280;
@@ -1971,6 +1973,17 @@
             this.chbMoveStop.UseVisualStyleBackColor = true;
             this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
             // 
+            // lblAgvInfo
+            // 
+            this.lblAgvInfo.AutoSize = true;
+            this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.lblAgvInfo.Location = new System.Drawing.Point(18, 25);
+            this.lblAgvInfo.Name = "lblAgvInfo";
+            this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
+            this.lblAgvInfo.TabIndex = 300;
+            this.lblAgvInfo.Text = "AGV 状态";
+            // 
             // FrmOutputEquip
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2140,6 +2153,7 @@
         private System.Windows.Forms.CheckBox chbPrint;
         internal System.Windows.Forms.Button btnZP4;
         internal System.Windows.Forms.TextBox txtZP4;
+        private System.Windows.Forms.Label lblAgvInfo;
     }
 }
 

RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.cs

@@ -189,6 +189,9 @@ namespace OnlineStore.AutoCountClient
                         FormStatus(false);
                     }
                 }
+                lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
+                    "\t            AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
+
                 lblMoveInfo.Text = equipBean.GetMoveStr();
                 // string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
                 lblStoreStatus.Text = RobotBase.GetRunStr(equipBean.runStatus);

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip.cs

@@ -458,7 +458,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (RobotManager.checkWatch(needLeaveWatch, 3000))
                 {
-                    AgvClient.NeedEnter(Config.AgvOutName, "", Asa.ClientLevel.High);
+                    AgvClient.NeedLeave(Config.AgvOutName, "", Asa.ClientLevel.High);
                 }
             }
             else