UAS_MES_JH/FunctionCode/Make/Make_TestCollectionqrcode.cs

@@ -593,7 +593,6 @@ namespace UAS_MES_NEW.Make
                 string macinfo = dt.Rows[0]["pr_macinto"].ToString();
                 string btinfo = dt.Rows[0]["pr_btinfo"].ToString();
                 string netinfo = dt.Rows[0]["pr_netinfo"].ToString();
-                string softversion = "";
                 string othid = "";
                 string mmi1 = "";
                 string mmi2 = "";
@@ -707,9 +706,9 @@ namespace UAS_MES_NEW.Make
                         }
                         ifrework = dt.Rows[0]["ms_ifrework"].ToString();
                         string softversioncheck = dh.GetConfig("softversion", "sys").ToString();
-                        if (softversion != ma_softversion.Text && softversion != "" && softversion != "0")
+                        if (version != ma_softversion.Text && version != "" && version != "0")
                         {
-                            OperateResult.AppendText("<<序列号：" + ms_sncode.Text + "对应软件版本" + softversion + "与工单维护软件版本" + ma_softversion.Text + "不一致\n", Color.Red);
+                            OperateResult.AppendText("<<序列号：" + ms_sncode.Text + "对应软件版本" + version + "与工单维护软件版本" + ma_softversion.Text + "不一致\n", Color.Red);
                             return;
                         }
                         //if (!mmi1.Contains("PASS") || !mmi2.Contains("PASS"))
@@ -778,7 +777,7 @@ namespace UAS_MES_NEW.Make
                             return;
                         }
 
-                        dh.ExecuteSql("update makeserial set MS_SOFTVERSION = '" + softversion + "',ms_othid1 = '" + othid + "',MS_MMI1 = '" + mmi1 + "',MS_MMI2 = '" + mmi2 + "'," +
+                        dh.ExecuteSql("update makeserial set MS_SOFTVERSION = '" + version + "',ms_othid1 = '" + othid + "',MS_MMI1 = '" + mmi1 + "',MS_MMI2 = '" + mmi2 + "'," +
                             "ms_mac = '" + mac + "',ms_bt = '" + bt + "',MS_OPENTIME = '" + opentime + "' where ms_sncode = '" + ms_sncode.Text + "' and ms_makecode = '" + ma_code.Text + "'", "update");
 
                         if (US_SKU.Text != "")

UAS_MES_ZKLH/App.config

@@ -2,17 +2,17 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="UAS_MES_NEW.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+      <section name="UAS_MES.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <startup useLegacyV2RuntimeActivationPolicy="true"> 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <userSettings>
     <UAS_MES_NEW.Properties.Settings>
@@ -20,22 +20,22 @@
         <value>优软科技MES</value>
       </setting>
       <setting name="LastLoginUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginSob" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginResource" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultCollectionValue" serializeAs="String">
         <value>DefaultValue</value>
       </setting>
       <setting name="PortName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="BaudRate" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="FTPAddress" serializeAs="String">
         <value>ftp://10.8.0.82|vsftpd|vsftpd</value>
@@ -46,22 +46,22 @@
         <value>优软科技MES</value>
       </setting>
       <setting name="LastLoginUser" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginSob" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastLoginResource" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="DefaultCollectionValue" serializeAs="String">
         <value>DefaultValue</value>
       </setting>
       <setting name="PortName" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="BaudRate" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="FTPAddress" serializeAs="String">
         <value>\\172.16.66.51\lable</value>
@@ -71,8 +71,8 @@
   <applicationSettings>
     <UAS_MES_NEW.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value />
+        <value/>
       </setting>
     </UAS_MES_NEW.Properties.Settings>
   </applicationSettings>
-</configuration>
+</configuration>

UAS_MES_ZKLH/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="HslCommunication" version="9.7.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+  <package id="HslCommunication" version="9.7.0" targetFramework="net40" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" requireReinstallation="true" />
 </packages>