Kaynağa Gözat

结果失败时,将服务器返回的描述提示给用户

Jeff 4 yıl önce
ebeveyn
işleme
f0f4319b7b

+ 6 - 1
SCBC Factory Tools/Business/CommonMethod.cs

@@ -1934,9 +1934,10 @@ namespace MOKA_Factory_Tools
             }
         }
 
-        public static bool GetFireTVDsn(string ordernum, string deviceCode, string FSN, string PSN, out string dsn, SQLiteConnection errorDBNow)
+        public static bool GetFireTVDsn(string ordernum, string deviceCode, string FSN, string PSN, out string dsn,  out string error, SQLiteConnection errorDBNow)
         {
             dsn = "";
+            error = "";
             HttpHelper http = new HttpHelper();
             HttpItem item = new HttpItem()
             {
@@ -1964,18 +1965,21 @@ namespace MOKA_Factory_Tools
                         }
                         else
                         {
+                            error = "error:dsn is null!";
                             CommonMethod.ReportErrormsg("GetFireTVDsn error", result.StatusDescription + "\r\n" + result.Html + "\r\nAddress: " + item.URL + "\r\nPostdata: " + item.Postdata, errorDBNow);
                             return false;
                         }
                     }
                     else
                     {
+                        error = o["message"].ToString();
                         CommonMethod.ReportErrormsg("GetFireTVDsn error", result.StatusDescription + "\r\n" + result.Html + "\r\nAddress: " + item.URL + "\r\nPostdata: " + item.Postdata, errorDBNow);
                         return false;
                     }
                 }
                 catch(Exception ex)
                 {
+                    error = ex.Message;
                     Log.WriteErrorLog("\r\nParse FireTVDsn error :\r\n" + item.URL + "\r\n" + item.Postdata + "\r\n" + result.Html + "\r\n" + ex.Message);
                     CommonMethod.ReportErrormsg("Parse FireTVDsn error", result.StatusDescription + "\r\n" + result.Html + "\r\nAddress: " + item.URL + "\r\nPostdata: " + item.Postdata, errorDBNow);
                     return false;
@@ -1983,6 +1987,7 @@ namespace MOKA_Factory_Tools
             }
             else
             {
+                error = "Communication with server failed";
                 CommonMethod.ReportErrormsg("GetFireTVDsn error", result.StatusDescription + "\r\n" + result.Html + "\r\nAddress: " + item.URL + "\r\nPostdata: " + item.Postdata, errorDBNow);
                 return false;
             }

+ 2 - 2
SCBC Factory Tools/Views/OperationPanel.cs

@@ -1492,7 +1492,7 @@ namespace MOKA_Factory_Tools
                     if (SerialCMD.ReadFireTVPSN(TVPort, out result_psn, out data_psn, out error_psn, SerailDelay))
                     {
                         string psn = Encoding.ASCII.GetString(data_psn);
-                        if (CommonMethod.GetFireTVDsn(orderNow, Encoding.ASCII.GetString(data), SN, psn, out string dsn, errorDBNow))
+                        if (CommonMethod.GetFireTVDsn(orderNow, Encoding.ASCII.GetString(data), SN, psn, out string dsn, out error_psn, errorDBNow))
                         {
                             keyInfo.DSN = dsn;
                             if (!CommonMethod.IsNumberAndWord(keyInfo.DSN))
@@ -1551,7 +1551,7 @@ namespace MOKA_Factory_Tools
                         }
                         else
                         {
-                            MessageBox.Show(LResource.GetDSNError);
+                            MessageBox.Show(error_psn);
                             goto end;
                         }
                     }