1

source/DeviceLibrary/Config/Config_Store.csv

@@ -14,7 +14,7 @@ DI,1,复位（上料机构）,Reset_BTN,1,HC,X01,,,,,,,,,,,,
 DI,1,空气压力检测,Airpressure_Check,2,HC,X02,,,,,,,,,,,,
 DI,1,上料机构光栅信号,SafetyRasterSignal,3,HC,X03,,,,,,,,,,,,
 DI,2,A前门门禁信号,LeftDoor_Limit,4,HC,X04,,,,,,,,,,,,
-DI,2,B前门门禁信号,LeftDoor_Limit,5,HC,X05,,,,,,,,,,,,
+DI,2,B前门门禁信号,RightDoor_Limit,5,HC,X05,,,,,,,,,,,,
 DI,2,后门门禁信号,BackDoor_Limit,6,HC,X06,,,,,,,,,,,,
 DI,0,轴点动运行+,Jog_Add,7,HC,X07,,,,,,,,,,,,
 DI,0,轴点动运行-,Jog_Sub,8,HC,X08,,,,,,,,,,,,

source/DeviceLibrary/storeBean/inputBean/InputEquip.cs

@@ -806,9 +806,17 @@ namespace OnlineStore.DeviceLibrary
                     if (StoreManager.DisSecurityAccess)
                     {
                     }
+                    else if (IOValue(IO_Type.Feeding_LDoor_Limit).Equals(IO_VALUE.LOW))
+                    {
+                        SecurityAccessStop("左侧防护门被打开");
+                    }
+                    else if (IOValue(IO_Type.Feeding_RDoor_Limit).Equals(IO_VALUE.LOW))
+                    {
+                        SecurityAccessStop("右侧防护门被打开");
+                    }
                     else if (IOValue(IO_Type.SafetyRasterSignal).Equals(IO_VALUE.LOW))
                     {
-                        SecurityAccessStop();
+                        SecurityAccessStop("光栅被遮挡");
                     }
                 }
                 else if (CurrSecurityAccess.Equals(1))
@@ -827,7 +835,7 @@ namespace OnlineStore.DeviceLibrary
 
         }
 
-        private void SecurityAccessStop()
+        private void SecurityAccessStop(string rason)
         {
             if (!baseConfig.DIList.ContainsKey(IO_Type.SafetyRasterSignal))
             {
@@ -853,13 +861,13 @@ namespace OnlineStore.DeviceLibrary
 
             if (MoveInfo.MoveType.Equals(MoveType.None))
             {
-                SetWarnMsg("光栅被遮挡，暂停运动");
-                LogUtil.info($"{Name}光栅被遮挡，暂停运动，MoveStop={MoveStop}，{msg}，稍后复位");
+                SetWarnMsg(rason+"，暂停运动");
+                LogUtil.info($"{Name}{rason}，暂停运动，MoveStop={MoveStop}，{msg}，稍后复位");
             }
             else
             {
-                SetWarnMsg("光栅被遮挡，暂停当前运动");
-                LogUtil.info($"{Name}光栅被遮挡，停止当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep}，{msg}，稍后复位");
+                SetWarnMsg(rason + "，暂停当前运动");
+                LogUtil.info($"{Name}{rason}，停止当前运动{MoveInfo.MoveType},{MoveInfo.MoveStep}，{msg}，稍后复位");
             }
 
         }