1

source/DeviceLibrary/LineConfig/VMILineConfig.csv

@@ -5,10 +5,10 @@ PRO,IO模块IP,PRO_AOI_IP_1,192.168.103.25,,,,,,,
 ,,,,,,,,,,
 ,,,,,,,,,,
 DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X721,DI-01,0,
 DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X721,DI-01,0,
 DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X722,DI-02,0,
 DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X722,DI-02,0,
-DI,进料线入口检测,InL_InCheck,2,PRO_AOI_IP_1,0,进料线入口检测,X723,DI-03,0,
-DI,进料线入口阻挡检测,InL_InStopCheck,3,PRO_AOI_IP_1,0,进料线入口阻挡检测,X724,DI-04,0,
+DI,进料线入口阻挡检测,InL_InStopCheck,2,PRO_AOI_IP_1,0,进料线入口阻挡检测,X723,DI-03,0,
+DI,进料线中间位检测,InL_MIddleCheck,3,PRO_AOI_IP_1,0,进料线出口阻挡检测,X724,DI-04,0,
 ,,,4,PRO_AOI_IP_1,0,,X725,DI-05,0,
 ,,,4,PRO_AOI_IP_1,0,,X725,DI-05,0,
-DI,进料线出口阻挡检测,InL_OutStopCheck,5,PRO_AOI_IP_1,0,进料线出口阻挡检测,X726,DI-06,0,
+DI,进料线出口阻挡检测,InL_OutStopCheck,5,PRO_AOI_IP_1,0,进料线出口检测,X726,DI-06,0,
 DI,出料线入口检测,OutL_InCheck,6,PRO_AOI_IP_1,0,出料线入口检测,X727,DI-07,0,
 DI,出料线入口检测,OutL_InCheck,6,PRO_AOI_IP_1,0,出料线入口检测,X727,DI-07,0,
 DI,出料线入口阻挡检测,OutL_InStopCheck,7,PRO_AOI_IP_1,0,出料线入口阻挡检测,X728,DI-08,0,
 DI,出料线入口阻挡检测,OutL_InStopCheck,7,PRO_AOI_IP_1,0,出料线入口阻挡检测,X728,DI-08,0,
 ,,,8,PRO_AOI_IP_1,0,,X729,DO-01,0,
 ,,,8,PRO_AOI_IP_1,0,,X729,DO-01,0,

source/DeviceLibrary/acVmiLine/VMILineBean.cs

@@ -264,15 +264,16 @@ namespace OnlineStore.DeviceLibrary
                 //如果出料线体出口无料架，放一个料架到出口
                 //如果出料线体出口无料架，放一个料架到出口
                 if (LineManager.checkWatch(ol_noshelfWatch, 1000))
                 if (LineManager.checkWatch(ol_noshelfWatch, 1000))
                 {
                 {
-                    LogUtil.info(" 出料线体出口无料架，下降 [" + IO_Type.OutL_OutStopDown + "] [" + StopDownMS + "] 秒");
+                    IOManager.CIOMove(IO_Type.OutL_OutStopDown, IO_VALUE.LOW);
+                    LogUtil.info(" 出料线体出口无料架，下降 [" + IO_Type.OutL_InStopDown + "] [" + StopDownMS + "] 秒");
                     ol_lastSendShelfTime = DateTime.Now;
                     ol_lastSendShelfTime = DateTime.Now;
-                    StopIOMove(IO_Type.OutL_OutStopDown, StopDownMS);
+                    StopIOMove(IO_Type.OutL_InStopDown, StopDownMS);
                 }
                 }
             }
             }
             else if (span.TotalMilliseconds > StopDownMS)
             else if (span.TotalMilliseconds > StopDownMS)
             {
             {
                 ol_noshelfWatch.Stop(); 
                 ol_noshelfWatch.Stop(); 
-                IOManager.CIOMove(IO_Type.OutL_OutStopDown, IO_VALUE.LOW); 
+                IOManager.CIOMove(IO_Type.OutL_InStopDown, IO_VALUE.LOW); 
             }
             }
         }
         }
         private DateTime il_lastCallAgvTime = DateTime.Now;
         private DateTime il_lastCallAgvTime = DateTime.Now;

source/LoadCVSLibrary/Config/bean/Store_IO_Type.cs

@@ -35,9 +35,9 @@ namespace OnlineStore.LoadCSVLibrary
 
 
 
 
         /// <summary>
         /// <summary>
-        /// DI 进料线入口检测 InL_InCheck
+        /// DI 进料线中间料架检测 InL_MIddleCheck
         /// </summary>
         /// </summary>
-        public static string InL_InCheck = "InL_InCheck";
+        public static string InL_MIddleCheck = "InL_MIddleCheck";
         /// <summary>
         /// <summary>
         /// DI  进料线阻挡检测1 InL_InStopCheck
         /// DI  进料线阻挡检测1 InL_InStopCheck
         /// </summary>
         /// </summary>

source/VMILineClient/FrmVMIClient.cs

@@ -145,7 +145,7 @@ namespace OnlineStore.VMILineClient
             }
             }
             else if (vmiLine.StartRun())
             else if (vmiLine.StartRun())
             {
             {
-                btnVmiStart.Text = "启动";
+                btnVmiStart.Text = "复位";
             }
             }
         }
         }