中兴四码核对逻辑修改

UAS_MES_HYSX/FunctionCode/Make/Make_ImeiCheck_FourLabel.cs

@@ -135,7 +135,7 @@ namespace UAS_MES_NEW.Make
                     imei1 = sncode.Text;
                     if (imei1.Contains(checksn))
                     {
-                        OperateResult.AppendText("<<条码1核对成功\n", Color.Green, sncode);
+                        OperateResult.AppendText("<<条码1"+ sncode.Text + "核对成功\n", Color.Green, sncode);
                         OperateResult.AppendText(">>请输入需要核对的条码2\n", Color.Black);
                         isImei2 = true;
                         isImei1 = false;
@@ -162,10 +162,16 @@ namespace UAS_MES_NEW.Make
                 else if (isImei2)
                 {
                     OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
-                    imei1 = sncode.Text;
-                    if (imei1.Contains(checksn))
+                    sql.Clear();
+                    sql.Append("select ZD_SN from  ZTEDATA  where ZD_DEV_EN_NO='" + sncode.Text + "' and zd_makecode='" + ma_code.Text + "' order by zd_id desc");
+                    info = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (info.Rows.Count > 0)
+                    {
+                        imei1 = info.Rows[0]["ZD_SN"].ToString();
+                    }
+                    if (imei1==checksn)
                     {
-                        OperateResult.AppendText("<<条码2核对成功\n", Color.Green, sncode);
+                        OperateResult.AppendText("<<条码2"+ sncode.Text + "核对成功\n", Color.Green, sncode);
                         OperateResult.AppendText(">>请输入需要核对的条码3\n", Color.Black);
                         isImei2 = false;
                         isImei1 = false;
@@ -241,7 +247,7 @@ namespace UAS_MES_NEW.Make
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "标签核对成功", SN, "");
                                     //SN核对成功
                                     //>> 请输入SN
-                                    OperateResult.AppendText("<<条码2核对成功\n", Color.Green, sncode);
+                                    OperateResult.AppendText("<<条码3"+ sncode.Text + "核对成功\n", Color.Green, sncode);
                                     OperateResult.AppendText(">>请输入SN\n", Color.Black);
                                 }
                                 else