1

source/Common/Setting_Init.cs

@@ -94,6 +94,6 @@ namespace OnlineStore.Common
         [MyConfigComment("是否检测到料架自动入库")]
         public static MyConfig<bool> AutoShelfInstore = true;
         [MyConfigComment("是否启用入料口移门")]
-        public static MyConfig<bool> UseDoor = true;
+        public static MyConfig<bool> UseDoor = false;
     }
 }

source/DeviceLibrary/PackingStore/AC_BOX_Bean.cs

@@ -885,10 +885,8 @@ namespace OnlineStore.DeviceLibrary
         {
             string msg = "";
             msg += "状态： " + storeRunStatus + "   " + storeStatus + "\n";
-            //  msg += "lineS： " + storeStatus + "\n";
             msg += "报警：  " + alarmType + "\n";
             msg += MoveInfo.MoveType + " " + MoveInfo.SLog + "\n";
-            //       msg += "MoveS： " + MoveInfo.SLog + "\n";
             msg += "料架： " + CurrShelfID + "  " + LastOutParam.rfid + "\n";
             msg += Config.AgvNodeName + "：" + AgvClient.GetAction(Config.AgvNodeName);
             return msg;

source/DeviceLibrary/PackingStore/AC_BOX_Bean_InStore.cs

@@ -334,13 +334,13 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_25_ScanCode))
             {
-                if (LastScanCodes.Count <= 0 && LastWidth.Equals(0) && LastHeight.Equals(8))
-                {
-                    storeStatus = StoreStatus.InStoreExecute;
-                    MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
-                    InOutStoreLog("扫码，扫码失败，尺寸" + LastWidth + "*" + LastHeight + "，认为没拿到料盘，继续循环料架取料盘");
-                }
-                else
+                //if (LastScanCodes.Count <= 0 && LastWidth.Equals(0) && LastHeight.Equals(8))
+                //{
+                //    storeStatus = StoreStatus.InStoreExecute;
+                //    MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
+                //    InOutStoreLog("扫码，扫码失败，尺寸" + LastWidth + "*" + LastHeight + "，认为没拿到料盘，继续循环料架取料盘");
+                //}
+                //else
                 {
                     MoveInfo.NextMoveStep(StoreMoveStep.BI_27_InoutToP2);
                     InOutStoreLog("扫码，进出轴到P2");

source/DeviceLibrary/PackingStore/AC_BOX_Bean_OutStore.cs

@@ -197,6 +197,7 @@ namespace OnlineStore.DeviceLibrary
                     //恢复当前需要出库的位置
                     MoveInfo.MoveParam.RestoreShelfPosId();
                     SO_03_ToBagPosition();
+                    return;
                 }
             }
             else if (MoveInfo.MoveStep.Equals(StoreMoveStep.SO_PreCheck_02_InoutToP1))
@@ -414,9 +415,24 @@ namespace OnlineStore.DeviceLibrary
                     //    if (IsRightShelfId(CurrShelfID, MoveInfo.MoveParam.realRfid))
                     if (MoveInfo.MoveParam.rfid.Equals(LastRfidID))
                     {
-                        LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，开始取料");
-                        SO_03_ToBagPosition();
-                        return;
+                        if(MoveInfo.MoveParam.cutReel || MoveInfo.MoveParam.urgentReel)
+                        {
+                            //重新记录
+                            LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，紧急料或者分盘料只放一个位置，送出当前料架，稍后重新出库");
+                            waitOutStoreList.Enqueue(MoveInfo.MoveParam);
+                            //   MoveInfo.MoveParam.rfid = LastRfidID;
+                            MoveInfo.NewMove(StoreMoveType.OutStore, LastOutParam);
+                            //送出料架，并且记录出库信息，等会重新出库
+                            StartShelfOut();
+                            return;
+                        }
+                        else
+                        {
+                            LogRunStepInfo($"【LastRfidID={LastRfidID}】【{MoveInfo.MoveParam.rfid}】 同料架，开始取料");
+                            SO_03_ToBagPosition();
+                            return;
+                        }
+
                     }
                     else
                     {

source/DeviceLibrary/PackingStore/AC_BOX_Bean_Partial.cs

@@ -57,13 +57,13 @@ namespace OnlineStore.DeviceLibrary
             //如果料架号是空，需要送到VMI线 
             if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore))
             {
-                if (CurrShelfID.EndsWith("00"))
+                if (CurrShelfID.EndsWith("00")|| string.IsNullOrEmpty(CurrShelfID))
                 {
                     mark = defualtMark;
                 }
                 else if(isNGShelf())
                 {
-                    mark = MoveInfo.MoveParam.rfid + ",ng";
+                    mark = defualtMark; ;
                 }
                 //包装料会发往分盘区, 紧急料区, 包装线区
                 // urgentReel 这个为true是紧急料   出到紧急料区
@@ -85,9 +85,14 @@ namespace OnlineStore.DeviceLibrary
                     mark = MoveInfo.MoveParam.rfid + ",pack";
                 }
             }
-            else if (MoveInfo.MoveType.Equals(StoreMoveType.InStore) && isNGShelf())
+            else if (MoveInfo.MoveType.Equals(StoreMoveType.InStore))
             {
-                mark = MoveInfo.MoveParam.rfid + ",ng";
+                if(isNGShelf())
+                    mark = defualtMark;
+                else
+                {
+                    mark = defualtMark + ",ok";
+                }
             }
             return mark;
         }

source/DeviceLibrary/PackingStore/AC_BOX_Bean_Shelf.cs

@@ -207,12 +207,12 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else
                 {
-                    if (string.IsNullOrEmpty(StoreManager.FindRealRfidByTempRfid(MoveInfo.MoveParam.rfid)))
-                    {
-                        //新料架，检查料架上是否有治具
-                        MoveInfo.NextMoveStep(StoreMoveStep.SO_PreCheck_01_StartGetTray);
-                    }
-                    else
+                    //if (string.IsNullOrEmpty(StoreManager.FindRealRfidByTempRfid(MoveInfo.MoveParam.rfid)))
+                    //{
+                    //    //新料架，检查料架上是否有治具
+                    //    MoveInfo.NextMoveStep(StoreMoveStep.SO_PreCheck_01_StartGetTray);
+                    //}
+                    //else
                     {
                         SO_03_ToBagPosition();
                     }