号段核对功能添加

UAS_MES_JH/FunctionCode/Make/Make_ImeiCheck.cs

@@ -87,35 +87,35 @@ namespace UAS_MES_NEW.Make
                     {
                         //根据该ms_id查询ms_imei1,ms_makecode信息
                         sql.Clear();
-                        sql.Append("select ms_imei1 from  makeserial  where ms_id='" + dt.Rows[0]["ms_id"].ToString() + "'");
+                        sql.Append("select ms_sncode from  makeserial  where ms_id='" + dt.Rows[0]["ms_id"].ToString() + "'");
                         info = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (info.Rows.Count > 0)
                         {
                             //不为null 并且不为””才继续
-                            if (info.Rows[0]["ms_imei1"].ToString() == null || info.Rows[0]["ms_imei1"].ToString() == "")
+                            if (info.Rows[0]["ms_sncode"].ToString() == null || info.Rows[0]["ms_sncode"].ToString() == "")
                             {
-                                // SN对应的IMEI不存在
+                                // SN对应的SN不存在
                                 //>> 请输入SN
-                                OperateResult.AppendText("<<序列号" + sncode.Text + "对应的IMEI不存在\n", Color.Red, sncode);
+                                OperateResult.AppendText("<<序列号" + sncode.Text + "对应的SN不存在\n", Color.Red, sncode);
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
                             }
                             else
                             //存在该imei信息
                             {
                                 //用变量记录imei1和makecode
-                                imei1 = info.Rows[0]["ms_imei1"].ToString();
+                                imei1 = info.Rows[0]["ms_sncode"].ToString();
                                 SN = sncode.Text;
-                                //>>SN对应的IMEI号为:xxxxxxxxx
-                                //>> 请输入彩盒上的IMEI
-                                OperateResult.AppendText("<<序列号" + sncode.Text + "对应的IMEI号为:" + imei1 + "\n", Color.Green);
-                                OperateResult.AppendText(">>请输入彩盒上的IMEI\n", Color.Black, sncode);
+                                //>>SN对应的SN号为:xxxxxxxxx
+                                //>> 请输入彩盒上的SN
+                                OperateResult.AppendText("<<序列号" + sncode.Text + "对应的SN号为:" + imei1 + "\n", Color.Green);
+                                OperateResult.AppendText(">>请输入彩盒上的SN\n", Color.Black, sncode);
                                 //设定要输入imei1
                                 isImei1 = true;
                             }
                         }
                         else
                         {
-                            OperateResult.AppendText("<<SN:" + sncode.Text + "对应的IMEI不存在\n", Color.Red, sncode);
+                            OperateResult.AppendText("<<SN:" + sncode.Text + "对应的SN不存在\n", Color.Red, sncode);
                             OperateResult.AppendText(">>请输入SN\n", Color.Black);
                         }
                     }
@@ -150,9 +150,9 @@ namespace UAS_MES_NEW.Make
                                     recordResult(SN, DateTime.Now.ToString(), "成功");
                                     //记录日志
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "标签核对成功", SN, "");
-                                    //IMEI核对成功
+                                    //SN核对成功
                                     //>> 请输入SN
-                                    OperateResult.AppendText("<<IMEI核对成功\n", Color.Green, sncode);
+                                    OperateResult.AppendText("<<SN核对成功\n", Color.Green, sncode);
                                     OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 }
                                 else
@@ -181,9 +181,9 @@ namespace UAS_MES_NEW.Make
                     {
                         //清空imei1变量的值
                         imei1 = "";
-                        //IMEI核对失败
+                        //SN核对失败
                         //>> 请输入SN
-                        OperateResult.AppendText(">>IMEI核对失败,不一致\n", Color.Red, sncode);
+                        OperateResult.AppendText(">>SN核对失败,不一致\n", Color.Red, sncode);
                         OperateResult.AppendText(">>请输入SN\n", Color.Black);
                     }
                     //imei1校对结束，下次输入的是SN