状态修改

source/ACSingleStore/FrmAxisDebug.cs

@@ -59,16 +59,16 @@ namespace OnlineStore.AutoInOutStore
         private bool InOutIsIsP1()
         {
             int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
-            if (InOutDefaultPosition > 3000 || InOutDefaultPosition.Equals(0))
-            {
-                InOutDefaultPosition = 3000;
-            }
+            //if (InOutDefaultPosition > 3000 || InOutDefaultPosition.Equals(0))
+            //{
+            //    InOutDefaultPosition = 3000;
+            //}
             int currValue = ACServerManager.GetActualtPosition(inout.DeviceName, inout.GetAxisValue()); 
             if (currValue <= InOutDefaultPosition)
             {
                 return true;
             } 
-            MessageBox.Show("叉子不在待机位，请先将叉子退回待机位!", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            MessageBox.Show("叉子不在待机位，请先将叉子退回待机位("+InOutDefaultPosition+")", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             return false;
         }
         private void btnMiddleMove_MouseDown(object sender, MouseEventArgs e)

source/ACSingleStore/FrmStoreBox.cs

@@ -795,16 +795,16 @@ namespace OnlineStore.AutoInOutStore
         private bool InOutIsIsP1()
         {
             int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
-            if (InOutDefaultPosition > 3000 || InOutDefaultPosition.Equals(0))
-            {
-                InOutDefaultPosition = 3000;
-            }
+            //if (InOutDefaultPosition > 3000 || InOutDefaultPosition.Equals(0))
+            //{
+            //    InOutDefaultPosition = 3000;
+            //}
             int currValue = ACServerManager.GetActualtPosition(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue());
             if (currValue <= InOutDefaultPosition)
             {
                 return true;
             }
-            MessageBox.Show("叉子不在待机位，请先将叉子退回待机位!", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+            MessageBox.Show("叉子不在待机位，请先将叉子退回待机位("+InOutDefaultPosition+")!", "警告（叉子在待机位时，才能移动升降轴和旋转轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
             return false;
         }
         private void btnCloseAxis_Click(object sender, EventArgs e)

source/Common/Common.csproj

@@ -56,8 +56,6 @@
     <Compile Include="Setting_Init.cs" />
     <Compile Include="util\AcSerialBean.cs" />
     <Compile Include="util\ConfigAppSettings.cs" />
-    <Compile Include="util\CSVFileHelper.cs" />
-    <Compile Include="util\CSVReaderControl.cs" />
     <Compile Include="util\FormUtil.cs" />
     <Compile Include="util\HttpHelper.cs" />
     <Compile Include="util\HumitureController.cs" />
@@ -67,12 +65,7 @@
     <Compile Include="util\MyWebClient.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="util\NetTCPServer.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="util\ScanCodeManager.cs" />
-    <Compile Include="util\ScanSocket.cs" />
-    <Compile Include="util\SerialBean.cs" />
     <Compile Include="util\TcpClient.cs" />
     <Compile Include="util\TcpServer.cs" />
     <Compile Include="util\UdpServer.cs" />

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -1357,7 +1357,7 @@ namespace OnlineStore.DeviceLibrary
         #endregion
 
         #region 与服务器通信定时器，每1秒向服务器通知一次状态,同时执行出库操作
-
+        private string CodeMsg = "";
         private bool isInProcess = false;
         private void server_connect_timer_Tick(object sender, EventArgs e)
         {
@@ -1408,12 +1408,8 @@ namespace OnlineStore.DeviceLibrary
             boxStatus.boxId = StoreID;
 
             //状态
-            boxStatus.status = (int)storeStatus;
+            boxStatus.status = GetStoreStatus(); 
 
-            if (IsDebug)
-            {
-                boxStatus.status = (int)StoreStatus.Debugging;
-            }
             boxStatus.msg = WarnMsg;
             lineOperation.msg = WarnMsg;
 
@@ -1423,6 +1419,21 @@ namespace OnlineStore.DeviceLibrary
                 lineOperation.msg = AutomaticBaiting.CodeMsg;
                 AutomaticBaiting.CodeMsg = "";
             }
+            if (boxStatus.msg.Equals(""))
+            {
+                boxStatus.msg = CodeMsg;
+                lineOperation.msg = CodeMsg;
+            }
+            if (CodeMsg.Equals(""))
+            {
+                if (storeRunStatus.Equals(StoreRunStatus.Runing)&&AutomaticBaiting.AutoBaitingStatus.Equals(StoreRunStatus.Runing)
+                    && KND.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                {
+                    boxStatus.msg = "叉子料盘检测有料，请检查";
+                    lineOperation.msg = "叉子料盘检测有料，请检查";
+                }
+            }
+            CodeMsg = "";
             //WarnMsg = ""; 
             //状态
             boxStatus.status = (int)storeStatus;
@@ -1460,6 +1471,27 @@ namespace OnlineStore.DeviceLibrary
             return lineOperation;
         }
 
+        private int GetStoreStatus()
+        {
+            return (int)storeStatus;
+            //如果料仓没有出入库，但是自动上下料机构在上料中
+            if (storeStatus.Equals(StoreStatus.StoreOnline))
+            {
+                if (AutomaticBaiting.StoreMove.MoveType.Equals(StoreMoveType.InStore))
+                {
+                    return (int)StoreStatus.InStoreExecute;
+                }
+                else if (AutomaticBaiting.StoreMove.MoveType.Equals(StoreMoveType.StoreReset))
+                {
+                    return (int)StoreStatus.ResetMove;
+                }
+            }
+            if (IsDebug)
+            {
+                return (int)StoreStatus.Debugging;
+            }
+        }
+
         private void SendLineStatus()
         {
             DateTime time = DateTime.Now;

source/DeviceLibrary/store/StoreMoveStep.cs

 using log4net;
 using OnlineStore.Common;
 using OnlineStore.DeviceLibrary;
-using OnlineStore.LoadCSVLibrary;
-using OnLineStore.Common;
+using OnlineStore.LoadCSVLibrary; 
 using System;
 using System.Collections.Generic;
 using System.Drawing;