小车自动模式关闭时清除充电位置

AGVControl-ProductionLine/FrmMain.cs

@@ -210,8 +210,14 @@ namespace AGVControl
             {
             {
                 if (Common.agvInfo[e.RowIndex].IsUse.Equals(true))
                 if (Common.agvInfo[e.RowIndex].IsUse.Equals(true))
                 {
                 {
-                    //   if (MessageBox.Show("是否关闭当前小车的自动模式？", Common.agvInfo[e.RowIndex].Name + "_警告", MessageBoxButtons.YesNo).Equals(DialogResult.Yes))
-                    //  {
+                    if (Common.chargeStatus.charge3.Equals(Common.agvInfo[e.RowIndex].Name))
+                    {
+                        Common.chargeStatus.charge3 = "";
+                    }
+                    if (Common.chargeStatus.charge4.Equals(Common.agvInfo[e.RowIndex].Name))
+                    {
+                        Common.chargeStatus.charge4 = "";
+                    }
                     Common.agvInfo[e.RowIndex].IsUse = false;
                     Common.agvInfo[e.RowIndex].IsUse = false;
                     //Common.agvInfo[e.RowIndex].CurJob = null;
                     //Common.agvInfo[e.RowIndex].CurJob = null;
                     //Common.agvInfo[e.RowIndex].RFID = "";
                     //Common.agvInfo[e.RowIndex].RFID = "";
@@ -219,8 +225,7 @@ namespace AGVControl
                 }
                 }
                 else
                 else
                 {
                 {
-                    //if (MessageBox.Show("是否继续小车上一次的自动运行任务？", Common.agvInfo[e.RowIndex].Name + "_提示", MessageBoxButtons.YesNo).Equals(DialogResult.No))
-                    // {
+
                     //清除4c临时待机位的占用
                     //清除4c临时待机位的占用
                     if (Common.agvInfo[e.RowIndex].Name.Equals(Common.StandbyStation.C4_Station1))
                     if (Common.agvInfo[e.RowIndex].Name.Equals(Common.StandbyStation.C4_Station1))
                     {
                     {

AGVControl-ProductionLine/bean/Agv_Info.cs

@@ -333,7 +333,7 @@ namespace AGVControl
         private void CheckStandTimeOut(clsPosition position)
         private void CheckStandTimeOut(clsPosition position)
         {
         {
             if (IsUse && CurJob !=null && !(CurJob is ChargeJob) && 
             if (IsUse && CurJob !=null && !(CurJob is ChargeJob) && 
-                (!CurTaskName.Contains(SettingString.AutoCharge) || !CurTaskName.Contains(SettingString.Standby)))
+                ( !CurTaskName.Contains(SettingString.Standby)))//!CurTaskName.Contains(SettingString.AutoCharge) ||
             {
             {
                 if (Math.Abs(position.x - Position.x) < 1 && Math.Abs(position.y - Position.y) < 1)
                 if (Math.Abs(position.x - Position.x) < 1 && Math.Abs(position.y - Position.y) < 1)
                 {
                 {
@@ -356,10 +356,12 @@ namespace AGVControl
             else if(CurJob != null && (CurJob is ChargeJob))
             else if(CurJob != null && (CurJob is ChargeJob))
             {
             {
                 StandTimeOut = false;
                 StandTimeOut = false;
+                StandStartTime = DateTime.Now;
             }
             }
             else
             else
             {
             {
                 StandTimeOut = false;
                 StandTimeOut = false;
+                StandStartTime = DateTime.Now;
             }
             }
             Position = position;
             Position = position;
         }
         }

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

@@ -54,4 +54,3 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\Newtonsoft.Json.dll
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.pdb
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\bin\Debug\AsaPL.AgvClient.pdb
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
 D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
-C:\myproject\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache