Sfoglia il codice sorgente

修改整机抄写订单上报时不读取PSN,整机+板卡抄写订单才读

chenjiangqun 2 anni fa
parent
commit
6c92b6828e
1 ha cambiato i file con 15 aggiunte e 8 eliminazioni
  1. 15 8
      FactoryTool_CShare/Views/OperationPanel.cs

+ 15 - 8
FactoryTool_CShare/Views/OperationPanel.cs

@@ -5095,19 +5095,26 @@ namespace MOKA_Factory_Tools
                 UpdateKeys(midListNow.keytype, false);
             }
             else
-            {// 在线抄写;
-                
-                //读取PSN 并且上报
-                if (SerialCMD.ReadFireTVPSN(TVPort, out result, out data, out error, SerailDelay))
+            {// 在线抄写;          
+                //获取的是整机+板卡订单,读取PSN 并且上报
+                if(midListNow.isSmt == "1")
                 {
-                    smtPsn = Encoding.ASCII.GetString(data);
+                    if (SerialCMD.ReadFireTVPSN(TVPort, out result, out data, out error, SerailDelay))
+                    {
+                        smtPsn = Encoding.ASCII.GetString(data);
+                    }
+                    else
+                    {
+                        ErrMsg = string.Format("读取PSN失败,请确认这是Fire TV整机+板卡抄写订单 {0}", error);
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
                 }
                 else
                 {
-                    ErrMsg = string.Format("读取PSN失败 {0}", error);
-                    Log.WriteErrorLog(ErrMsg);
-                    goto end;
+                    smtPsn = "";
                 }
+                
               
                 if (WriteDID.Checked)
                 {