增加单盘入库部分代码

source/ACSingleStore/App.config

@@ -45,6 +45,7 @@
     <add key ="UseAIOBOX" value ="1"/> 
     <add key ="DIMS" value ="40"/>
 	<add key="DOMS" value="200"/>
+    <add key="SinglePosId" value="1#AC2_2_1_1" />
   </appSettings>
   <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">

source/ACSingleStore/FrmStoreBox.cs

@@ -532,16 +532,7 @@ namespace OnlineStore.AutoInOutStore
             MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotSingleInStore,"此设备不支持单个入库"),
                 ResourceCulture.GetString(ResourceCulture.MsgTitle,ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示")), MessageBoxButtons.OK, MessageBoxIcon.Error);
             return;
-            if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
-            {
-                string selectPositionNum = cmbPosition.Text;
-                LineMoveP ktk = LoadPostion();
-                store.StartInStoreMove(new InOutStoreParam("", selectPositionNum, ktk), false);
-            }
-            else
-            {
-                 MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！"));
-            }
+         
         }
 
         private LineMoveP LoadPostion()
@@ -1741,21 +1732,7 @@ namespace OnlineStore.AutoInOutStore
                             store.autoMsg = "自动出入库：" + poText;
                             store.autoNext = true;
                             LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "");
-                            btnStart.Text = StopAuto;
-                            //string msg = AutomaticBaiting.doStartBatchIn();
-                            //if (msg.Equals(""))
-                            //{
-                            //    store.autoNext = true;
-                            //    btnStart.Text = StopAuto;
-                            //    LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
-                            //}
-                            //else
-                            //{
-                            //    MessageBox.Show(msg);
-                            //    store.autoNext = false;
-                            //    btnStart.Text = StartAuto;
-                            //    LogUtil.info(LOGGER, store.StoreName + "自动出入库失败【"+msg+"】，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
-                            //}
+                            btnStart.Text = StopAuto; 
                             DebugStatus(false);
                         }
                     }
@@ -1774,5 +1751,22 @@ namespace OnlineStore.AutoInOutStore
                 groupInout.Enabled = checkBox1.Checked;
             }
         }
+
+        private void btnTrayIn_Click(object sender, EventArgs e)
+        {
+            string defaultPosId = ConfigAppSettings.GetValue(Setting_Init.SinglePosId).Trim(); 
+            if (store.PositionNumList.Contains(defaultPosId))
+            {
+                bool result = store.StartInStoreMove(new InOutStoreParam("", defaultPosId), false, true);
+                if (!result)
+                {
+                    MessageBox.Show("启动单盘出库失败：" + store.CodeOrInoutMsg);
+                }
+            }
+            else
+            {
+                MessageBox.Show("请先正确配置 " + Setting_Init.SinglePosId);
+            }
+        }
     }
 }

source/ACSingleStore/记录.txt

@@ -177,7 +177,17 @@ IO模块读取时间改为可配置。
 
 
 
-
+20190522
+1.需要增加单盘入库功能
+	appconfig增加配置：
+    <add key="SinglePosId" value="1#AC2_2_1_1" />
+	StoreConfig.csv增加配置：
+	PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
+	修改入库流程。
+	界面上增加按钮。
+
+	2.需要修改：出库时不使用极限信号，增加一个最高点配置。
+	PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1600000,,,,,,,
 
 
 

source/Common/Setting_Init.cs

@@ -89,5 +89,9 @@ namespace OnlineStore.Common
         public static string Default_Language = "Default_Language";
 
         public static string UseAIOBOX = "UseAIOBOX";
+        /// <summary>
+        /// 单盘入库默认PosID
+        /// </summary>
+        public static string SinglePosId = "SinglePosId";
     }
 }

source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv

@@ -152,6 +152,8 @@ PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,10000
 PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
 PRO,最后一盘料需要补充的高度,LastTrayAddHeight,4,,,,,,,
 ,,,,,,,,,,
+PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
+PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1600000,,,,,,,
 ,,,,,,,,,,
 PRO,IO模块对应的DI数量,IO_DILength,192.168.200.21#16;192.168.200.22#4,,,,,, ,
 PRO,模块对应的DO数量,IO_DOLength,192.168.200.21#16;192.168.200.22#4,,,,,,,

source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs

@@ -657,8 +657,8 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     StoreMove.NextMoveStep(StoreMoveStep.AUTO_O03_SpeedMove);
-                    LogUtil.info(Name + " 出料 ，轴上升到检测到出料信号，速度【" + StoreManager.Config.BatchAxis_SlowSpeed + "】");
-                    ACAxisSpeedMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_SlowSpeed, IO_Type.OutCheck);
+                    LogUtil.info(Name + " 出料 ，轴上升到检测到出料信号，速度【" + StoreManager.Config.BatchAxis_SlowSpeed + "】,最大上升高度【"+StoreManager.Config.BatchAxis_OutMaxValue + "】");
+                   ACAxisSpeedMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_SlowSpeed, IO_Type.OutCheck);
                 }
             }
             else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O02_WaitOutSingleLow))

source/DeviceLibrary/store/StoreMoveStep.cs

@@ -334,10 +334,7 @@ namespace OnlineStore.DeviceLibrary
         /// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
         /// </summary>
         SI_03_ReturnHome = 203,
-        ///// <summary>
-        ///// 入库。。压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P3(压紧前点)
-        ///// </summary>
-        //SI_04_CompressWare = 204,
+         
         /// <summary>
         /// 入库。。叉子进入入料口，轴3（ 叉子） 至P2（ 进料口取料点）
         /// </summary>
@@ -408,15 +405,58 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         SI_24_WaitTrayGo = 224,
 
-        ///// <summary>
-        ///// 料仓出库，，升降轴返回，，  轴2至P1（ 待机点）
-        ///// </summary>
-        //SI_23_GoBack = 233,
-        ///// <summary>
-        ///// 等待拿走物品
-        ///// </summary>
-        //SI_24_WaitTake = 234,
 
+        /// <summary>
+        /// 单盘入库：旋转轴待机点P1，升降轴走到仓门位置P7
+        /// </summary>
+        SIS_31_ToDoor = 301,
+
+        /// <summary>
+        /// 单盘入库：叉子走到门口位置P4， 打开仓门
+        /// </summary>
+        SIS_32_InoutToDoor = 302,
+        /// <summary>
+        /// 单盘入库：等待操作人员放入料盘
+        /// </summary>
+        SIS_33_WaitTray= 303,
+        /// <summary>
+        /// 单盘入库：确认放入料盘，关闭仓门，升降轴稍微上升，压紧轴压紧
+        /// </summary>
+        SIS_34_GetTray= 304,
+        /// <summary>
+        /// 单盘入库：确认放入料盘，关闭仓门，进出轴后退到P1
+        /// </summary>
+        SIS_35_InoutBack = 305,
+        /// <summary>
+        /// 单盘入库：升降轴下降到扫码位置P2
+        /// </summary>
+        SIS_36_UpdownDown = 306,
+
+        /// <summary>
+        /// 单盘入库：轴3（ 叉子） 至P2（ 进料口取料点）
+        /// </summary>
+        SIS_37_InoutToP2 = 307,
+
+
+        /// <summary>
+        /// 单盘入库：扫码
+        /// </summary>
+        SIS_38_ScanCode =308,
+
+        /// <summary>
+        /// 单盘入库：获取入库库位号
+        /// </summary>
+        SIS_39_GetPosId = 309,
+
+        /// <summary>
+        /// 单盘入库：启动新的入库
+        /// </summary>
+        SIS_40_StartInStore= 340,
+
+        /// <summary>
+        /// 单盘入库：开始送出料盘
+        /// </summary>
+        SIS_41_StartSendTrayOut= 341,
 
         #endregion
 
@@ -425,7 +465,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// 开始复位
         /// </summary>
-        AUTO_R00_Start=1100,
+        AUTO_R00_Start =1100,
         /// <summary>
         /// 关闭门锁
         /// </summary>

source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs

@@ -17,7 +17,17 @@ namespace OnlineStore.LoadCSVLibrary
             : base(id, cid, type, filepath)
         {
         }
-         
+        /// <summary>
+        /// PRO,(轴五) 上料轴出库上升最大高度, BatchAxis_OutMaxValue,1600000,,,,,,,
+        /// </summary>
+        [ConfigProAttribute("BatchAxis_OutMaxValue")]
+        public int BatchAxis_OutMaxValue { get; set; }
+
+        /// <summary>
+        /// PRO,(轴二) 升降轴单盘入库抬升料盘的高度, UpdownAxis_UpPosition,3000
+        /// </summary>
+        [ConfigProAttribute("UpdownAxis_UpPosition")]
+        public int UpdownAxis_UpPosition { get; set; }
         /// <summary>
         /// 预警温度
         /// </summary>