Merge branch 'SO852-ACSingleStore-SISO' of http://106.15.194.121:8083/sunke/ACSi…

…ngleStore into SO852-ACSingleStore-SISO

source/ACSingleStore/ResourceCulture.cs

@@ -42,7 +42,7 @@ namespace OnlineStore
                 LoadData();
             }
         }
-       private static char spilt = ',';
+       private static char spilt = '#';
         private static void LoadData()
         {
             ResourceControl.GetChinaStringEvent += GetChinaString;

source/DeviceLibrary/ResourceControl.cs

@@ -393,5 +393,9 @@ namespace OnlineStore.DeviceLibrary
         /// 出库完成
         /// </summary>
         public static string OutStorEnd = "OutStorEnd";
+
+
+        public static string take_out_reel_failure = "take_out_reel_failure";
+        public static string safety_grating_covered = "safety_grating_covered";
     }
 }

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -658,13 +658,13 @@ namespace OnlineStore.DeviceLibrary
             else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack)
             {
                 //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
-                if(Config.IsUse_Tray_Check.Equals(1))
-                {
-                    StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckTray);
-                    OutStoreLog("出库：SO_07 等待TrayCheck_Fixture=High ");
-                    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
-                }
-                else
+                //if(Config.IsUse_Tray_Check.Equals(1))
+                //{
+                //    StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckTray);
+                //    OutStoreLog("出库：SO_07 等待TrayCheck_Fixture=High ");
+                //    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
+                //}
+                //else
                 {
                     StoreMove.NextMoveStep(StoreMoveStep.SO_08_ToDoorPosition);
                     OutStoreLog("出库：SO_08  走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点),  ");
@@ -725,17 +725,29 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_12_DeviceOutFromDoor)
             {
-                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
+                //改为出库完成 
+                string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
+                lastPosId = posId;
+                lastPosIdStatus = StoreStatus.OutStorEnd;
+                storeStatus = StoreStatus.OutStorEnd;
+                SendLineStatus();
+                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
                 {
-
-                    SO_14_GoBack();
+                    StoreMove.NextMoveStep(StoreMoveStep.SO_13_CheckTray);
+                    OutStoreLog($"出库：检测到料盘 SO_13 等待TrayCheck_Fixture= LOW && TrayCheck_Door=high");
                 }
                 else
                 {
-                    StoreMove.NextMoveStep(StoreMoveStep.SO_13_CheckTray);
-                    OutStoreLog("出库：SO_13 等待TrayCheck_Fixture= LOW ");
-                    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW));
+                    StoreMove.NextMoveStep(StoreMoveStep.SO_TakeReelFaile);
+                    SetWarnMsg(ResourceControl.take_out_reel_failure, posId);
+                    OutStoreLog($"料叉没有成功取出料盘,请检查库位[{posId}]");
                 }
+                //改为出库完成 
+            }
+            else if (StoreMove.MoveStep == StoreMoveStep.SO_TakeReelFaile)
+            {
+                string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
+                SetWarnMsg(ResourceControl.take_out_reel_failure, posId);
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray)
             {
@@ -753,6 +765,14 @@ namespace OnlineStore.DeviceLibrary
                         OutStoreLog("出库：SO_15_WaitTake 等待拿走物品，最多等待" + OutStoreWaitSeconds + "秒");
                         StoreMove.WaitList.Add(WaitResultInfo.WaitTime(ms));
                         StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
+                        if(OutStoreWaitSeconds > 120)
+                        { 
+                            StoreMove.TimeOutSeconds = 120;
+                        }
+                        else
+                        {
+                            StoreMove.TimeOutSeconds = OutStoreWaitSeconds;
+                        }
                         StoreMove.OneWaitCanEndStep = true;
                     }
                     else
@@ -814,11 +834,7 @@ namespace OnlineStore.DeviceLibrary
         }
         private void SO_14_GoBack()
         {
-            //改为出库完成 
-            string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
-            lastPosId = posId;
-            lastPosIdStatus = StoreStatus.OutStorEnd;
-            storeStatus = StoreStatus.OutStorEnd;
+
 
             StoreMove.NextMoveStep(StoreMoveStep.SO_14_GoBack);
             OutStoreLog("出库：SO_14 升降轴返回，轴2至P1(待机点) ,关闭仓门,更改状态为出库完成");

source/DeviceLibrary/store/StoreStep.cs

@@ -257,6 +257,7 @@ namespace OnlineStore.DeviceLibrary
         /// 料仓出库。。。等待200毫秒再次验证料盘是否拿走
         /// </summary>
         SO_16_CheckIsTake=116,
+        SO_TakeReelFaile,
 
         #endregion
 
@@ -264,7 +265,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 入库检测
         /// </summary>
-        SI_00_TrayCheck=200,
+        SI_00_TrayCheck =200,
         /// <summary>
         /// 入库，。定位气缸下降
         /// </summary>