1

DeviceLibrary/DeviceLibrary.csproj

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

DeviceLibrary/packages.config

@@ -2,5 +2,5 @@
 <packages>
 <packages>
   <package id="Fleck" version="1.2.0" targetFramework="net461" />
   <package id="Fleck" version="1.2.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <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>
 </packages>
\ No newline at end of file

DeviceLibrary/theMachine/DeviceBase.cs

@@ -42,6 +42,8 @@ namespace DeviceLibrary
                 });
                 });
                 if (ml.msgLevel == MsgLevel.alarm)
                 if (ml.msgLevel == MsgLevel.alarm)
                     equipMsg.status = 2;
                     equipMsg.status = 2;
+                else
+                    equipMsg.status = 1;
             });
             });
             equipMsg.equipName = GroupName;
             equipMsg.equipName = GroupName;
             TheLine.UploadStatus(equipMsg);
             TheLine.UploadStatus(equipMsg);

LoadCVSLibrary/storeConfig/ConfigItemBase.cs

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

TheMachine/App.config

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

TheMachine/TheMachine.csproj

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