门已经打开不重复打开

source/ACPackingStore/App.config

@@ -22,8 +22,8 @@
     <add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv"/>
     <add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv"/>
     <add key="Store_Type" value="RC_AC_PA"/>
     <add key="Store_Type" value="RC_AC_PA"/>
     <add key="Store_CID" value="packing-store"/>
     <add key="Store_CID" value="packing-store"/>
-    <add key="Store_CID_1" value="packing-store1"/>
-    <add key="Store_CID_2" value="packing-store2"/>
+    <add key="Store_CID_1" value="packing-21"/>
+    <add key="Store_CID_2" value="packing-22"/>
     <!--end one store config-->
     <!--end one store config-->
     <add key="ACBaudRate" value="115200" />
     <add key="ACBaudRate" value="115200" />
     <add key="InOutDefaultPosition" value="8000"/>
     <add key="InOutDefaultPosition" value="8000"/>

source/DeviceLibrary/ACPackingStore/EnteryDoorBean.cs

@@ -86,7 +86,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     if (result.Equals(""))
                     if (result.Equals(""))
                     {
                     {
-                        LogUtil.info("停止运动：" + result + " [" + moveDO + "] [" + checkDI + "] " );
+                        LogUtil.info("停止运动：" + result + " [" + moveDO + "] [" + checkDI + "] ");
                     }
                     }
                     else
                     else
                     {
                     {
@@ -108,6 +108,14 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return false;
                 return false;
             }
             }
+
+            //如果门已打开直接返回
+            if (IOManager.IOValue(IO_Type.EntranceDoor_Open, subType).Equals(IO_VALUE.HIGH) &&
+                IOManager.IOValue(IO_Type.EntranceDoor_Close, subType).Equals(IO_VALUE.LOW))
+            {
+                return true;
+            }
+
             if (moveInfo != null)
             if (moveInfo != null)
             {
             {
                 moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Open, IO_VALUE.HIGH));
                 moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Open, IO_VALUE.HIGH));
@@ -123,6 +131,13 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return false;
                 return false;
             }   
             }   
+            
+            //如果门已关闭直接返回
+            if (IOManager.IOValue(IO_Type.EntranceDoor_Close, subType).Equals(IO_VALUE.HIGH) &&
+                IOManager.IOValue(IO_Type.EntranceDoor_Open, subType).Equals(IO_VALUE.LOW))
+            {
+                return true;
+            }
             if (moveInfo != null)
             if (moveInfo != null)
             {
             {
                 moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Close, IO_VALUE.HIGH));
                 moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.EntranceDoor_Close, IO_VALUE.HIGH));