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

@@ -48,7 +48,7 @@ namespace DeviceLibrary
 
             openretry++;
             {
-                Msg += string.Format(crc.GetString("Res0032.1bf30741","第{0}次尝试打开轴:{1}"), openretry, Config.Explain);
+                Msg += string.Format(crc.GetString("Res0032.1bf30741","第{0}次尝试打开轴:{1}"), openretry, crc.GetString(Config.ProName, Config.Explain));
 
                 if (AxisManager.GetBusyStatus(portName, slvAddr) == 1)
                 {
@@ -97,12 +97,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 = crc.GetString("Res0037.2bf5c941","打开轴") + Config.Explain + crc.GetString("Res0038.33d2a704","失败 ");
+                    msg = crc.GetString("Res0037.2bf5c941","打开轴") + crc.GetString(Config.ProName, Config.Explain) + crc.GetString("Res0038.33d2a704","失败 ");
                     LogUtil.info(AxisName + msg);
                     return false;
                 }
@@ -447,11 +447,11 @@ namespace DeviceLibrary
                     Thread.Sleep(200);
                     if (AxisManager.GetAlarmStatus(portName, slvAddr) != 0)
                     {
-                        msg += string.Format(crc.GetString("Res0044.95840864","轴(0)存在报警,清除失败"), axis.Config.Explain);
+                        msg += string.Format(crc.GetString("Res0044.95840864","轴(0)存在报警,清除失败"), crc.GetString(axis.Config.ProName, axis.Config.Explain));
                         isok = false;
                     }
                     else
-                        msg += string.Format(crc.GetString("Res0045.b5876296","轴(0)存在报警,清除成功"), axis.Config.Explain);
+                        msg += string.Format(crc.GetString("Res0045.b5876296","轴(0)存在报警,清除成功"), crc.GetString(axis.Config.ProName, axis.Config.Explain));
                 }
             }
             Thread.Sleep(50);

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -54,6 +54,9 @@ namespace DeviceLibrary
         {
             try
             {
+                if (ConfigHelper.Config.Get($"Device_{Machine.MachineSide}_Disable", false))
+                    return;
+
                 if (Machine.runStatus!= RunStatus.Stop)
                     ProcessMsg(Machine.Msg.msg);
                 if (!string.IsNullOrEmpty(server) && storeStatus!= StoreStatus.None)

DeviceLibrary/packages.config

@@ -3,19 +3,19 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net461" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net461" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net461" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Net.NameResolution" version="4.3.0" targetFramework="net461" />
   <package id="System.Net.Security" version="4.3.0" targetFramework="net461" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Threading" version="4.3.0" targetFramework="net461" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" requireReinstallation="true" />
   <package id="WebSocket4Net" version="0.15.2" targetFramework="net461" />
 </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 bool IsPutIn {get=> MoveInfo.MoveStep >= MoveStep.StoreTS14; }
         
         MsgService Msg;

DeviceLibrary/theMachine/MainMachine _IOMonitor.cs

@@ -34,6 +34,7 @@ namespace DeviceLibrary
             else if ((DateTime.Now - LastHumiCheckTime).TotalSeconds > 30)
             {
                 RobotManage.rightMachine.Msg.add(crc.GetString("Res0030.70dccffd","温湿度超限"), MsgLevel.alarm);
+                RobotManage.leftMachine.Msg.add(crc.GetString("Res0030.70dccffd","温湿度超限"), MsgLevel.alarm);
             }
 
             if (humiNeedStart && IOValue(IO_Type.NitrogenValve, Config).Equals(IO_VALUE.LOW))

DeviceLibrary/theMachine/Store/StoreMachine.cs

@@ -342,7 +342,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

@@ -175,7 +175,8 @@ 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

@@ -71,7 +71,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>SBDH</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>false</Deterministic>

TheMachine/UCStoreMachine.cs

@@ -39,6 +39,7 @@ namespace TheMachine
             sio.Config = Machine.Config;
             Common.AlertListViewSet(listView);
             this.Tag = "not";
+            
             crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
             Machine_PauseEvent(this, Machine.UserPause);
         }
@@ -137,6 +138,8 @@ namespace TheMachine
             AddForm("tab_axis",crc.GetString("Res0192","伺服调试"), ac);
             AddForm("tab_store", crc.GetString("Res0193","库位调试"), bd);
             AddForm("tab_setting", crc.GetString("Res0194","相关设置"), sc);
+
+            crc.LanguageProcess(this);
         }
 
         private void AddForm(string id, string text, UserControl form)