机身标打印核对优化

UAS_MES_LGDZ/FunctionCode/Make/Make_FuselageLabelPrintCheck.cs

@@ -207,122 +207,124 @@ namespace UAS_MES_NEW.Make
                         string[] par = sncheck.Text.Split('#');
                         for (int i = 0; i < par.Length; i++)
                         {
-                            string name = par[i].Split('=')[0];
-                            string value = par[i].Split('=')[1];
-                            switch (name)
-                            {
-                                case "OIMEI1":
-                                    if (value == dt.Rows[0]["ms_imei1"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>IMEI1:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>IMEI1:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OIMEI2":
-                                    if (value == dt.Rows[0]["ms_imei2"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>IMEI2:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>IMEI2:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OID1":
-                                    if (value == dt.Rows[0]["ms_othid1"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oID1:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oID1:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OID2":
-                                    if (value == dt.Rows[0]["ms_othid2"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oID2:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oID2:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OID3":
-                                    if (value == dt.Rows[0]["ms_othid3"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oID3:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oID3:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OPSN":
-                                    if (value == dt.Rows[0]["ms_psn"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oPSN:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oPSN:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OWIFI":
-                                    if (value == dt.Rows[0]["ms_mac"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oWIFI:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oWIFI:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "OBT":
-                                    if (value == dt.Rows[0]["ms_bt"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oBT:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oBT:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "ONETCARD":
-                                    if (value == dt.Rows[0]["ms_netcard"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oNetCard:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oNetCard:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                case "ONETCODE":
-                                    if (value == dt.Rows[0]["ms_netcode"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>oNetCode:" + value + "核对成功\n", Color.Green);
-                                    }
-                                    else
-                                    {
-                                        OperateResult.AppendText(">>oNetCode:" + value + "核对失败\n", Color.Red);
-                                        return;
-                                    }
-                                    break;
-                                default:
-                                    break;
+                            if (par[i] != "") {
+                                string name = par[i].Split('=')[0];
+                                string value = par[i].Split('=')[1];
+                                switch (name)
+                                {
+                                    case "OIMEI1":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_imei1"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>IMEI1:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>IMEI1:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OIMEI2":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_imei2"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>IMEI2:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>IMEI2:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OID1":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_othid1"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oID1:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oID1:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OID2":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_othid2"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oID2:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oID2:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OID3":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_othid3"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oID3:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oID3:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OPSN":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_psn"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oPSN:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oPSN:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OWIFI":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_mac"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oWIFI:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oWIFI:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "OBT":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_bt"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oBT:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oBT:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "ONETCARD":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_netcard"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oNetCard:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oNetCard:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    case "ONETCODE":
+                                        if (value.ToUpper() == dt.Rows[0]["ms_netcode"].ToString().ToUpper())
+                                        {
+                                            OperateResult.AppendText(">>oNetCode:" + value + "核对成功\n", Color.Green);
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText(">>oNetCode:" + value + "核对失败\n", Color.Red);
+                                            return;
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
                             }
                         }
                         //所选标签不为空