盘点功能修改

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1088,7 +1088,7 @@ namespace OnlineStore.DeviceLibrary
                 else if (storeRunStatus.Equals(StoreRunStatus.Runing))
                 else if (storeRunStatus.Equals(StoreRunStatus.Runing))
                 {
                 {
                     //判断是否需要出入库
                     //判断是否需要出入库
-                    if (StoreMove.MoveType.Equals(StoreMoveType.None) && alarmType.Equals(StoreAlarmType.None))
+                    if (StoreMove.MoveType.Equals(StoreMoveType.None) && (alarmType.Equals(StoreAlarmType.None)||alarmType.Equals(StoreAlarmType.CheckInStoreTimeOut)))
                     {
                     {
                         IO_VALUE checkIO = KNDIOValue(IO_Type.TrayCheck_Door);
                         IO_VALUE checkIO = KNDIOValue(IO_Type.TrayCheck_Door);
 
 
@@ -1921,7 +1921,7 @@ namespace OnlineStore.DeviceLibrary
             if (resultOperation.data != null && resultOperation.data.ContainsKey(ParamDefine.inTimeout)&&resultOperation.data[ParamDefine.inTimeout].ToLower().Equals("alarm"))
             if (resultOperation.data != null && resultOperation.data.ContainsKey(ParamDefine.inTimeout)&&resultOperation.data[ParamDefine.inTimeout].ToLower().Equals("alarm"))
             {
             {
                 WarnMsg = "盘点入库超时报警";
                 WarnMsg = "盘点入库超时报警";
-                LogUtil.error("收到服务器端报警：盘点入库超时报警");
+                LogUtil.error(LOGGER,"收到服务器端报警：盘点入库超时报警",1000);
                 Alarm(StoreAlarmType.CheckInStoreTimeOut, StoreAlarmType.CheckInStoreTimeOut.ToString(), WarnMsg, StoreMoveType.None);
                 Alarm(StoreAlarmType.CheckInStoreTimeOut, StoreAlarmType.CheckInStoreTimeOut.ToString(), WarnMsg, StoreMoveType.None);
             }
             }
             else
             else

source/DeviceLibrary/store/InOrOutStoreParam.cs

@@ -70,14 +70,14 @@ namespace OnlineStore.DeviceLibrary
             IsSolderPaste = false;
             IsSolderPaste = false;
             needInAfterOut = false;
             needInAfterOut = false;
         }
         }
-        public InOutStoreParam(string wareNo, string posId, ACStorePosition movep,bool needInAfterOut)
+        public InOutStoreParam(string wareNo, string posId, ACStorePosition movep, bool needInAfterOut)
         {
         {
-            ACStoreP = movep; 
+            ACStoreP = movep;
             WareNumber = wareNo;
             WareNumber = wareNo;
             PositionNum = posId;
             PositionNum = posId;
-            MoveP = null; 
+            MoveP = null;
             IsSolderPaste = false;
             IsSolderPaste = false;
-            needInAfterOut = needInAfterOut;
+            this.needInAfterOut = needInAfterOut;
         }
         }
      
      
         private ACStorePosition ACStoreP = null;
         private ACStorePosition ACStoreP = null;