添加仓位调试

source/ACPackingStore/FrmBox.cs

@@ -889,10 +889,10 @@ namespace OnlineStore.ACPackingStore
             string ioIP = "192.168.200.13";
             int ioIndex = 0;
             //  if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal))
-            if (BoxBean.Config.DIList.ContainsKey(IO_Type.Compress_Check))
+            if (BoxBean.Config.DIList.ContainsKey(IO_Type.PositionDebug))
             {
-                ioIP = BoxBean.Config.DIList[IO_Type.Compress_Check].IO_IP;
-                ioIndex = BoxBean.Config.DIList[IO_Type.Compress_Check].GetIOAddr();
+                ioIP = BoxBean.Config.DIList[IO_Type.PositionDebug].IO_IP;
+                ioIndex = BoxBean.Config.DIList[IO_Type.PositionDebug].GetIOAddr();
             }
             FrmPositionTool frm = new FrmPositionTool(PortName, slvAddr, ioIP, ioIndex, Text, BoxBean.DeviceID);
             frm.ShowDialog();

source/DeviceLibrary/PackingStore/AC_BOX_Bean_InStore.cs

@@ -182,7 +182,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else
                 {
-                    if(CheckShelfIsEmpty())
+                    if(!IgnoreEmptySig()&&CheckShelfIsEmpty())
                     {
                         InOutStoreLog("检测到料架为空，送出料架");
                         StartShelfOut();

source/DeviceLibrary/PackingStore/AC_BOX_Bean_OutStore.cs

@@ -478,8 +478,8 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.SO_05_GetReel);
                 InOutStoreLog("拿起物品，升降轴至P6[" + moveP.UpDown_P6 + "]，压紧轴到压紧点P2 ：" + moveP.ComPress_P2);
-                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
                 ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
+                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
                 //MoveInfo.WaitList.Add(WaitResultInfo.WaitComAxis(Config.Comp_Axis, Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed));
                 //Config.Comp_Axis.TargetPosition = Config.CompAxis_P4_Position;
                 //ACServerManager.AbsMove(Config.Comp_Axis.DeviceName, Config.Comp_Axis.GetAxisValue(), Config.CompAxis_P4_Position, Config.CompAxis_P4_Speed);

source/DeviceLibrary/PackingStore/AC_BOX_Bean_Partial.cs

@@ -44,6 +44,11 @@ namespace OnlineStore.DeviceLibrary
         {
             return storeRunStatus.Equals(StoreRunStatus.Runing) && (MoveInfo?.MoveType.Equals(StoreMoveType.None) ?? false);
         }
+
+        bool IgnoreEmptySig()
+        {
+            return ConfigHelper.Config.Get("IgnoreShelfEmptySig", false);
+        }
         /// <summary>
         /// 检查料架是否是空料架
         /// </summary>

source/DeviceLibrary/PackingStore/AC_BOX_Bean_Shelf.cs

@@ -184,7 +184,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 if (instoreShelf)
                 {
-                    if (CheckShelfIsEmpty())//空料架
+                    if (!IgnoreEmptySig()&&CheckShelfIsEmpty())//空料架
                     {
                         LogRunStepInfo(moveName + "检测到料架为空料架，不进行入库，即将送出料架");
                         StartShelfOut();
@@ -215,16 +215,24 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else
                 {
-                    if (string.IsNullOrEmpty(StoreManager.FindRealRfidByTempRfid(MoveInfo.MoveParam.rfid)) 
-                        && !CheckShelfIsEmpty())//还未出库的料架检查是否是空料架
+                    if(IgnoreEmptySig())
                     {
-                        LogRunStepInfo(moveName + "未使用的出库料架检测到料架不为空，即将送出料架");
-                        StartShelfOut();
+                        SO_03_ToBagPosition();
                     }
                     else
                     {
-                        SO_03_ToBagPosition();
+                        if (string.IsNullOrEmpty(StoreManager.FindRealRfidByTempRfid(MoveInfo.MoveParam.rfid))
+                                && !CheckShelfIsEmpty())//还未出库的料架检查是否是空料架
+                        {
+                            LogRunStepInfo(moveName + "未使用的出库料架检测到料架不为空，即将送出料架");
+                            StartShelfOut();
+                        }
+                        else
+                        {
+                            SO_03_ToBagPosition();
+                        }
                     }
+
                 }
             }
         }

source/DeviceLibrary/StoreConfig/BoxConfig_1.csv

@@ -3,6 +3,7 @@ DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
 DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X02,DI-02,0,
 DI,气压检测,Airpressure_Check,2,PRO_AOI_IP_1,0,门禁,X03,DI-03,0, 
 DI,L侧门禁,DoorLimit,3,PRO_AOI_IP_1,0,料盘检测1（进料口）,X04,DI-04,0,
+DI,L侧仓位调试,PositionDebug,5,PRO_AOI_IP_1,0,L侧仓位调试,X06,DI-06,0,
 DI,L侧线体空料架检测,EmptyShelf_Check,7,PRO_AOI_IP_1,0,线体空料架检测1,X08,DI-08,0,
 DO,NG料线体电机运转,NGLine_Run,4,PRO_AOI_IP_1,0,NG料线体电机运转,Y05,DO-05,0,
 DO,NG料线体电机反转,NGLine_BackRun,5,PRO_AOI_IP_1,0,NG料线体电机反转,Y06,DO-06,0,

source/DeviceLibrary/StoreConfig/BoxConfig_2.csv

@@ -3,6 +3,7 @@ DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
 DI,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X02,DI-02,0,
 DI,气压检测,Airpressure_Check,2,PRO_AOI_IP_1,0,门禁,X03,DI-03,0, 
 DI,R侧门禁,DoorLimit,4,PRO_AOI_IP_1,0,料盘检测2（料叉）,X05,DI-05,0,
+DI,R侧仓位调试,PositionDebug,6,PRO_AOI_IP_1,0,R侧仓位调试,X07,DI-07,0,
 DI,R侧线体空料架检测,EmptyShelf_Check,8,PRO_AOI_IP_1,0,线体空料架检测2,X09,DI-09,0,
 DO,NG料线体电机运转,NGLine_Run,4,PRO_AOI_IP_1,0,NG料线体电机运转,Y05,DO-05,0,
 DO,NG料线体电机反转,NGLine_BackRun,5,PRO_AOI_IP_1,0,NG料线体电机反转,Y06,DO-06,0,

source/LoadCVSLibrary/storeConfig/config/IO_Type.cs

@@ -48,6 +48,10 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         public static string DoorLimit = "DoorLimit";
         /// <summary>
+        ///  DI L侧仓位调试    PositionDebug	5	X06 DI-06
+        /// </summary>
+        public static string PositionDebug = "PositionDebug";
+        /// <summary>
         /// DI,L侧线体空料架检测,EmptyShelf_Check,7,PRO_AOI_IP_1,0,线体空料架检测1,X08,DI-08,0,
         /// </summary>
         public static string EmptyShelf_Check = "EmptyShelf_Check";