1

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1787,6 +1787,10 @@ namespace OnlineStore.DeviceLibrary
 
 
         public void OperationProcess(Operation resultOperation)
         public void OperationProcess(Operation resultOperation)
         {
         {
+            if (resultOperation.data != null)
+            {
+                ProcessHumidityCMD(resultOperation);
+            }
             if (resultOperation.op.Equals(2))
             if (resultOperation.op.Equals(2))
             {
             {
                 try
                 try
@@ -1802,10 +1806,10 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 //ReviceInStoreProcess("", resultOperation);
                 //ReviceInStoreProcess("", resultOperation);
             }
             }
-            else if (resultOperation.op.Equals(5))
-            {
-                ProcessHumidityCMD(resultOperation);
-            } 
+            //else if (resultOperation.op.Equals(5))
+            //{
+            //    ProcessHumidityCMD(resultOperation);
+            //} 
             else if (resultOperation.data != null)
             else if (resultOperation.data != null)
             {
             {
                 string result = "";
                 string result = "";

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -165,6 +165,15 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         timeOutMs = 650000;
                         timeOutMs = 650000;
                     }
                     }
+                    if (!wait.IsEnd && span.TotalSeconds > 1 && (wait.IoType.Equals(IO_Type.SuckingDisc_Air) ))
+                    {
+                        IO_VALUE doValue = IOManager.DOValue(wait.IoType);
+                        if (!doValue.Equals(wait.IoValue))
+                        {
+                            LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + wait.IoType + "=" + wait.IoValue + "）");
+                            IOManager.IOMove(wait.IoType, wait.IoValue); 
+                        }
+                    }
                     if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
                     if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
                     {
                     {
                         ConfigIO io = Config.getWaitIO(wait.IoType);
                         ConfigIO io = Config.getWaitIO(wait.IoType);

source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs

@@ -119,6 +119,10 @@ namespace OnlineStore.DeviceLibrary
                             {
                             {
                                 LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + wait.IoType + "=" + wait.IoValue + "）");
                                 LogUtil.error("等待[" + NotOkMsg + "]，重写DO（" + wait.IoType + "=" + wait.IoValue + "）");
                                 IOManager.IOMove(wait.IoType, wait.IoValue);
                                 IOManager.IOMove(wait.IoType, wait.IoValue);
+                                string ioType = wait.IoType.Equals(IO_Type.SuckingDisc_Down) ? IO_Type.SuckingDisc_Up : IO_Type.SuckingDisc_Down;
+                                IO_VALUE ioValue = wait.IoValue.Equals(IO_VALUE.LOW) ? IO_VALUE.HIGH : IO_VALUE.LOW; 
+                                LogUtil.error("等待[" + wait.ToStr() + "]，重写气缸DO（" + ioType + "=" + ioValue + "）");
+                                IOManager.IOMove(ioType, ioValue);
                             }
                             }
                         }
                         }
                     }
                     }
@@ -178,33 +182,7 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.error(WarnMsg, 102);
                     LogUtil.error(WarnMsg, 102);
                     StoreManager.Store.Alarm(StoreAlarmType.BatchIoTimeOut, "", WarnMsg, StoreMove.MoveType);
                     StoreManager.Store.Alarm(StoreAlarmType.BatchIoTimeOut, "", WarnMsg, StoreMove.MoveType);
                 }
                 }
-                if (!isOk)
-                {
-                    //重写气缸
-                    foreach (WaitResultInfo wait in list)
-                    {
-                        if (wait.IsEnd.Equals(false) && (wait.WaitType == (int)Wait_Type.IOMove_2))
-                        {
-                            if (!wait.IsEnd && span.TotalSeconds > 1 &&
-                                (wait.IoType.Equals(IO_Type.SuckingDisc_Down) || wait.IoType.Equals(IO_Type.SuckingDisc_Up)))
-                            {
-                                IO_VALUE doValue = IOManager.DOValue(wait.IoType);
-                                if (!doValue.Equals(wait.IoValue))
-                                {
-                                    LogUtil.error("等待[" + wait.ToStr() + "]，重写DO（" + wait.IoType + "=" + wait.IoValue + "）");
-                                    IOManager.IOMove(wait.IoType, wait.IoValue);
-                                    string ioType = wait.IoType.Equals(IO_Type.SuckingDisc_Down) ? IO_Type.SuckingDisc_Up : IO_Type.SuckingDisc_Down;
-                                    IO_VALUE ioValue = wait.IoValue.Equals(IO_VALUE.LOW) ? IO_VALUE.HIGH : IO_VALUE.LOW;
-
-                                    LogUtil.error("等待[" + wait.ToStr() + "]，重写DO（" + ioType + "=" + ioValue + "）");
-                                    IOManager.IOMove(ioType, ioValue);
-
-                                }
-                               
-                            }
-                        } 
-                    }
-                }
+           
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -465,7 +443,8 @@ namespace OnlineStore.DeviceLibrary
                     { 
                     { 
                         LogUtil.info(Name + "服务器反馈   二维码【" + message + "】【"+ autoposId + "】  ：" + resultOperation.msg);
                         LogUtil.info(Name + "服务器反馈   二维码【" + message + "】【"+ autoposId + "】  ：" + resultOperation.msg);
                         return;
                         return;
-                    }
+                    } 
+                   
                     Dictionary<string, string> data = resultOperation.data;
                     Dictionary<string, string> data = resultOperation.data;
                     if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
                     if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
                     {
                     {