点料bug修改

RC1266-AutoCountMachine/source/AutoCountClient/FrmAnalyze.cs

@@ -105,6 +105,11 @@ namespace OnlineStore.AutoCountClient
                         index++;
                     }
                 }
+                else
+                { 
+                    this.dataGridView1.Rows.Clear();
+                    MessageBox.Show("未查询到点料记录");
+                }
             }catch(Exception ex)
             {
                 LogUtil.error("查询数据出错：" + ex.ToString());

RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.cs

@@ -834,7 +834,7 @@ namespace OnlineStore.AutoCountClient
                 return;
             }
             AgvClient.SetCancelState(result);
-            robot.XrayBean.OpenXLine = result;
+            //robot.XrayBean.OpenXLine = result;
             if (result)
             {
                 aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";

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

@@ -72,6 +72,7 @@
             this.btnXStart = new System.Windows.Forms.Button();
             this.btnXStop = new System.Windows.Forms.Button();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.lblOpen = new System.Windows.Forms.Label();
             this.lblXrOpen = new System.Windows.Forms.Label();
             this.lblLastS = new System.Windows.Forms.Label();
             this.lblData = new System.Windows.Forms.Label();
@@ -792,6 +793,7 @@
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.lblOpen);
             this.groupBox2.Controls.Add(this.lblXrOpen);
             this.groupBox2.Controls.Add(this.lblLastS);
             this.groupBox2.Controls.Add(this.lblData);
@@ -806,6 +808,18 @@
             this.groupBox2.Text = "X光参数/状态信息";
             this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
             // 
+            // lblOpen
+            // 
+            this.lblOpen.AutoSize = true;
+            this.lblOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblOpen.ForeColor = System.Drawing.Color.Red;
+            this.lblOpen.Location = new System.Drawing.Point(12, 144);
+            this.lblOpen.Name = "lblOpen";
+            this.lblOpen.Size = new System.Drawing.Size(100, 17);
+            this.lblOpen.TabIndex = 6;
+            this.lblOpen.Text = "已禁用X射线点料";
+            this.lblOpen.Visible = false;
+            // 
             // lblXrOpen
             // 
             this.lblXrOpen.AutoSize = true;
@@ -1025,6 +1039,7 @@
         private System.IO.FileSystemWatcher fileSystemWatcher1;
         private System.Windows.Forms.ComboBox cmbType;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label lblOpen;
     }
 }
 

RC1266-AutoCountMachine/source/AutoCountClient/FrmXRay.cs

@@ -107,6 +107,7 @@ namespace OnlineStore.AutoCountClient
                 }
                 ReadIOList();
                 ReadBtnDO();
+                lblOpen.Visible =(! equipBean.OpenXLine);
                 lblLastS.Text = equipBean.LastXRayState;
                 if (equipBean.xRay.IsRayOpen)
                 {

RC1266-AutoCountMachine/source/DeviceLibrary/agvClient/AgvClient.cs

@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary
 {
     public class AgvClient
     {
-        public static bool CurrCancelState = true  ;
+        public static bool CurrCancelState = false   ;
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
         private static Asa.AgvClient agvClient;
         public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();

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

@@ -437,11 +437,10 @@ namespace OnlineStore.DeviceLibrary
 
                         //料串可离开
                         AgvClient.SetStatus(Config.AgvInName, "", ClientAction.FinishEnter, ClientLevel.High, true);
-                        Task.Factory.StartNew(delegate
-                        {
-                            Thread.Sleep(5000);
-                            AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
-                        });
+
+                        Thread.Sleep(2000);
+                        AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
+
                         ProcessShelfEnter = false;
                         LogUtil.info(logName + "   结束");
                     }
@@ -490,7 +489,7 @@ namespace OnlineStore.DeviceLibrary
                         else
                         {
                             LogUtil.info(logName + "  已收到 O_WLine_OutCheck=LOW ，等待8000后停止转动 ");
-                        } 
+                        }
                         Thread.Sleep(8000);
                         //停止转动 ,阻挡上升
                         IOMove(IO_Type.O_WLine_OutStop, IO_VALUE.LOW);
@@ -498,11 +497,10 @@ namespace OnlineStore.DeviceLibrary
                         //此处判断是否需要停止接料线体
                         IOMove(IO_Type.O_WLine_Run, IO_VALUE.LOW);
                         AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.FinishLeave, ClientLevel.High, true);
-                        Task.Factory.StartNew(delegate
-                        {
-                            Thread.Sleep(5000);
-                            AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.High, true);
-                        });
+
+                        Thread.Sleep(2000);
+                        AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.High, true);
+
                         ProcessShelfOut = false;
                         LogUtil.info(logName + "结束,停止转动 ");
                     }