加强了整机板卡抄写类型时界面提示，修改为不管什么抄写最后都需要读取PSN作为smtPsn的值

FactoryTool_CShare/Business/V2Method.cs

@@ -154,7 +154,7 @@ namespace MOKA_Factory_Tools
                 mid.host = jObject["host"].Value<string>();
                 mid.whiteType = jObject["whiteType"].Value<string>();
                 string aesEncrypt = jObject["aesEncrypt"] == null ? null : jObject["aesEncrypt"].Value<string>();
-                mid.isSmt = jObject["isSmt"] == null ? null : jObject["isSmt"].Value<string>();    
+                mid.isSmt = jObject["isSmt"] == null ? "0" : jObject["isSmt"].Value<string>();    
                 
                 if (aesEncrypt != null)
                     mid.aesEncrypt = aesEncrypt.Equals("yes", StringComparison.OrdinalIgnoreCase);
@@ -162,29 +162,32 @@ namespace MOKA_Factory_Tools
                 if (jObject["rokuCustomer"].ToString().Length > 0)
                 {
                     mid.rokuCustomer = GetRokuInfo(jObject["rokuCustomer"].ToString());
-                }
-                //如果服务器返回的是整机抄写订单，配置文件配置了1，提示整机抄写订单，不可用来抄写板卡              
-                //if (mid.isSmt == "0" && Main.Is_Smt == "1")
-                //{
-                //    MessageBox.Show("整机抄写订单，不可用来抄写板卡（配置文件IsSmt = 1）");
-                //    return false;
-                //}
-                mid.keytype = new Dictionary<string, string>();               
-                //根据配置文件选择要抄写的类型
-                if (Main.Is_Smt == "1")
-                {
-                    //板卡抄写
-                    foreach (var ss in jObject["obj_smt"])  //查找isSmt某个字段与值
+                }             
+                //如果订单是整机订单
+                mid.keytype = new Dictionary<string, string>();                   
+                if ( mid.isSmt.Equals("0") )
+                {// 整机;
+                    
+                    foreach (var ss in jObject["obj"])  //查找某个字段与值
                     {
                         mid.keytype.Add(ss["name"].Value<string>(), ss["type"].Value<string>());
                     }
-                }                            
+                }
                 else
-                {
-                    //整机抄写
-                    foreach (var ss in jObject["obj"])  //查找某个字段与值
+                {// 整机+板卡;
+                    if ( Main.Is_Smt == "1" )
                     {
-                        mid.keytype.Add(ss["name"].Value<string>(), ss["type"].Value<string>());
+                        foreach (var ss in jObject["obj_smt"])  //查找isSmt某个字段与值
+                        {
+                            mid.keytype.Add(ss["name"].Value<string>(), ss["type"].Value<string>());
+                        }
+                    }
+                    else
+                    {
+                        foreach (var ss in jObject["obj"])  //查找某个字段与值
+                        {
+                            mid.keytype.Add(ss["name"].Value<string>(), ss["type"].Value<string>());
+                        }
                     }
                 }
 
@@ -225,7 +228,8 @@ namespace MOKA_Factory_Tools
             watch.Start();
 
             item.URL = url + "/bind/order";        
-            item.Postdata = string.Format("{{\"orderNum\":\"{0}\",\"sn\":\"{1}\",\"psn\":\"{2}\",\"orderCode\":\"{3}\",\"clientType\":\"{4}\",\"isSmt\":\"{5}\",\"skipKey\":{6}}}", order, sn, psn, firetv_device_code, midList.clienttype,Main.Is_Smt , key2Write == null ? "[]" : JsonConvert.SerializeObject(key2Write).ToString());
+            item.Postdata = string.Format("{{\"orderNum\":\"{0}\",\"sn\":\"{1}\",\"psn\":\"{2}\",\"orderCode\":\"{3}\",\"clientType\":\"{4}\",\"isSmt\":\"{5}\",\"skipKey\":{6}}}", order, sn, psn, firetv_device_code, midList.clienttype,
+                midList.isSmt.Equals("0") ? "0" : Main.Is_Smt , key2Write == null ? "[]" : JsonConvert.SerializeObject(key2Write).ToString());
             HttpResult httpResult = http.GetHtml(item);
             if (httpResult.StatusCode == System.Net.HttpStatusCode.OK)
             {
@@ -530,9 +534,9 @@ namespace MOKA_Factory_Tools
                         }
                     }
                 }
-                catch
+                catch(Exception ex)
                 {
-                    msg = "解析Json失败";
+                    msg = ex.Message;
                 }
             }
 
@@ -602,17 +606,10 @@ namespace MOKA_Factory_Tools
                 AddJsonItem("sversionid", swVer, postJson);
                 AddJsonItem("projectid", pid, postJson);
 
-                //当配置文件中的isSmt=0  ---》整机抄写  ---》上报时增加smtpsn 字段
-                if(Main.Is_Smt == "0")
-                {
-                    //读取PSN               
-                    AddJsonItem("smtPsn",OperationPanel.smtPsn,postJson);
-                }
-                else
-                {
-                    AddJsonItem("smtPsn", sn, postJson);
-                }
-
+                //上报时增加smtpsn 字段              
+                //读取PSN               
+                AddJsonItem("smtPsn",OperationPanel.smtPsn,postJson);
+               
                 if (keyinfo != null)
                 {
                     AddKeyJson2(keyinfo.DID, postJson, "deviceid");

FactoryTool_CShare/Views/Main.cs

@@ -66,7 +66,21 @@ namespace MOKA_Factory_Tools
             LoadJsonConfig();
             this.StartPosition = FormStartPosition.Manual;
             this.Location = new Point(0, 0);
-            this.Text = CommonMethod.FactoryName + " " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            //增加整机抄写和板卡抄写文字提示，界面颜色随之修改
+            //根据配置文件，这个是整机抄写模式
+            if(functionSetting1.IsSmt == "0")
+            {
+                this.Text = CommonMethod.FactoryName + " " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()+"  " + "整机抄写";
+            }
+            else
+            {
+                this.Text = CommonMethod.FactoryName + " " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + "  " + "板卡抄写";
+                // 修改底色;
+                this.CaptionBackColorTop = Color.Red;
+                this.CaptionBackColorBottom = Color.Goldenrod;
+                this.BackColor = Color.AliceBlue;
+            }
+           
             if (!File.Exists(ErrorDBPath))
             {
                 if (SQLiteHelper.NewDbFile(ErrorDBPath))
@@ -91,13 +105,27 @@ namespace MOKA_Factory_Tools
             #region 研发账号
             if (CommonMethod.GetLoginAccout().Equals("RD", StringComparison.OrdinalIgnoreCase))
             {
-                // 修改标题;
-                this.Text = "研发抄写专用版";
+                if(functionSetting1.IsSmt == "0")
+                {
+                    // 修改标题;
+                    this.Text = "研发抄写专用版" + "  " +"整机抄写";
 
-                // 修改底色;
-                this.CaptionBackColorTop = Color.AntiqueWhite;
-                this.CaptionBackColorBottom = Color.Beige;
-                this.BackColor = Color.AliceBlue;
+                    // 修改底色;
+                    this.CaptionBackColorTop = Color.AntiqueWhite;
+                    this.CaptionBackColorBottom = Color.Beige;
+                    this.BackColor = Color.AliceBlue;
+                }
+                else
+                {
+                    // 修改标题;
+                    this.Text = "研发抄写专用版" + "  " + "板卡抄写";
+
+                    // 修改底色;
+                    this.CaptionBackColorTop = Color.Aqua;
+                    this.CaptionBackColorBottom = Color.Azure;
+                    this.BackColor = Color.AliceBlue;
+                }
+               
             }
             #endregion
         }

FactoryTool_CShare/Views/OperationPanel.cs

@@ -5096,21 +5096,19 @@ namespace MOKA_Factory_Tools
             }
             else
             {// 在线抄写;
-                if(FunctionSettingNow.IsSmt == "0")
+                
+                //读取PSN 并且上报
+                if (SerialCMD.ReadFireTVPSN(TVPort, out result, out data, out error, SerailDelay))
                 {
-                    //读取PSN 并且上报
-                    if (SerialCMD.ReadFireTVPSN(TVPort, out result, out data, out error, SerailDelay))
-                    {
-                        smtPsn = Encoding.ASCII.GetString(data);
-                    }
-                    else
-                    {
-                        ErrMsg = string.Format("读取PSN失败 {0}", error);
-                        Log.WriteErrorLog(ErrMsg);
-                        goto end;
-                    }
-
+                    smtPsn = Encoding.ASCII.GetString(data);
+                }
+                else
+                {
+                    ErrMsg = string.Format("读取PSN失败 {0}", error);
+                    Log.WriteErrorLog(ErrMsg);
+                    goto end;
                 }
+              
                 if (WriteDID.Checked)
                 {
                     string postjson = V2Method.GetReportJson(orderNow, SN, isNodid: false, midListNow.clienttype, midListNow.version, ProjectIDText.Text, ref keyInfo, FunctionSettingNow.MITVEnable || FunctionSettingNow.IndiaMITVEnable, ref _MiKey);