4CFeeder自动线开启

AGVControl-ProductionLine/FrmMain.cs

@@ -26,7 +26,7 @@ namespace AGVControl
         {
             InitializeComponent();
             showTimer = new System.Timers.Timer();
-            showTimer.Interval = 1000;
+            showTimer.Interval = 5000;
             //showTimer.Enabled = true;
             //showTimer.AutoReset = true;
             showTimer.Elapsed += ShowTimer_Elapsed;
@@ -101,6 +101,10 @@ namespace AGVControl
             System.GC.Collect();
         }
 
+        /// <summary>
+        /// 小车状态刷新
+        /// </summary>
+        /// <param name="agvIndex"></param>
         private void Control_AgvChanged(int agvIndex)
         {
             Invoke(new Action(() => { DgvAgv.Rows[agvIndex].DefaultCellStyle.ForeColor = Common.agvInfo[agvIndex].StateID.Equals(eAGVState.Error) ? Color.Red : Color.Black; }));
@@ -204,6 +208,7 @@ namespace AGVControl
 
         private void DgvAgv_CellClick(object sender, DataGridViewCellEventArgs e)
         {
+            DgvAgv.Refresh();
             if (e.RowIndex == -1) return;
 
             if (e.ColumnIndex == 10)  //调用
@@ -368,9 +373,11 @@ namespace AGVControl
                     try
                     {
                         agvRunInfo[i].Text = Common.agvInfo[i].RunInfo();
+                        Application.DoEvents();
                     }
                     catch (Exception ex)
-                    {        
+                    {
+                        Common.log.Error("显示"+ Common.agvInfo[i].Name+"运行信息异常");
                     }
                 }
 

AGVControl-ProductionLine/bean/job/GoEmptyShelfLineJob.cs

@@ -192,14 +192,14 @@ namespace AGVControl
                 CurTaskState = Common.GetTakJobState(CurTaskID);
                 if (Common.CheckTaskFinished(agv, EmptyShelfPlace, CurTaskState))
                 {
-                    if (EmptyShelfPlace.Equals(SettingString.C4FeederOut))
-                    {
-                        runInfo = "AGV到达 " + EmptyShelfPlace;
-                        msg += runInfo;
-                        TakeEmptyStep.Msg = msg;
-                        return new EnterLeaveShelfJob(EmptyShelfPlace, eEnterLeaveType.Enter);
-                    }
-                    else
+                    //if (EmptyShelfPlace.Equals(SettingString.C4FeederOut))
+                    //{
+                    //    runInfo = "AGV到达 " + EmptyShelfPlace;
+                    //    msg += runInfo;
+                    //    TakeEmptyStep.Msg = msg;
+                    //    return new EnterLeaveShelfJob(EmptyShelfPlace, eEnterLeaveType.Enter);
+                    //}
+                    //else
                     {
                         TakeEmptyStep.ToNextStep(TAKE_EMPTY_STEP.WAIT_LINE_RESPONSE);
                         runInfo= "AGV到达 " + EmptyShelfPlace + " 向产线发送出料架请求[ReadyLeave]";

AGVControl-ProductionLine/bean/job/SendFullShelfToLineJob.cs

@@ -135,13 +135,13 @@ namespace AGVControl
                 CurTaskState = Common.GetTakJobState(CurTaskID);
                 if (Common.CheckTaskFinished(agv, FullShelfPlace, CurTaskState))
                 {
-                    if (FullShelfPlace.Equals(SettingString.C4FeederIn))
-                    {
-                        runInfo = "AGV到达 " + FullShelfPlace + "完成";
-                        msg += runInfo;
-                        SendFullShelfStep.Msg = msg;
-                        return new EnterLeaveShelfJob(FullShelfPlace, eEnterLeaveType.Leave);
-                    }
+                    //if (FullShelfPlace.Equals(SettingString.C4FeederIn))
+                    //{
+                    //    runInfo = "AGV到达 " + FullShelfPlace + "完成";
+                    //    msg += runInfo;
+                    //    SendFullShelfStep.Msg = msg;
+                    //    return new EnterLeaveShelfJob(FullShelfPlace, eEnterLeaveType.Leave);
+                    //}
                     if (IsIgnoreBigShelf)
                     {
                         SendFullShelfStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_LINE_RESPONSE);
@@ -152,7 +152,7 @@ namespace AGVControl
                     }
                     else
                     {
-                        if (RFID.StartsWith("C") && !agv.Place.Equals(SettingString.D4FeederIn))
+                        if (RFID.StartsWith("C") && !agv.Place.Equals(SettingString.D4FeederIn) && !agv.Place.Equals(SettingString.C4FeederIn))
                         {
                             SendFullShelfStep.ToNextStep(SEND_FULL_SHELF_STEP.WAIT_BIG_SHELF_UNLOCK);
                             runInfo = "AGV到达 " + FullShelfPlace + "，并等待大料架[" + RFID + "]解绑";

AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt

@@ -70,3 +70,4 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
+E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache