T4料架处理bug修改。

source/AssemblyLineClient/记录.txt

@@ -56,8 +56,11 @@
 
 
 
- 20201223
- 托盘检测经常卡主。
+ 20201228
+ 机器人编号修改，左侧2，右侧1.
+ 1.HY8托盘逻辑修改。
+ 2.接驳台提前放行托盘.
+ T4料架处理修改。
 
 
 
@@ -206,7 +209,7 @@ http发送去掉ping。
 
 
 
-
+T5上料时，T4的托盘没有等待。
 
 
 

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -162,7 +162,7 @@ namespace OnlineStore.DeviceLibrary
             if (data.Num > 0 && IsTrayLCylinderAfter())
             {
                 OutLog("定位工位读取到料串 " + data.NumStr() + " ， 等待定位工位检测信号亮");
-                FI_06_WaitTime(true);
+                FO_06_WaitTime(true);
             }
             if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH) && IsTrayLCylinderAfter())
             {
@@ -217,7 +217,7 @@ namespace OnlineStore.DeviceLibrary
             if (data.Num > 0)
             {
                 OutLog("定位工位读取到料串 " + data.NumStr() + " ， 等待定位工位检测信号亮");
-                FI_06_WaitTime(true);
+                FO_06_WaitTime(true);
             } 
            else  if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
             {

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -232,7 +232,7 @@ namespace OnlineStore.DeviceLibrary
                                 MoveInfo.NewMove(LineMoveType.Fixture);
                                 runStatus = LineRunStatus.Busy;
                                 MoveInfo.NextMoveStep(LineMoveStep.HY03_FrontStopUp);
-                                LogInfo("托盘检测，" + MoveInfo.SLog + " 检测到托盘 ，阻挡上升");
+                                CheckLog("托盘检测，" + MoveInfo.SLog + " 检测到托盘 ，阻挡上升");
                                 if (Config.DOList.ContainsKey(IO_Type.HY_FrontStopDown))
                                 {
                                     IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.LOW);
@@ -264,7 +264,7 @@ namespace OnlineStore.DeviceLibrary
                                     MoveInfo.NewMove(LineMoveType.Fixture);
                                     runStatus = LineRunStatus.Busy;
                                     MoveInfo.NextMoveStep(LineMoveStep.HY02_FrontStopDown);
-                                    LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘，前阻挡下降");
+                                    CheckLog(" 托盘检测：" + MoveInfo.SLog + "，检测到前阻挡托盘，前阻挡下降");
                                     ClearTrayRFID();
                                     IOMove(IO_Type.HY_FrontStopDown, IO_VALUE.HIGH, 1200);
                                     MoveInfo.OneWaitCanEndStep = true;
@@ -308,7 +308,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NewMove(LineMoveType.Fixture);
                 runStatus = LineRunStatus.Busy;
                 MoveInfo.NextMoveStep(LineMoveStep.HY71_OL_Wait);
-                LogInfo(" 托盘检测：" + MoveInfo.SLog + "，检测到出料线托盘 ");
+                CheckLog(" 托盘检测：" + MoveInfo.SLog + "，检测到出料线托盘 ");
                 ClearTrayRFID();
                 IOMove(IO_Type.HY_OL_StopDown, IO_VALUE.LOW);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_OL_Tray_Check, IO_VALUE.HIGH));

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -181,6 +181,10 @@ namespace OnlineStore.DeviceLibrary
                     JHY_11_TopDown();
                 }
             }
+            else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_06_GetTraySize))
+            {
+
+            }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_07_TopUp))
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_08_LocationUp);

source/HuichuanLibrary/HuichuanLibrary.csproj

@@ -62,24 +62,6 @@
     <Content Include="device_config.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="huichuan\x64\IMC_API_x64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="huichuan\x64\msvcr100.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="huichuan\x64\msvcr100d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="huichuan\x86\IMC_API_x86.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="huichuan\x86\msvcr100.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="huichuan\x86\msvcr100d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="huichuan_x64\IMC_API_x64.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -117,15 +99,5 @@
       <DependentUpon>FrmHuiChuanTest.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="huichuan\x86\IMC_API_x86.lib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="huichuan\x64\IMC_API_x64.lib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file