1

AutoScanAndLabel/AutoScanAndLabel.csproj

@@ -178,6 +178,16 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     </Compile>
+    <None Include="resources\en-US.lngres">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="resources\ja-JP.lngres">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="resources\So1164自动扫码贴标机.xlsx" />
+    <None Include="resources\zh-CN.lngres">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
     <None Include="App.config" />

DeviceLibrary/AutoScanAndLabel/RobotManage.cs

@@ -40,7 +40,7 @@ namespace DeviceLibrary
                 var ElectricGripperPort = ConfigHelper.Config.Get("ElectricGripperPort");
                 var ElectricGripperPort = ConfigHelper.Config.Get("ElectricGripperPort");
                 electricGripper = new ElectricGripper();
                 electricGripper = new ElectricGripper();
                 if (!electricGripper.OpenPort(ElectricGripperPort)) {
                 if (!electricGripper.OpenPort(ElectricGripperPort)) {
-                    msg += crc.GetString("Res0188","电夹爪通讯失败:{0}\n", ElectricGripperPort);
+                    msg += crc.GetString("Res0188","电夹爪通讯失败:{0}", ElectricGripperPort)+ "\n";
                     IsLoadOk = false;
                     IsLoadOk = false;
                 }
                 }
 
 
@@ -48,7 +48,7 @@ namespace DeviceLibrary
                 if (!IOManager.ConnectionIOList(new List<string>()))
                 if (!IOManager.ConnectionIOList(new List<string>()))
                 {
                 {
                     IsLoadOk = false;
                     IsLoadOk = false;
-                    msg += crc.GetString("Res0189","IO板卡初始化失败\n");
+                    msg += crc.GetString("Res0189","IO板卡初始化失败") + "\n";
                 }
                 }
                 IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
                 IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
                 IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);
                 IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH);