获取库位前先更新托盘为有料

source/AssemblyLineClient/记录.txt

 
 
+
+
+
+
+流水线配置：AssemblyLine.exe.config
+  <!--AGV调度服务器地址-->
+    <add key="AgvServerIp" value="10.85.199.20" />
+
+	
+
+双层线配置：DoubleLineClient.exe.config
+   <!--Server address-->
+    <add key="httpAddr" value="http://10.85.199.25/myproject/rest/api/qisda/device/"/>
+	
+
+
+VMI配置：VMILineClient.exe.config
+   <!--Server address-->
+    <add key="http.server" value="http://10.85.199.25/myproject/" />
+
+	
+包装料仓（三台）配置：ACPackingStore.exe.config
+
+    <!--Server address-->
+    <add key="http.server" value="http://10.85.199.25/myproject/" />
+
+	  <!--AGV调度服务器地址-->
+    <add key="AgvServerIp" value="10.85.199.20" />
+
+
+
+
+
+
+
+
+
+
+
+
 20200429:
 20200429:
 入料口定位工位检测料架后延迟3秒
 入料口定位工位检测料架后延迟3秒
 停止运行时需要给agv发none
 停止运行时需要给agv发none

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -886,17 +886,19 @@ namespace OnlineStore.DeviceLibrary
                     CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
                     CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
                     if (!MoveInfo.ShelfNoTray)
                     if (!MoveInfo.ShelfNoTray)
                     {
                     {
-                        InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，  托盘号【" + currTrayNum + "】，获取库位号，更新托盘信息 , 提升轴下降指定位置");
+                        InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，  托盘号【" + currTrayNum + "】，更新托盘为有料，获取库位号 , 提升轴下降指定位置");
                         FI_21_BatchAxisDown();
                         FI_21_BatchAxisDown();
                     }
                     }
                     else
                     else
                     {
                     {
-                        InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，  托盘号【" + currTrayNum + "】，获取库位号，更新托盘信息 ,");
+                        InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，  托盘号【" + currTrayNum + "】，更新托盘为有料，获取库位号 ,");
                     }
                     }
-                    getPosTask = Task.Factory.StartNew(delegate
-                    {   //更新托盘条码信息
                     string code = CodeManager.ProcessCode(LastCodeList);
                     string code = CodeManager.ProcessCode(LastCodeList);
                     lastcode = code;
                     lastcode = code;
+                    TrayManager.UpdateTrayInfo(currTrayNum, true, ReelType.InStore, new InOutParam(currTrayNum, code, "", LastHeight, LastWidth, false), ""); 
+                    getPosTask = Task.Factory.StartNew(delegate
+                    {  
+                        //更新托盘条码信息 
                         try
                         try
                         { 
                         { 
                             if (code.Equals(""))
                             if (code.Equals(""))
@@ -1352,6 +1354,7 @@ namespace OnlineStore.DeviceLibrary
                 width = 7;
                 width = 7;
             }else
             }else
             {
             {
+                LogUtil.error(Name + "GetWidth ：1234都未检测到，默认为7寸盘");
                 width = 7;
                 width = 7;
             }
             }
             return width;
             return width;

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -309,7 +309,7 @@ namespace OnlineStore.DeviceLibrary
                         SecondMoveInfo.MoveParam = param;
                         SecondMoveInfo.MoveParam = param;
                         SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime);
                         SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_05_WaitTime);
                         LogUtil.info(Name + "托盘 【" + currTrayNum + "】【" + outMsg + "】需要出料" + SecondMoveInfo.SLog + "：" + param.ToStr() + " 等待可以开始移栽 ");
                         LogUtil.info(Name + "托盘 【" + currTrayNum + "】【" + outMsg + "】需要出料" + SecondMoveInfo.SLog + "：" + param.ToStr() + " 等待可以开始移栽 ");
-                        SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+                        SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                         SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitProvidingEquipCanOut());
                         SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitProvidingEquipCanOut());
                         //等待
                         //等待
                         CylinderMove(null, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);
                         CylinderMove(null, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -46,7 +46,7 @@ namespace OnlineStore.DeviceLibrary
             path = path.Substring(0, path.Length - 1);
             path = path.Substring(0, path.Length - 1);
             return path;
             return path;
         }
         }
-        //##
+        //## 100 循环获取库位。服务器超时：循环获取库位
         private static string spiltStr = "##";
         private static string spiltStr = "##";
         public static string CodeReceived(string deviceName, int trayNum, List<string> codeList, int height, int width, string rfid, int feedEquipId)
         public static string CodeReceived(string deviceName, int trayNum, List<string> codeList, int height, int width, string rfid, int feedEquipId)
         {
         {

source/DeviceLibrary/model/TrayInfo.cs

@@ -99,14 +99,5 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// </summary>
         internal static int OutStore = 2;
         internal static int OutStore = 2;
         
         
-        ///// <summary>
-        ///// 紧急出库料盘
-        ///// </summary>
-        //internal static int OutStore_Equip = 3;
-
-        ///// <summary>
-        ///// 入库失败需要NG气缸退出的料盘
-        ///// </summary>
-        //internal static int InStoreNG = 4;
     }
     }
 }
 }