Merge branch 'master' of http://106.15.194.121:8083/sunke/RC1250-ACPackingStore

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs

@@ -408,7 +408,12 @@ namespace OnlineStore.DeviceLibrary
                 {
                     string mark = GetMarkInfo();
                     LogUtil.error(Name + logN + " 当前 BS_03_WaitEmptyAgv，RFID[" + rfid + "]不是空车，不处理agv，重发 NeedLeave [" + mark + "][" + CurrShelfID + "]");
-                    AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
+                    Task.Factory.StartNew(new Action(()=> {
+                        AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.MayNot, ClientLevel.High, true);
+                        Thread.Sleep(10000);
+                        AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
+                    }));
+                  
                     return false;
                 }
 
@@ -425,7 +430,12 @@ namespace OnlineStore.DeviceLibrary
                 {
                     string mark = GetMarkInfo();
                     LogUtil.error(Name + logN + " 当前出库中 BI_00_ReadyShelf，RFID无效，不处理agv，重发 NeedEnter [" + mark + "][" + MoveInfo.MoveParam.rfid + "]");
-                    AgvClient.SetStatus(Config.AgvNodeName, mark, MoveInfo.MoveParam.rfid, ClientAction.NeedEnter, ClientLevel.High, true);
+                    Task.Factory.StartNew(new Action(() => {
+                        AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.MayNot, ClientLevel.High, true);
+                        Thread.Sleep(10000);
+                        AgvClient.SetStatus(Config.AgvNodeName, mark, MoveInfo.MoveParam.rfid, ClientAction.NeedEnter, ClientLevel.High, true);
+                    }));
+
                     return false;
                 }
 

source/DeviceLibrary/DeviceLibrary.csproj

@@ -36,16 +36,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Asa.AgvClient">
+      <HintPath>..\..\dll\Asa.AgvClient.dll</HintPath>
+    </Reference>
     <Reference Include="Asa.IOModule.AIOBOX">
       <HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
     </Reference>
     <Reference Include="Asa.RFID">
       <HintPath>..\..\dll\Asa.RFID.dll</HintPath>
     </Reference>
-    <Reference Include="Client, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\dll\Client.dll</HintPath>
-    </Reference>
     <Reference Include="CodeLibrary">
       <HintPath>..\..\dll\CodeLibrary.dll</HintPath>
     </Reference>

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -55,13 +55,13 @@ namespace OnlineStore.DeviceLibrary
         }
 
         private static void AgvClient_EnterShelf(string id, string rfid)
-        { 
-            LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid+ "]  "); 
+        {
+            LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid + "]  ");
             foreach (AC_BOX_Bean box in StoreManager.Store.BoxMap.Values)
             {
                 if (box.Config.AgvNodeName.Equals(id))
                 {
-                    LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid+ "]  ,设置 [" + box.Name + "] WaitShelfEnter = true");
+                    LogUtil.info("收到 AgvClient_EnterShelf [" + id + "] [" + rfid + "]  ,设置 [" + box.Name + "] WaitShelfEnter = true");
                     box.WaitShelfEnter = true;
                     break;
                 }

source/LoadCVSLibrary/CSVReaderBase.cs

@@ -149,7 +149,7 @@ namespace OnlineStore.LoadCSVLibrary
             if (titleIndex.Count < cvsTitleList.Count)
             {
                 foreach (string str in cvsTitleList)
-                {
+                    {
                     if (!titleIndex.ContainsKey(str))
                     {
                         LogUtil.error(filename+"：未找到必须列：" + str + ",加载数据失败！");