序列号转号功能修改

UAS_MES_YDCY/FunctionCode/Make/Make_GetTestFileData.cs

@@ -126,38 +126,38 @@ namespace UAS_MES_NEW.Make
                         }
                         if (Result)
                         {
-                            if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
-                            {
-                                //提示正确返回时传递的信息
-                                if (oErrorMessage.Contains("AFTERSUCCESS"))
-                                    OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                                //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
-                                sql.Clear();
-                                sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
-                                sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
-                                sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
-                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                BaseUtil.SetFormValue(Controls, dt);
-                                //将SN,时间，结果记录在页面
-                                //记录日志
-                                //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
-                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
-                                //SN核对成功
-                                //>> 请输入SN
-                                OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN.Text + "\n", Color.Green, sncode);
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                                SetCheck set = new SetCheck("OK", Color.Green);
-                                BaseUtil.SetFormCenter(set);
-                                set.ShowDialog();
-                                if (ReSet.Checked)
-                                {
-                                    BaseUtil.GetDataFromDevice("RESET");
-                                }
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                            }
+                            //if (LogicHandler.snChangeAndBurn(sncode.Text, PSN.Text, User.UserSourceCode, User.UserCode, omakeCode, 0, IMEI1.Text, IMEI2.Text, "", "", "", "", "", "", "", MAC.Text, BT.Text, "", "", "", out oErrorMessage))
+                            //{
+                            //    //提示正确返回时传递的信息
+                            //    if (oErrorMessage.Contains("AFTERSUCCESS"))
+                            //        OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                            //    //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
+                            //    sql.Clear();
+                            //    sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail,");
+                            //    sql.Append("ma_qty - nvl(mcd_okqty, 0) remain_qty from make left join makecraftdetail on ");
+                            //    sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + omakeCode + "'  and mcd_stepcode='" + User.CurrentStepCode + "'");
+                            //    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            //    BaseUtil.SetFormValue(Controls, dt);
+                            //    //将SN,时间，结果记录在页面
+                            //    //记录日志
+                            //    //ftp.UpLoadFile(Application.StartupPath, sncode.Text + ".csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
+                            //    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
+                            //    //SN核对成功
+                            //    //>> 请输入SN
+                            //    OperateResult.AppendText("<<" + sncode.Text + "信息核对成功,转换SN" + PSN.Text + "\n", Color.Green, sncode);
+                            //    OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                            //    SetCheck set = new SetCheck("OK", Color.Green);
+                            //    BaseUtil.SetFormCenter(set);
+                            //    set.ShowDialog();
+                            //    if (ReSet.Checked)
+                            //    {
+                            //        BaseUtil.GetDataFromDevice("RESET");
+                            //    }
+                            //}
+                            //else
+                            //{
+                            //    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                            //}
                             //if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, sncode.Text, "", "OK", User.UserCode, out oErrorMessage))
                             //{
                             //    //提示正确返回时传递的信息

UAS_MES_YDCY/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -551,6 +551,76 @@ namespace UAS_MES_NEW.Make
                         }
                     }
                     break;
+                case "NETCARD":
+                    //验证是否MAC和BT重复
+                    if (hs.ContainsValue(imeif))
+                    {
+                        foreach (DictionaryEntry de in hs)
+                        {
+                            //拿到重复的项
+                            if (de.Value.ToString() == imeif)
+                            {
+                                OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误," + de.Key + "已录\n", Color.Red);
+                                OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                                return false;
+                            }
+                        }
+                    }
+                    //校验网卡是否存在
+                    teSn = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_" + type + "='" + imeif + "' and  ms_status in (0,1,2,3) and ms_id <> '" + oMsid + "' and nvl(ms_nextmacode,' ')=' '").ToString();
+                    if (teSn != "")
+                    {
+                        OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误，已被序列号" + teSn + "使用\n", Color.Red);
+                        OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                        return false;
+                    }
+                    else
+                    {
+                        //校验在sninfo表中是否存在
+                        teSn = dh.getFieldDataByCondition("sninfo", "si_sn", "si_" + type + "='" + imeif + "' and si_id <>'" + siid + "'").ToString();
+                        if (teSn != "")
+                        {
+                            OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误，已被序列号" + teSn + "使用\n", Color.Red);
+                            OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                            return false;
+                        }
+                    }
+                    break;
+                case "NETCARD2":
+                    //验证是否MAC和BT重复
+                    if (hs.ContainsValue(imeif))
+                    {
+                        foreach (DictionaryEntry de in hs)
+                        {
+                            //拿到重复的项
+                            if (de.Value.ToString() == imeif)
+                            {
+                                OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误," + de.Key + "已录\n", Color.Red);
+                                OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                                return false;
+                            }
+                        }
+                    }
+                    //校验网卡2是否存在
+                    teSn = dh.getFieldDataByCondition("makeserial", "ms_sncode", "MS_" + type + "='" + imeif + "' and  ms_status in (0,1,2,3) and ms_id <> '" + oMsid + "' and nvl(ms_nextmacode,' ')=' '").ToString();
+                    if (teSn != "")
+                    {
+                        OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误，已被序列号" + teSn + "使用\n", Color.Red);
+                        OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                        return false;
+                    }
+                    else
+                    {
+                        //校验在sninfo表中是否存在
+                        teSn = dh.getFieldDataByCondition("sninfo", "si_sn", "si_" + type + "='" + imeif + "' and si_id <>'" + siid + "'").ToString();
+                        if (teSn != "")
+                        {
+                            OperateResult.AppendText("<<" + ListA.Rows[step - 2]["psr_type"].ToString() + ":" + imeif + "错误，已被序列号" + teSn + "使用\n", Color.Red);
+                            OperateResult.AppendText(">>请输入" + ListA.Rows[step - 2]["psr_type"].ToString() + "\n", Color.Black, code);
+                            return false;
+                        }
+                    }
+                    break;
             }
             if (step == ListA.Rows.Count + 1)
             {
@@ -650,7 +720,7 @@ namespace UAS_MES_NEW.Make
         //通过存储过程二次校验
         private Boolean SetStepResult()
         {
-            if (LogicHandler.snChangeAndBurn(TSN, SN, User.UserSourceCode, User.UserCode, ms_macode.Text, ChangeResult.Checked ? 1 : 0, (hs.ContainsKey("IMEI1") ? hs["IMEI1"].ToString() : ""), (hs.ContainsKey("IMEI2") ? hs["IMEI2"].ToString() : ""), (hs.ContainsKey("IMEI3") ? hs["IMEI3"].ToString() : ""), "", (hs.ContainsKey("NETCODE") ? hs["NETCODE"].ToString() : ""), "", "", "", "", (hs.ContainsKey("MAC") ? hs["MAC"].ToString() : ""), (hs.ContainsKey("BT") ? hs["BT"].ToString() : ""), "", "", "", out errorMessage))
+            if (LogicHandler.snChangeAndBurn(TSN, SN, User.UserSourceCode, User.UserCode, ms_macode.Text, ChangeResult.Checked ? 1 : 0, (hs.ContainsKey("IMEI1") ? hs["IMEI1"].ToString() : ""), (hs.ContainsKey("IMEI2") ? hs["IMEI2"].ToString() : ""), (hs.ContainsKey("IMEI3") ? hs["IMEI3"].ToString() : ""), "", (hs.ContainsKey("NETCODE") ? hs["NETCODE"].ToString() : ""), "", "", "", "", (hs.ContainsKey("MAC") ? hs["MAC"].ToString() : ""), (hs.ContainsKey("BT") ? hs["BT"].ToString() : ""), "", "", "", (hs.ContainsKey("NETCARD") ? hs["NETCARD"].ToString() : ""), (hs.ContainsKey("NETCARD2") ? hs["NETCARD2"].ToString() : ""), out errorMessage))
             {
                 OperateResult.AppendText("<<序列号" + TSN + "成功转换为" + SN + "\n<<关联采集成功\n", Color.Green);
                 //写入日志