等待物料拿走时状态发4Warning

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1898,7 +1898,7 @@ namespace OnlineStore.DeviceLibrary
             lineOperation.status = 1;
             lineOperation.status = 1;
             if (WarnObj.WarnMsg != "")
             if (WarnObj.WarnMsg != "")
             {
             {
-                lineOperation.status = (int)StoreStatus.Warning;
+                //lineOperation.status = (int)StoreStatus.Warning;
                 lineOperation.msg = WarnObj.WarnMsg;
                 lineOperation.msg = WarnObj.WarnMsg;
                 lineOperation.msgEn = WarnObj.WarnMsgEn;
                 lineOperation.msgEn = WarnObj.WarnMsgEn;
             }
             }
@@ -1908,6 +1908,15 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             lineOperation.status = (int)StoreStatus.StoreOnline;
             lineOperation.status = (int)StoreStatus.StoreOnline;
 
 
+            //判断如果是等待料盘拿走超时，状态改为4Warning
+            if (alarmType.Equals(StoreAlarmType.IoSingleTimeOut) && StoreMove.MoveType.Equals(StoreMoveType.OutStore))
+            {
+                if (StoreMove.MoveStep.Equals(StoreMoveStep.SO_15_WaitTake) || StoreMove.MoveStep.Equals(StoreMoveStep.SO_16_CheckIsTake))
+                {
+                    lineOperation.status = (int)StoreStatus.Warning;
+                }
+            } 
+
             BoxStatus boxStatus = new BoxStatus();
             BoxStatus boxStatus = new BoxStatus();
             boxStatus.boxId = StoreID;
             boxStatus.boxId = StoreID;
 
 
@@ -1941,6 +1950,11 @@ namespace OnlineStore.DeviceLibrary
                     lineOperation.msgEn = ResourceControl.GetEnglishString("叉子料盘检测有料，请检查");
                     lineOperation.msgEn = ResourceControl.GetEnglishString("叉子料盘检测有料，请检查");
                 }
                 }
             }
             }
+            else
+            {
+                //如果是扫码入库失败，也发4
+                lineOperation.status = (int)StoreStatus.Warning;
+            }
             CodeMsg = "";
             CodeMsg = "";
             //SetWarnMsg(); 
             //SetWarnMsg(); 
             //状态
             //状态