IMEI核对修改

UAS_MES_LGDZ/FunctionCode/Make/Make_ImeiCheck.cs

@@ -86,14 +86,14 @@ namespace UAS_MES_NEW.Make
                     OperateResult.AppendText("<<输入不能为空\n", Color.DarkRed);
                     return;
                 }
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_code='" + sncode.Text + "' or  ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
+                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_sncode='" + sncode.Text + "' or  ms_imei1='" + sncode.Text + "' order by ms_id desc", "select");
                 if (dt.Rows.Count > 0)
                 {
                     sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
                 }
                 else
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' or ms_psn='" + sncode.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "'  order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
@@ -115,10 +115,10 @@ namespace UAS_MES_NEW.Make
                         }
                     }
                 }
-                if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
-                {
+                //if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
+                //{
 
-                }
+                //}
                 //输入的是SN
                 if (!isImei1)
                 {
@@ -134,7 +134,7 @@ namespace UAS_MES_NEW.Make
                         if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                         {
                             sql.Clear();
-                            sql.Append("select max(ms_id) ms_id from makeserial where ms_imei2 ='" + sncode.Text + "'  or ms_psn='" + sncode.Text + "'");
+                            sql.Append("select max(ms_id) ms_id from makeserial where ms_imei2 ='" + sncode.Text + "'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                             {
@@ -185,7 +185,7 @@ namespace UAS_MES_NEW.Make
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
                     sql.Clear();
-                    sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "' or ms_code='" + sncode.Text + "'");
+                    sql.Append("select max(ms_id) ms_id from makeserial where ms_sncode ='" + sncode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                     {
@@ -195,7 +195,7 @@ namespace UAS_MES_NEW.Make
                         if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                         {
                             sql.Clear();
-                            sql.Append("select max(ms_id) ms_id from makeserial where ms_imei2 ='" + sncode.Text + "'  or ms_psn='" + sncode.Text + "'");
+                            sql.Append("select max(ms_id) ms_id from makeserial where ms_imei2 ='" + sncode.Text + "'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                             {