1

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs

@@ -11,9 +11,7 @@ namespace OnlineStore.DeviceLibrary
     partial class AC_BOX_Bean
     partial class AC_BOX_Bean
     {
     {
 
 
-        #region 自动出入库参数
-
-
+        #region 自动出入库参数 
         /// <summary>
         /// <summary>
         /// 入库完成后自动出库，出库完成后自动入库
         /// 入库完成后自动出库，出库完成后自动入库
         /// </summary>
         /// </summary>
@@ -226,7 +224,7 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// <summary>
         /// 开始入库移动移动
         /// 开始入库移动移动
         /// </summary> 
         /// </summary> 
-        public void StartInStoreMove(InOutParam param, bool isNeedCheckIO)
+        public override void StartInStoreMove(InOutParam param)
         {
         {
             startInStoreTime = DateTime.Now;
             startInStoreTime = DateTime.Now;
             string posId = param != null ? param.PositionNum : "";
             string posId = param != null ? param.PositionNum : "";
@@ -246,33 +244,15 @@ namespace OnlineStore.DeviceLibrary
                 storeRunStatus = StoreRunStatus.Busy;
                 storeRunStatus = StoreRunStatus.Busy;
                 storeStatus = StoreStatus.InStoreExecute;
                 storeStatus = StoreStatus.InStoreExecute;
                 MoveInfo.NewMove(StoreMoveType.InStore, param);
                 MoveInfo.NewMove(StoreMoveType.InStore, param);
-                if (isNeedCheckIO)
-                {
-                    //料盘检测
-                    InStoreLog("  入库：SI_00   检测料盘信号");
-                    MoveInfo.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
-                }
-                else
-                {
 
 
-                    SI_02_Move(param.MoveP);
+                SI_02_Move(param.MoveP);
 
 
-                }
             }
             }
             else
             else
             {
             {
                 LogUtil.error(Name + " 启动【" + posId + "】入库出错，当前状态，storeStatus=" + storeRunStatus);
                 LogUtil.error(Name + " 启动【" + posId + "】入库出错，当前状态，storeStatus=" + storeRunStatus);
             }
             }
-        }
-
-        /// <summary>
-        /// 开始入库移动移动
-        /// </summary> 
-        public override void StartInStoreMove(InOutParam param)
-        {
-            StartInStoreMove(param, false);
-        }
+        } 
         private void SI_02_Move(LineMoveP moveP)
         private void SI_02_Move(LineMoveP moveP)
         {
         {
             InStoreLog("入库：SI_02_  进出轴(叉子)动作至P1,打开舱门");
             InStoreLog("入库：SI_02_  进出轴(叉子)动作至P1,打开舱门");
@@ -668,6 +648,8 @@ namespace OnlineStore.DeviceLibrary
         }
         }
 
 
         #endregion
         #endregion
+
+
         public List<FixtureCodeInfo> waitOutStoreList = new List<FixtureCodeInfo>();
         public List<FixtureCodeInfo> waitOutStoreList = new List<FixtureCodeInfo>();
         public object waitOutListLock = "";
         public object waitOutListLock = "";
 
 

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

+using OnlineStore.LoadCSVLibrary;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OnlineStore.DeviceLibrary
+{
+    /// <summary>
+    /// 料架新增的出入库逻辑
+    /// </summary>
+    partial class AC_BOX_Bean
+    {
+
+        /// <summary>
+        /// 开始入库移动移动
+        /// </summary> 
+        public void StartShelfInStore()
+        {
+         
+            if (storeRunStatus == StoreRunStatus.Runing)
+            {
+              if(IOValue(IO_Type.LineIn_Check).Equals(IO_VALUE.HIGH))
+                {
+                    LogInfo(" 空闲中，检测到入料口有信号，入料口移门打开，");
+                    storeRunStatus = StoreRunStatus.Busy;
+                    storeStatus = StoreStatus.InStoreExecute;
+                    MoveInfo.NewMove(StoreMoveType.InStore, new InOutParam());
+                   MoveInfo.NextMoveStep(StoreMoveStep.BOX_M_H_TOP1_OtherAxisToP1)
+                }
+               
+               
+            } 
+        }
+
+
+    }
+}

source/DeviceLibrary/DeviceLibrary.csproj

@@ -64,6 +64,7 @@
   <ItemGroup>
   <ItemGroup>
     <Compile Include="ACPackingStore\AC_BOX_Bean.cs" />
     <Compile Include="ACPackingStore\AC_BOX_Bean.cs" />
     <Compile Include="ACPackingStore\AC_BOX_Bean_Partial.cs" />
     <Compile Include="ACPackingStore\AC_BOX_Bean_Partial.cs" />
+    <Compile Include="ACPackingStore\AC_BOX_Bean_Shelf.cs" />
     <Compile Include="ACPackingStore\PackingStoreBean.cs" />
     <Compile Include="ACPackingStore\PackingStoreBean.cs" />
     <Compile Include="ACPackingStore\PackingStoreBean_Partial.cs" />
     <Compile Include="ACPackingStore\PackingStoreBean_Partial.cs" />
     <Compile Include="ACPackingStore\StoreManager.cs" />
     <Compile Include="ACPackingStore\StoreManager.cs" />

source/DeviceLibrary/StoreConfig/BoxConfig_1.csv

@@ -119,6 +119,6 @@ PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,,
 PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
 PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
 PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
 PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
 PRO,温湿度端口号,Humiture_Port,COM2,,,,,,,
 PRO,温湿度端口号,Humiture_Port,COM2,,,,,,,
-PRO,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,
+PRO,扫码的相机名称(多个用#分隔),CameraNameList,Name1#Name1,,,,,,,
 PRO,RFID读卡器IP,RFID_IP,192.168.200.11,,,,,,,
 PRO,RFID读卡器IP,RFID_IP,192.168.200.11,,,,,,,
 PRO,是否是调试状态,IsInDebug,1,,,,,,,
 PRO,是否是调试状态,IsInDebug,1,,,,,,,