1

Common/Common.csproj

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

DeviceLibrary/DeviceLibrary.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeviceLibrary</RootNamespace>
     <AssemblyName>DeviceLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

DeviceLibrary/DeviceLibrary/AxisBean.cs

-using OnlineStore.Common;
+using OnlineStore;
+using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using System;
 using System.Collections.Generic;
@@ -45,28 +46,28 @@ namespace DeviceLibrary
 
             openretry++;
             {
-                Msg += string.Format("第{0}次尝试打开轴:{1}", openretry, Config.Explain);
+                Msg += string.Format(crc.GetString("Res0083.1bf30741","第{0}次尝试打开轴:{1}"), openretry, crc.GetString(Config.ProName, Config.Explain));
 
                 if (AxisManager.GetBusyStatus(portName, slvAddr) == 1)
                 {
                     AxisManager.SuddenStop(portName, slvAddr);
-                    Msg += string.Format("...伺服忙碌,急停{0}次", openretry);
+                    Msg += string.Format(crc.GetString("Res0084.814c87d5","...伺服忙碌,急停{0}次"), openretry);
                     Thread.Sleep(200);
                 }
                 AxisManager.ServoOn(portName, slvAddr);
                 Thread.Sleep(200);
                 if (AxisManager.IsServeoOn(portName, slvAddr))
                 {
-                    Msg += "...使能成功";
+                    Msg += crc.GetString("Res0085.226d8802","...使能成功");
                     openretry = 0;
                     return true;
                 }
                 else
-                    Msg += "...尝试使能失败";
+                    Msg += crc.GetString("Res0086.ebec6459","...尝试使能失败");
 
                 Thread.Sleep(1000);
                 if (openretry < 5)
-                    Msg = "伺服连接中...";
+                    Msg = crc.GetString("Res0087.3cb23f45","伺服连接中...");
             }
             return false;
         }
@@ -94,12 +95,12 @@ namespace DeviceLibrary
                 System.Threading.Thread.Sleep(100);
                 if (AxisManager.IsServeoOn(portName, slvAddr))
                 {
-                    LogUtil.info(AxisName + "清理报警后重新打卡轴成功：" + Config.Explain);
+                    LogUtil.info(AxisName + "清理报警后重新打卡轴成功：" + crc.GetString(Config.ProName, Config.Explain));
                 }
                 else
                 {
                     AxisManager.ServoOff(portName, slvAddr);
-                    msg = "打开轴" + Config.Explain + "失败 ";
+                    msg = crc.GetString("Res0088.2bf5c941","打开轴") + crc.GetString(Config.ProName, Config.Explain) + crc.GetString("Res0089.33d2a704","失败 ");
                     LogUtil.info(AxisName + msg);
                     return false;
                 }
@@ -195,7 +196,7 @@ namespace DeviceLibrary
                         int isAlarm = AxisManager.GetAlarmStatus(deviceName, axisNo);
                         if (isAlarm.Equals(1))
                         {
-                            clearMsg = "清理报警，";
+                            clearMsg = crc.GetString("Res0090.cbd5d752","清理报警，");
                             AxisManager.AlarmClear(deviceName, axisNo);
                             Thread.Sleep(200);
                             AxisManager.ServoOn(deviceName, axisNo);
@@ -244,7 +245,7 @@ namespace DeviceLibrary
                 }
                 else
                 {
-                    msg = MoveInfo.Name + " " + MoveInfo.MoveStep + axis.DisplayStr + ",收到原点完成信号，当前位置[" + outCount + "]，误差过大，需要报警";
+                    msg = MoveInfo.Name + " " + MoveInfo.MoveStep + axis.DisplayStr + crc.GetString("Res0091.405c5a9e",",收到原点完成信号，当前位置[") + outCount + crc.GetString("Res0092.6658614e","]，误差过大，需要报警");
                     LogUtil.error(msg);
                 }
             }
@@ -432,11 +433,11 @@ namespace DeviceLibrary
                     Thread.Sleep(200);
                     if (AxisManager.GetAlarmStatus(portName, slvAddr) != 0)
                     {
-                        msg += string.Format("轴(0)存在报警,清除失败", axis.Config.Explain);
+                        msg += string.Format(crc.GetString("Res0093.95840864","轴(0)存在报警,清除失败"), crc.GetString(axis.Config.ProName, axis.Config.Explain));
                         isok = false;
                     }
                     else
-                        msg += string.Format("轴(0)存在报警,清除成功", axis.Config.Explain);
+                        msg += string.Format(crc.GetString("Res0094.b5876296","轴(0)存在报警,清除成功"), crc.GetString(axis.Config.ProName, axis.Config.Explain);
                 }
             }
             Thread.Sleep(50);

DeviceLibrary/packages.config

 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
 </packages>
\ No newline at end of file

DeviceLibrary/theMachine/BoxTransport.cs

@@ -31,7 +31,7 @@ namespace DeviceLibrary
         public event Func<bool, bool> DoorControl;
         public bool IsComplateOrFree { get => MoveInfo.MoveStep == MoveStep.Wait && !movelock; }
         public bool IsTakedReel { get => MoveInfo.MoveStep >= MoveStep.StoreTS10; }
-        public bool IsPutOnOut { get => MoveInfo.MoveStep >= MoveStep.StoreTS16; }
+        public bool IsPutOnOut { get => MoveInfo.MoveStep >= MoveStep.StoreTS16 || MoveInfo.MoveStep== MoveStep.Wait; }
 
 
         public ReelTransport(Robot_Config _Config, MainMachine _mainMachine)

DeviceLibrary/theMachine/MainMachine.cs

@@ -292,7 +292,7 @@ namespace DeviceLibrary
                     //ProcessMoveinfoEvent?.Invoke(MoveInfo.List);
                     if (!UserPause)
                         Msg.clear();
-                    else
+                    else if(!hasAlarm)
                         currnetstoreStatus = StoreStatus.Debugging;
 
                     if (currnetstoreStatus!=StoreStatus.None)

LoadCVSLibrary/LoadCSVLibrary.csproj

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

LoadCVSLibrary/storeConfig/ConfigItemBase.cs

@@ -172,7 +172,9 @@ namespace OnlineStore.LoadCSVLibrary
         {
             get
             {
-                return ElectricalDefinition + "-" + Explain;// + "-" + ProName + "";
+                //return ElectricalDefinition + "-" + Explain;// + "-" + ProName + "";
+                return ElectricalDefinition + "-" + crc.GetString(ProType + "_" + ProName, Explain);
+
             }
         }
         ushort value = 0;

TheMachine/App.config

@@ -57,7 +57,7 @@
     </root>-->
 	</log4net>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

TheMachine/TheMachine.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>TheMachine</RootNamespace>
     <AssemblyName>SBSH</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>false</Deterministic>