修改支持MEID

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -167,7 +167,7 @@ namespace UAS_MES_NEW.Make
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' or ms_meid='" + sncode.Text + "' order by ms_id desc", "select");
+                        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");
                         if (dt.Rows.Count > 0)
                         {
                             sncode.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -129,7 +129,7 @@ namespace UAS_MES_NEW.Make
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' or ms_meid='" + sncode.Text + "' order by ms_id desc", "select");
+                        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");
                         if (dt.Rows.Count > 0)
                         {
                             sncode.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxWeigh_ReadLine.cs

@@ -129,7 +129,7 @@ namespace UAS_MES_NEW.Make
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' or ms_meid='"+ sncode.Text+"' order by ms_id desc", "select");
+                        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");
                         if (dt.Rows.Count > 0)
                         {
                             sncode.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -118,7 +118,7 @@ namespace UAS_MES_NEW.Make
                                 //序列号信息
                                 sql.Clear();
                                 sql.Append("select ms_beforesn,ms_sncode,ms_status,ms_makecode,ms_firstsn,ms_outboxcode,ms_nextmacode,ms_prodcode,ms_salecode,");
-                                sql.Append("MS_IMEI1,MS_MAC,MS_NETCODE,MS_MEID,ms_imei2,ms_imei3,ms_othid1,ms_othid2,ms_othid3");
+                                sql.Append("MS_IMEI1,MS_MAC,MS_NETCODE,ms_psn,ms_imei2,ms_imei3,ms_othid1,ms_othid2,ms_othid3");
                                 sql.Append(",MS_OTHCODE3,MS_OTHCODE2,MS_OTHCODE1,ms_bt from makeserial where ms_id='" + Msid + "'");
                                 DataTable SnInf = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 string ms_prodcode = SnInf.Rows[0]["ms_prodcode"].ToString();
@@ -206,7 +206,7 @@ namespace UAS_MES_NEW.Make
                                 if (ma_saveimei.Checked)
                                 {
                                     netcode = SnInf.Rows[0]["MS_NETCODE"].ToString();
-                                    imeid = SnInf.Rows[0]["MS_MEID"].ToString();
+                                    imeid = SnInf.Rows[0]["ms_psn"].ToString();
                                     imei1 = SnInf.Rows[0]["MS_IMEI1"].ToString();
                                     imei2 = SnInf.Rows[0]["ms_imei2"].ToString();
                                     imei3 = SnInf.Rows[0]["ms_imei3"].ToString();
@@ -242,7 +242,7 @@ namespace UAS_MES_NEW.Make
                                 sql.Append("insert into MakeSerial(ms_id,ms_code,ms_sncode,ms_prodcode,ms_indate,ms_wccode");
                                 sql.Append(",ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode,ms_linecode");
                                 sql.Append(",ms_sourcecode,ms_maid,ms_firstsn,ms_salecode,ms_mac,ms_bt,ms_othcode1,ms_othcode2,");
-                                sql.Append("ms_othcode3,ms_netcode,ms_imei1,ms_imei2,ms_imei3,ms_meid,ms_othid1,ms_othid2,ms_othid3)");
+                                sql.Append("ms_othcode3,ms_netcode,ms_imei1,ms_imei2,ms_imei3,ms_psn,ms_othid1,ms_othid2,ms_othid3)");
                                 sql.Append("values(MakeSerial_seq.nextval,'" + Sn + "','" + Sn + "','" + pr_code.Text + "',");
                                 sql.Append("sysdate,'" + workcenter + "','" + craftcode + "','" + craftname + "','" + User.CurrentStepCode + "',");
                                 sql.Append("'0','" + ma_code.Text + "','" + User.UserLineCode + "','" + User.UserSourceCode + "','" + ma_id.Text + "',");

UAS_MES_LGDZ/FunctionCode/Make/Make_ImeiCheck.cs

@@ -93,7 +93,7 @@ namespace UAS_MES_NEW.Make
                 }
                 else
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sncode.Text + "' or ms_meid='" + sncode.Text + "' order by ms_id desc", "select");
+                    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");
                     if (dt.Rows.Count > 0)
                     {
                         sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
@@ -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_meid='" + sncode.Text + "'");
+                            sql.Append("select max(ms_id) ms_id from makeserial where ms_imei2 ='" + sncode.Text + "'  or ms_psn='" + 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_meid='" + sncode.Text + "'");
+                            sql.Append("select max(ms_id) ms_id from makeserial where ms_imei2 ='" + sncode.Text + "'  or ms_psn='" + sncode.Text + "'");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                             {

UAS_MES_LGDZ/FunctionCode/Make/Make_Repair.cs

@@ -166,7 +166,7 @@ namespace UAS_MES_NEW.Make
                 }
                 else
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + GetSNCode.Text + "'  or ms_meid='"+ GetSNCode.Text+"'  order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + GetSNCode.Text + "'  or ms_psn='"+ GetSNCode.Text+"'  order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         GetSNCode.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh.cs

@@ -291,7 +291,7 @@ namespace UAS_MES_NEW.Packing
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_meid='"+sn_code.Text+"' order by ms_id desc", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_psn='"+sn_code.Text+"' order by ms_id desc", "select");
                         if (dt.Rows.Count > 0)
                         {
                             sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh_ReadLine.cs

@@ -289,7 +289,7 @@ namespace UAS_MES_NEW.Packing
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_meid='"+sn_code.Text+"'  order by ms_id desc", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_psn='"+sn_code.Text+"'  order by ms_id desc", "select");
                         if (dt.Rows.Count > 0)
                         {
                             sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh_ReadLine1.cs

@@ -291,7 +291,7 @@ namespace UAS_MES_NEW.Packing
                     }
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_meid='"+sn_code.Text+"'  order by ms_id desc", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_psn='"+sn_code.Text+"'  order by ms_id desc", "select");
                         if (dt.Rows.Count > 0)
                         {
                             sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();

UAS_MES_LGDZ/FunctionCode/Query/Query_ExeProgress.cs

@@ -71,7 +71,7 @@ namespace UAS_MES_NEW.Query
                 }
                 else
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_meid='" + sn_code.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' or ms_psn='" + sn_code.Text + "' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();