增加暂存区料盘信息

source/DeviceLibrary/DeviceLibrary.csproj

@@ -75,6 +75,7 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Compile Include="manager\agvClient\AgvClient.cs" />
     <Compile Include="manager\agvClient\AgvClient.cs" />
+    <Compile Include="manager\BufferDataManager.cs" />
     <Compile Include="manager\StoreManager.cs" />
     <Compile Include="manager\StoreManager.cs" />
     <Compile Include="deviceLibrary\RFID\RFIDManagercs.cs" />
     <Compile Include="deviceLibrary\RFID\RFIDManagercs.cs" />
     <Compile Include="manager\SServerManager.cs" />
     <Compile Include="manager\SServerManager.cs" />

source/DeviceLibrary/manager/BufferDataManager.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OnlineStore.DeviceLibrary
+{
+    public class BufferDataManager
+    {
+        /// <summary>
+        /// A进料上暂存区料盘信息，null时无料
+        /// </summary>
+        public static InOutPosInfo AInStoreInfo = null;
+        /// <summary>
+        /// A出料下暂存区料盘信息，null时无料
+        /// </summary>
+        public static InOutPosInfo AOutStoreInfo = null;
+
+        /// <summary>
+        /// B进料上暂存区料盘信息，null时无料
+        /// </summary>
+        public static InOutPosInfo BInStoreInfo = null;
+        /// <summary>
+        /// B出料下暂存区料盘信息，null时无料
+        /// </summary>
+        public static InOutPosInfo BOutStoreInfo = null;
+
+    }
+}

source/DeviceLibrary/manager/StoreManager.cs

@@ -94,18 +94,19 @@ namespace OnlineStore.DeviceLibrary
 
 
                     Config = CSVConfigReader.LoadBoxConfig(0, CID, DeviceType.Store, storeConfigPath);
                     Config = CSVConfigReader.LoadBoxConfig(0, CID, DeviceType.Store, storeConfigPath);
                     allConfigMap.Add(0, Config);
                     allConfigMap.Add(0, Config);
-
                     string inputConfigPath = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_Input);
                     string inputConfigPath = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_Input);
 
 
                     InputEquip_Config inputConfig = CSVConfigReader.LoadInputConfig(1, DeviceType.InputEquip, inputConfigPath);
                     InputEquip_Config inputConfig = CSVConfigReader.LoadInputConfig(1, DeviceType.InputEquip, inputConfigPath);
                   
                   
                     inputConfig.SetIO(1);
                     inputConfig.SetIO(1);
+                    allConfigMap.Add(1, inputConfig);
                     string boxPath = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_Box);
                     string boxPath = appPath + ConfigAppSettings.GetValue(Setting_Init.ConfigPath_Box);
 
 
                     BoxEquip_Config boxConfig = CSVConfigReader.LoadBoxConfig(2, DeviceType.BoxEquip, boxPath); 
                     BoxEquip_Config boxConfig = CSVConfigReader.LoadBoxConfig(2, DeviceType.BoxEquip, boxPath); 
                     boxConfig.SetIO(2);
                     boxConfig.SetIO(2);
 
 
-                 
+                    allConfigMap.Add(2, boxConfig);
+
                     XLRStore = new XLRStoreBean(Config, inputConfig, boxConfig);
                     XLRStore = new XLRStoreBean(Config, inputConfig, boxConfig);
                     LogUtil.info("加载 完成！");
                     LogUtil.info("加载 完成！");
                     return true;
                     return true;

source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs

@@ -83,7 +83,7 @@ namespace OnlineStore.LoadCSVLibrary
         public virtual void LoadConfig(List<ConfigBase> configList)
         public virtual void LoadConfig(List<ConfigBase> configList)
         {
         {
             List<string> ioTypeList = IO_Type.GetTypeList();
             List<string> ioTypeList = IO_Type.GetTypeList();
-           ioTypeList = new List<string>();
+           //ioTypeList = new List<string>();
             StringBuilder builder = new StringBuilder("\r\n");
             StringBuilder builder = new StringBuilder("\r\n");
             StringBuilder proBuilder = new StringBuilder("\r\n");
             StringBuilder proBuilder = new StringBuilder("\r\n");
             DIList = new Dictionary<string, ConfigIO>();
             DIList = new Dictionary<string, ConfigIO>();
@@ -143,10 +143,10 @@ namespace OnlineStore.LoadCSVLibrary
                     }
                     }
                     else
                     else
                     {
                     {
-                        //AddProBuffer(con, proBuilder);
+                        AddProBuffer(con, proBuilder);
                         LogUtil.error("配置文件：" + this.ConfigFilePath + "，属性名=" + con.ProName + "的属性未找到匹配字段！");
                         LogUtil.error("配置文件：" + this.ConfigFilePath + "，属性名=" + con.ProName + "的属性未找到匹配字段！");
                     }
                     }
-                    AddProBuffer(con, proBuilder);
+                    //AddProBuffer(con, proBuilder);
                 }
                 }
 
 
                 else if (con.ProType == ConfigItemType.DI)
                 else if (con.ProType == ConfigItemType.DI)

source/XLRStoreClient/FrmXLRStore.cs

@@ -372,7 +372,16 @@ namespace OnlineStore.XLRStore
              
              
             lblWarnMsg.Text = warnMsg;
             lblWarnMsg.Text = warnMsg;
 
 
-            lblCardMsg.Text = HuichuanLibrary.HCBoardManager.CardMsg;
+
+            string bufStr = "";
+            bufStr+="A进料暂存料盘："+ BufferDataManager.AInStoreInfo?.ToStr()+"\r\n";
+            bufStr += "A出料暂存料盘：" + BufferDataManager.AOutStoreInfo?.ToStr() + "\r\n";
+            bufStr += "A进料暂存料盘：" + BufferDataManager.BInStoreInfo?.ToStr() + "\r\n";
+            bufStr += "A出料暂存料盘：" + BufferDataManager.BOutStoreInfo?.ToStr() + "";
+
+            lblBufferInfo.Text = bufStr;
+
+
             if (StoreBean.runStatus > RunStatus.Wait)
             if (StoreBean.runStatus > RunStatus.Wait)
             {
             {
                 if (启动AToolStripMenuItem.Enabled.Equals(true))
                 if (启动AToolStripMenuItem.Enabled.Equals(true))