Parcourir la source

修复无结果 问题。

sat23 il y a 3 ans
Parent
commit
93160a26fa
2 fichiers modifiés avec 20 ajouts et 2 suppressions
  1. 19 1
      Business/CommonMethod.cs
  2. 1 1
      Views/OperationPanel.cs

+ 19 - 1
Business/CommonMethod.cs

@@ -2138,6 +2138,24 @@ namespace MOKA_Factory_Tools
             return true;
         }
 
+        /// <summary>
+        /// 将url utf8转gb2312;
+        /// </summary>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public static string utf8_gb2312(string text)
+        {
+            //声明字符集   
+            System.Text.Encoding utf8, gb2312;
+            //utf8   
+            utf8 = System.Text.Encoding.GetEncoding("utf-8");
+            //gb2312   
+            gb2312 = System.Text.Encoding.GetEncoding("gb2312");
+            byte[] data = System.Text.Encoding.Convert(utf8, gb2312, utf8.GetBytes(text));
+            //返回转换后的字符   
+            return utf8.GetString(data);
+        }
+
         /// <summary>
         /// 上报数据抄写结果到MES系统中;
         /// </summary>
@@ -2174,7 +2192,7 @@ namespace MOKA_Factory_Tools
                         reader.Close();
 
                         bool bResult = jObject["Result"].Value<bool>();
-                        msg = jObject["EroMsg"].Value<string>();
+                        msg = utf8_gb2312(jObject["EroMsg"].Value<string>());
 
                         if (bResult)
                         {

+ 1 - 1
Views/OperationPanel.cs

@@ -5059,7 +5059,7 @@ namespace MOKA_Factory_Tools
             }
             // 上报抄写结果到MES系统中;
             string strOutMsg;
-            if ( !CommonMethod.ReportDataBurningResultToMES(SN, keyInfo.DSN, TestResult ? "" : "", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), errorDBNow, out strOutMsg) )
+            if ( !CommonMethod.ReportDataBurningResultToMES(SN, keyInfo.DSN, TestResult ? "Pass" : "Fail", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), errorDBNow, out strOutMsg) )
             {
                 MessageBox.Show("上报抄写结果到MES失败,请紧急处理:" + strOutMsg);
             }