1

Common/Common.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OnlineStore.Common</RootNamespace>
     <RootNamespace>OnlineStore.Common</RootNamespace>
     <AssemblyName>MyCommon</AssemblyName>
     <AssemblyName>MyCommon</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <TargetFrameworkProfile />
   </PropertyGroup>
   </PropertyGroup>

DeviceLibrary/theMachine/InOutDevice_IN.cs

@@ -4,7 +4,6 @@ using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 
 
 namespace DeviceLibrary
 namespace DeviceLibrary
@@ -55,6 +54,7 @@ namespace DeviceLibrary
             MoveInfo.NextMoveStep(MoveStep.In03);
             MoveInfo.NextMoveStep(MoveStep.In03);
             MoveInfo.log("扫码失败重新扫码");
             MoveInfo.log("扫码失败重新扫码");
         }
         }
+        bool isScanError = false;
         void InProcess()
         void InProcess()
         {
         {
             if (mainMachine.CheckWait(MoveInfo))
             if (mainMachine.CheckWait(MoveInfo))
@@ -103,6 +103,7 @@ namespace DeviceLibrary
                         Lift.LiftDown(MoveInfo);
                         Lift.LiftDown(MoveInfo);
                         FrontStop(MoveInfo, IO_VALUE.HIGH);
                         FrontStop(MoveInfo, IO_VALUE.HIGH);
                         ScanCode(100);
                         ScanCode(100);
+                        isScanError = false;
                         MoveInfo.log("开始扫码,入口阻挡上升, 线体停止");
                         MoveInfo.log("开始扫码,入口阻挡上升, 线体停止");
                     }
                     }
                     else if (MoveInfo.IsTimeOut(10))
                     else if (MoveInfo.IsTimeOut(10))
@@ -226,7 +227,9 @@ namespace DeviceLibrary
                         Msg.add("等待服务器返回库位", MsgLevel.info);
                         Msg.add("等待服务器返回库位", MsgLevel.info);
                     else if (MoveInfo.IsTimeOut(15))
                     else if (MoveInfo.IsTimeOut(15))
                     {
                     {
-                        //MoveInfo.NextMoveStep(MoveStep.Wait);
+                        isScanError = true;
+                        MoveInfo.NextMoveStep(MoveStep.InNG1);
+                        Lift.LiftDown(MoveInfo);
                         MoveInfo.log($"等待服务器返回库位超时");
                         MoveInfo.log($"等待服务器返回库位超时");
                     }
                     }
                     break;
                     break;
@@ -272,7 +275,10 @@ namespace DeviceLibrary
                     MoveInfo.NextMoveStep(MoveStep.InNG3);
                     MoveInfo.NextMoveStep(MoveStep.InNG3);
                     Line.LineStop("work");
                     Line.LineStop("work");
                     MoveInfo.log($"料箱抵达出口");
                     MoveInfo.log($"料箱抵达出口");
-                    Msg.add("入库周转箱超重，已退出，请处理", MsgLevel.alarm);
+                    if (isScanError)
+                        Msg.add("入库周转箱扫码失败,请确认料箱方向后重试", MsgLevel.alarm);
+                    else
+                        Msg.add("入库周转箱超重，已退出，请处理", MsgLevel.alarm);
                     RobotManage.UserPause("入库周转箱超重，退出线体");
                     RobotManage.UserPause("入库周转箱超重，退出线体");
                     break;
                     break;
                 case MoveStep.InNG3:
                 case MoveStep.InNG3:

LoadCVSLibrary/LoadCSVLibrary.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
     <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
     <AssemblyName>LoadCSVLibrary</AssemblyName>
     <AssemblyName>LoadCSVLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <TargetFrameworkProfile />
   </PropertyGroup>
   </PropertyGroup>