佳世达环形仓IO修改

source/ACSingleStore/FrmStoreBox.cs

@@ -256,6 +256,10 @@ namespace OnlineStore.ACSingleStore
                 {
                 {
                     lblWarnMsg.Text = lblWarnMsg.Text + "   叉子料盘检测有料，请检查";
                     lblWarnMsg.Text = lblWarnMsg.Text + "   叉子料盘检测有料，请检查";
                 }
                 }
+                if (IOManager.IOValue(IO_Type.DoorLimit).Equals(IO_VALUE.LOW))
+                {
+                    lblWarnMsg.Text = lblWarnMsg.Text + "   无门禁信号，请检查";
+                }
                 if (store.TempOrHumidityIsAlarm)
                 if (store.TempOrHumidityIsAlarm)
                 {
                 {
                     lblWarnMsg.Text = lblWarnMsg.Text + "   温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]";
                     lblWarnMsg.Text = lblWarnMsg.Text + "   温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]";

source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv

 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
 DI,急停,SuddenStop_BTN,0,192.168.200.11,0,急停,X01,DI-01,0,
 DI,急停,SuddenStop_BTN,0,192.168.200.11,0,急停,X01,DI-01,0,
-DI,联机,AutoRun_Signal,1,192.168.200.11,0,联机,X02,DI-02,0,
-DI,复位,Reset_BTN,2,192.168.200.11,0,复位,X03,DI-03,0,
+DI,复位,Reset_BTN,1,192.168.200.11,0,复位,X02,DI-02,0,
+DI,门禁,DoorLimit,2,192.168.200.11,0,门禁,X03,DI-03,0,
 DI,料盘检测1（进料口）,TrayCheck_Door,3,192.168.200.11,0,料盘检测1（进料口）,X04,DI-04,0,
 DI,料盘检测1（进料口）,TrayCheck_Door,3,192.168.200.11,0,料盘检测1（进料口）,X04,DI-04,0,
 DI,料盘检测2（料叉）,TrayCheck_Fixture,4,192.168.200.11,0,料盘检测2（料叉）,X05,DI-05,0,
 DI,料盘检测2（料叉）,TrayCheck_Fixture,4,192.168.200.11,0,料盘检测2（料叉）,X05,DI-05,0,
 DI,气压检测,Airpressure_Check,5,192.168.200.11,0,气压检测,X06,DI-06,0,
 DI,气压检测,Airpressure_Check,5,192.168.200.11,0,气压检测,X06,DI-06,0,

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -229,7 +229,7 @@ namespace OnlineStore.DeviceLibrary
             //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW)); 
             //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW)); 
         }
         }
     
     
-        public void Reset(bool isNeedClearAuto=true)
+        public override void Reset(bool isNeedClearAuto=true)
         {
         {
             CurrInOutCount = 0;
             CurrInOutCount = 0;
             CurrInOutACount = 0;
             CurrInOutACount = 0;
@@ -1522,6 +1522,11 @@ namespace OnlineStore.DeviceLibrary
                     lineOperation.msg = "叉子料盘检测有料，请检查";
                     lineOperation.msg = "叉子料盘检测有料，请检查";
                 }
                 }
             }
             }
+            if (boxStatus.msg.Equals("") && IOManager.IOValue(IO_Type.DoorLimit).Equals(IO_VALUE.LOW))
+            {
+                boxStatus.msg = "未检测到门禁信号，请检查";
+                lineOperation.msg = "未检测到门禁信号，请检查";
+            }
             CodeMsg = "";
             CodeMsg = "";
             //WarnMsg = ""; 
             //WarnMsg = ""; 
             //状态
             //状态

source/DeviceLibrary/store/KTK_Store.cs

@@ -227,7 +227,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// <summary>
         /// 重置（夹料装置状态不变）
         /// 重置（夹料装置状态不变）
         /// </summary>
         /// </summary>
-        public abstract void Reset();
+        public abstract void Reset(bool isNeedClearAuto = true);
 
 
         /// <summary>
         /// <summary>
         /// 停止所有运动
         /// 停止所有运动

source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs

@@ -487,7 +487,7 @@ namespace OnlineStore.LoadCSVLibrary
             MustHaveDOList = new List<string>();
             MustHaveDOList = new List<string>();
             MustHaveDIList.Add(IO_Type.SuddenStop_BTN);
             MustHaveDIList.Add(IO_Type.SuddenStop_BTN);
             MustHaveDIList.Add(IO_Type.Reset_BTN);
             MustHaveDIList.Add(IO_Type.Reset_BTN);
-            MustHaveDIList.Add(IO_Type.AutoRun_Signal);
+            MustHaveDIList.Add(IO_Type.DoorLimit);
             MustHaveDIList.Add(IO_Type.Airpressure_Check);
             MustHaveDIList.Add(IO_Type.Airpressure_Check);
             MustHaveDIList.Add(IO_Type.TrayCheck_Door);
             MustHaveDIList.Add(IO_Type.TrayCheck_Door);
             MustHaveDIList.Add(IO_Type.TrayCheck_Fixture);
             MustHaveDIList.Add(IO_Type.TrayCheck_Fixture);

source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs

@@ -37,7 +37,7 @@ namespace OnlineStore.LoadCSVLibrary
         /// <summary>
         /// <summary>
         ///DI 自动运行	AutoRun_Signal
         ///DI 自动运行	AutoRun_Signal
         /// </summary>
         /// </summary>
-        public static string AutoRun_Signal = "AutoRun_Signal";
+      //  public static string AutoRun_Signal = "AutoRun_Signal";
 
 
         /// <summary>
         /// <summary>
         /// 料仓DI。气压检测(料仓）	Airpressure_Check
         /// 料仓DI。气压检测(料仓）	Airpressure_Check
@@ -113,8 +113,11 @@ namespace OnlineStore.LoadCSVLibrary
         /// 进出料口门下降端	Door_Down
         /// 进出料口门下降端	Door_Down
         /// </summary>
         /// </summary>
         public static string Door_Down = "Door_Down";
         public static string Door_Down = "Door_Down";
-          
-  
+
+        public static string DoorLimit = "DoorLimit";
+
+
+
     }
     }
     public enum IO_VALUE
     public enum IO_VALUE
     {
     {