加岗位判断

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -67,76 +67,85 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
                     return;
                 }
-                //定义临时变量
-                string oMakeCode = "";
-                string oMsId = "";
-                //调用公共方法CheckStepSNAndMacode判断工序是否正确
-                if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
+                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out oErrorMessage))
                 {
-                    //IF (如果ma_code 为空)THEN
-                    if (ma_code.Text == "")
+                    //定义临时变量
+                    string oMakeCode = "";
+                    string oMsId = "";
+                    //调用公共方法CheckStepSNAndMacode判断工序是否正确
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out oErrorMessage))
                     {
-                        //获取工单的其他信息
-                        sql.Clear();
-                        sql.Append("select ma_code,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
-                        sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty 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 + "'");
-                        mapB = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                        //如果有数据的话
-                        if (mapB.Rows.Count > 0)
+                        //IF (如果ma_code 为空)THEN
+                        if (ma_code.Text == "")
                         {
-                            //将工单的其他信息赋值到对应的控件
-                            BaseUtil.SetFormValue(this.Controls, mapB);
-                            //提示用户“<<工单号：取ma_makecode”
-                            OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
-                            //提示用户“<< 序列号：XXXX”
-                            OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
-                        }
-                        //没有数据
-                        else
-                        {
-                            OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red);
-                        }
-
-                        //所选标签不为空
-                        if (PrintLabel.SelectedValue != null)
-                        {
-                            //按照打印张数打印
-                            Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
-                            //提示用户打印成功
-                            OperateResult.AppendText(">>打印成功\n", Color.Green);
-                            //更新打印的数据
-                            LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserName, "机身标打印成功", out oErrorMessage);
-                            //清空输入框的值，聚焦
-                            sncode.Text = "";
-                            sncode.Focus();
-                            //刷新打印数量和剩余数量
-                            mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
-                            mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+                            //获取工单的其他信息
+                            sql.Clear();
+                            sql.Append("select ma_code,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
+                            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty 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 + "'");
+                            mapB = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                            //如果有数据的话
+                            if (mapB.Rows.Count > 0)
+                            {
+                                //将工单的其他信息赋值到对应的控件
+                                BaseUtil.SetFormValue(this.Controls, mapB);
+                                //提示用户“<<工单号：取ma_makecode”
+                                OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Green);
+                                //提示用户“<< 序列号：XXXX”
+                                OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Green);
+                            }
+                            //没有数据
+                            else
+                            {
+                                OperateResult.AppendText(">>无序列号" + sncode.Text + "对应工单信息\n", Color.Red);
+                            }
 
-                            //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
-                            if (int.Parse(mcd_remainqty.Text) == 0)
+                            //所选标签不为空
+                            if (PrintLabel.SelectedValue != null)
                             {
-                                BaseUtil.CleanForm(this);
-                                OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
+                                //按照打印张数打印
+                                Print.CodeSoft(lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text));
+                                //提示用户打印成功
+                                OperateResult.AppendText(">>打印成功\n", Color.Green);
+                                //更新打印的数据
+                                LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "机身标打印", User.UserSourceCode, User.UserName, "机身标打印成功", out oErrorMessage);
+                                //清空输入框的值，聚焦
+                                sncode.Text = "";
+                                sncode.Focus();
+                                //刷新打印数量和剩余数量
+                                mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
+                                mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+
+                                //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
+                                if (int.Parse(mcd_remainqty.Text) == 0)
+                                {
+                                    BaseUtil.CleanForm(this);
+                                    OperateResult.AppendText(">>工单：" + ma_code.Text + "打印完成，>>请输入SN\n", Color.Green);
+                                }
+                                //剩余数量不为0
+                                else
+                                {
+                                    //提示用户“>>请输入SN”
+                                    OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                }
                             }
-                            //剩余数量不为0
+                            //标签为空
                             else
                             {
-                                //提示用户“>>请输入SN”
-                                OperateResult.AppendText(">>请输入SN\n", Color.Green);
+                                OperateResult.AppendText(">>无可用标签\n", Color.Red);
+                                sncode.Text = "";
                             }
                         }
-                        //标签为空
-                        else
-                        {
-                            OperateResult.AppendText(">>无可用标签\n", Color.Red);
-                        }
+                    }
+                    else
+                    {
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
+                        sncode.Text = "";
                     }
                 }
-                else
-                {
+                else {
                     OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
+                    sncode.Text = "";
                 }
             }
         }

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -62,109 +62,123 @@ namespace UAS_MES.Make
             {
                 if (code.Text != "")
                 {
-                    //为0，输入TSN
-                    if (step==0)
+                    if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out errorMessage))
                     {
-                        OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Green);
-                       
-                        string oMakecode = "";
-                        string oMsid = "";
-                        //核对工序
-                        if (LogicHandler.CheckStepSNAndMacode(ms_macode.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
+                        //为0，输入TSN
+                        if (step == 0)
                         {
-                            //核对TSN是否正确
-                            string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
-                            if (beforesn == "" || beforesn == null)
+                            OperateResult.AppendText(">>序列号：" + code.Text + " , 发送请求\n", Color.Green);
+
+                            string oMakecode = "";
+                            string oMsid = "";
+                            //核对工序
+                            if (LogicHandler.CheckStepSNAndMacode(ms_macode.Text, User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
                             {
-                                //按照out出的工单号查出工单相关信息，并赋值到相关控件
-                                sql.Clear();
-                                sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
-                                sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
-                                sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode and mcd_stepcode='" + User.CurrentStepCode + "'");
-                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
-                                if (dt.Rows.Count > 0)
+                                //核对TSN是否正确
+                                string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
+                                if (beforesn == "" || beforesn == null)
                                 {
-                                    BaseUtil.SetFormValue(this.Controls, dt);
-                                    //判断用户是否锁定输入TSN长度，
-                                    if (!checkLengthOrPre(TSNLength_checkBox, TSNLength, "长度"))
+                                    //按照out出的工单号查出工单相关信息，并赋值到相关控件
+                                    sql.Clear();
+                                    sql.Append("select ma_code as ms_macode,mcd_okqty,ma_qty,ma_qty-mcd_inqty as remain_qty,pr_detail,pr_code as ma_prodcode ");
+                                    sql.Append("from makeserial left join make on ms_makecode=ma_code left join product on ");
+                                    sql.Append("ms_prodcode=pr_code left join makecraftdetail on ms_makecode=mcd_macode where ms_sncode=:sncode and mcd_stepcode='" + User.CurrentStepCode + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text);
+                                    if (dt.Rows.Count > 0)
+                                    {
+                                        BaseUtil.SetFormValue(this.Controls, dt);
+                                        //判断用户是否锁定输入TSN长度，
+                                        if (!checkLengthOrPre(TSNLength_checkBox, TSNLength, "长度"))
+                                        {
+                                            return;
+                                        }
+                                        //判断用户是否锁定输入TSN前缀，
+                                        if (!checkLengthOrPre(TSNPre_checkBox, TSNPre, "前缀"))
+                                        {
+                                            return;
+                                        }
+                                    }
+                                    else
                                     {
+                                        OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red);
                                         return;
                                     }
-                                    //判断用户是否锁定输入TSN前缀，
-                                    if (!checkLengthOrPre(TSNPre_checkBox, TSNPre, "前缀"))
+                                    //获取需要关联采集的信息，以及校验规则
+                                    ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
+                                    //没有获取到就提示错误请维护产品对应的关联采集信息
+                                    if (ListA.Rows.Count == 0)
                                     {
+                                        OperateResult.AppendText(">>请维护产品对应的关联采集信息\n", Color.Red);
+                                        OperateResult.AppendText("<<请输入TSN\n", Color.Green);
                                         return;
                                     }
+                                    hs = new Hashtable();
+                                    step = 1;
+
+                                    //记录转换前的序列号
+                                    TSN = code.Text;
+                                    code.Text = "";
+                                    OperateResult.AppendText("<<请输入SN\n", Color.Green);
                                 }
                                 else
+                                //不为空，进行过转换。不勾选修改结果，就不能再修改
                                 {
-                                    OperateResult.AppendText(">>序列号" + code.Text + "不存在\n", Color.Red);
-                                    return;
-                                }
-                                //获取需要关联采集的信息，以及校验规则
-                                ListA = (DataTable)dh.ExecuteSql("select * from productsnrelation where psr_prodcode='" + ma_prodcode.Text + "' order by psr_detno", "select");
-                                //没有获取到就提示错误请维护产品对应的关联采集信息
-                                if (ListA.Rows.Count==0) {
-                                    OperateResult.AppendText(">>请维护产品对应的关联采集信息\n", Color.Red);
-                                    OperateResult.AppendText("<<请输入TSN\n", Color.Green);
-                                    return;
+                                    OperateResult.AppendText(">>序列号" + code.Text + "已进行了转换\n", Color.Red);
+                                    code.Text = "";
+                                    OperateResult.AppendText("<<请重新输入TSN\n", Color.Green);
                                 }
-                                hs = new Hashtable();
-                                step = 1;
-
-                                //记录转换前的序列号
-                                TSN = code.Text;
-                                code.Text = "";
-                                OperateResult.AppendText("<<请输入SN\n", Color.Green);
                             }
                             else
-                            //不为空，进行过转换。不勾选修改结果，就不能再修改
                             {
-                                OperateResult.AppendText(">>序列号" + code.Text + "已进行了转换\n", Color.Red);
+                                OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
                                 code.Text = "";
-                                OperateResult.AppendText("<<请重新输入TSN\n", Color.Green);
                             }
                         }
-                        else
+                        else if (step == 1)
                         {
-                            OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
-                        }
-                    }
-                    else if (step==1)
-                    {
-                        //开始录入SN
-                        if (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
-                        {
-                            //判断用户是否锁定输入SN长度，
-                            if (!checkLengthOrPre(SNLength_checkBox, SNLength, "长度"))
+                            //开始录入SN
+                            if (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "'"))
                             {
-                                return;
+                                //判断用户是否锁定输入SN长度，
+                                if (!checkLengthOrPre(SNLength_checkBox, SNLength, "长度"))
+                                {
+                                    return;
+                                }
+                                //判断用户是否锁定输入SN前缀，
+                                if (!checkLengthOrPre(SNPre_checkBox, SNPre, "前缀"))
+                                {
+                                    return;
+                                }
+                                //SN校验成功，合法,记录下SN
+                                SN = code.Text;
+                                code.Text = "";
+                                //开始进行校验规则
+                                if (ListA.Rows.Count > 0)
+                                {
+                                    OperateResult.AppendText("<<请输入" + ListA.Rows[0]["psr_type"] + "\n", Color.Green);
+                                }
+                                //step+1
+                                step = 2;
                             }
-                            //判断用户是否锁定输入SN前缀，
-                            if (!checkLengthOrPre(SNPre_checkBox, SNPre, "前缀"))
+                            else
                             {
-                                return;
-                            }
-                            //SN校验成功，合法,记录下SN
-                            SN = code.Text;
-                            //开始进行校验规则
-                            if (ListA.Rows.Count>0) {
-                                OperateResult.AppendText("<<请输入" + ListA.Rows[0]["psr_type"] + "\n", Color.Green);
+                                OperateResult.AppendText(">>序列号" + code.Text + "已存在，请输入SN\n", Color.Red);
+                                code.Text = "";
                             }
-                            //step+1
-                            step = 2;
                         }
-                        else
+                        else if (step < ListA.Rows.Count + 2)
                         {
-                            OperateResult.AppendText(">>序列号" + code.Text + "已存在，请输入其他序列号\n", Color.Red);
+                            //开始进行校验规则
+                            if (checkRules(step))
+                            {
+                                step += 1;
+                            }
                         }
                     }
-                    else if(step < ListA.Rows.Count + 2)
+                    else
                     {
-                        //开始进行校验规则
-                        if (checkRules(step)) {
-                            step += 1;
-                        }
+                        OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                        code.Text = "";
                     }
                 }
                 else {
@@ -227,6 +241,8 @@ namespace UAS_MES.Make
                     case "IMEI3":
                         if (checkExist("ms_imei1='" + code.Text + "' or ms_imei2 = '" + code.Text + "' or ms_imei3 = '" + code.Text + "'"))
                         {
+                            OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
+                            code.Text = "";
                             return false;
                         }
                         else
@@ -245,6 +261,8 @@ namespace UAS_MES.Make
                     case "MAC":
                     case "NETCODE":
                         if (checkExist("MS_"+type+"='"+code.Text+"'")) {
+                            OperateResult.AppendText(">>" + type + ":" + code.Text + "错误，不允许重复\n", Color.Red);
+                            code.Text = "";
                             return false;
                         }
                         break;
@@ -322,19 +340,23 @@ namespace UAS_MES.Make
                     else
                     {
                         OperateResult.AppendText(">>序列号" + SN + "已存在，请重新输入TSN\n", Color.Red);
+                        code.Text = "";
                         //清空信息
                         clearInfo();
                     }
+                    code.Text = "";
                     return false;
                 }
                 else {
                     OperateResult.AppendText("<<请输入"+ ListA.Rows[step-1]["psr_type"] + "\n", Color.Green);
+                    code.Text = "";
                     return true;
                 }
             }
             else {
                 //重新输入
                 OperateResult.AppendText(">>" + ListA.Rows[step-2]["psr_type"] + "校验不通过,请重新输入\n", Color.Red);
+                code.Text = "";
                 return false;
             }
         }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -50,145 +50,151 @@ namespace UAS_MES.Make
             {
                 if (sncode.Text != "")
                 {
-                    OperateResult.AppendText(">>序列号：" + sncode.Text + " , 发送请求\n", Color.Green);
-                    //如果用户没有输入工单号自行去后台查询
-                    string macode;
-                    //如果用户填写了工单号 
-                    if (ma_code.Text != "")
+                    if (LogicHandler.CheckStepAttribute(Tag.ToString(),User.UserSourceCode,out errorMessage))
                     {
-                        macode = ma_code.Text;
-
-                        //通过工单序列号关系验证
-                        string ErrorMessage = "";
-                        bool ifFirst;
-                        //bsncode为空，就说明是输入转换之前的序列号
-                        if (bsncode == "")
+                        OperateResult.AppendText(">>序列号：" + sncode.Text + " , 发送请求\n", Color.Green);
+                        //如果用户没有输入工单号自行去后台查询
+                        string macode;
+                        //如果用户填写了工单号 
+                        if (ma_code.Text != "")
                         {
-                            //定义传入方法的变量
-                            string oMakeCode = "";
-                            string oMsId = "";
-                            //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
-                            if (LogicHandler.CheckStepSNAndMacode(macode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
+                            macode = ma_code.Text;
+                            //通过工单序列号关系验证
+                            //bsncode为空，就说明是输入转换之前的序列号
+                            if (bsncode == "")
+                            {
+                                //定义传入方法的变量
+                                string oMakeCode = "";
+                                string oMsId = "";
+                                //用户填写了工单号，那么序列号必须要是该工单的，否则提示错误
+                                if (LogicHandler.CheckStepSNAndMacode(macode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsId, out errorMessage))
+                                {
+                                    //判断用户是否锁定输入转换前序列号长度，
+                                    if (!checkLengthOrPre(beforeTransSNLength_checkBox, beforeTransSNLength, "长度"))
+                                        return;
+                                    //判断用户是否锁定输入转换前序列号前缀，
+                                    if (!checkLengthOrPre(beforeTransSNPre_checkBox, beforeTransSNPre, "前缀"))
+                                        return;
+                                    switch (ChangeResult.CheckState)
+                                    {
+                                        //勾选是修改已转换的序列，矫正修改错了的序列号
+                                        case CheckState.Checked:
+                                            if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "'"))
+                                            {
+                                                bsncode = sncode.Text;
+                                                sncode.Text = "";
+                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText(">>不存在该已转序列号\n" + sncode.Text + "\n");
+                                                sncode.Text = "";
+                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                                            }
+                                            break;
+                                        case CheckState.Unchecked:
+
+                                            string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
+                                            //为空，就说明，没有进行过序列号的转换
+                                            if (beforesn == "" || beforesn == null)
+                                            {
+                                                //记录转换前的序列号
+                                                bsncode = sncode.Text;
+                                                sncode.Text = "";
+                                                OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
+                                            }
+                                            else
+                                            //不为空，进行过转换。不勾选修改结果，就不能再修改
+                                            {
+                                                OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
+                                                sncode.Text = "";
+                                                OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
+                                            }
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                }
+                                else {
+                                    OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                                    sncode.Text = "";
+                                }
+                            }
+                            //bsncode不为空,说明输入的是转换后的序列号
+                            else
                             {
-                                //判断用户是否锁定输入转换前序列号长度，
-                                if (!checkLengthOrPre(beforeTransSNLength_checkBox, beforeTransSNLength, "长度"))
+                                //判断用户是否锁定输入转换后序列号长度，
+                                if (!checkLengthOrPre(afterTransSNLength_checkBox, afterTransSNLength, "长度"))
                                     return;
-                                //判断用户是否锁定输入转换前序列号前缀，
-                                if (!checkLengthOrPre(beforeTransSNPre_checkBox, beforeTransSNPre, "前缀"))
+                                //判断用户是否锁定输入转换后序列号前缀，
+                                if (!checkLengthOrPre(afterTransSNPre_checkBox, afterTransSNPre, "前缀"))
                                     return;
-                                switch (ChangeResult.CheckState)
+                                //如果两次输入的序列号相同进行提示，不相同则进行下一步
+                                if (bsncode != sncode.Text)
                                 {
-                                    //勾选是修改已转换的序列，矫正修改错了的序列号
-                                    case CheckState.Checked:
-                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "'"))
+                                    //勾选了修改转换结果
+                                    if (ChangeResult.Checked)
+                                    {
+                                        if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
                                         {
-                                            bsncode = sncode.Text;
-                                            sncode.Text = "";
-                                            OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
+                                            //查询ms_firstsn
+                                            string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "'").ToString();
+                                            //记录本次修改，存入makesnrelation表中
+                                            string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "'";
+                                            string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
+                                            dh.ExecuteSQLTran(updateSql, insertSql);
+                                            OperateResult.AppendText(">>转换成功");
+                                            //写入日志
+                                            LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
+                                            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
+                                            //置空
+                                            bsncode = "";
+                                            //更新数量
+                                            changenum.Text = int.Parse(changenum.Text) + 1 + "";
                                         }
                                         else
+                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                    }
+                                    //未勾选修改转换结果
+                                    else
+                                    {
+                                        if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
                                         {
-                                            OperateResult.AppendText(">>不存在该已转序列号\n" + sncode.Text + "\n");
-                                            sncode.Text = "";
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
-                                        }
-                                        break;
-                                    case CheckState.Unchecked:
-
-                                        string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
-                                        //为空，就说明，没有进行过序列号的转换
-                                        if (beforesn == "" || beforesn == null)
-                                        {
-                                            //记录转换前的序列号
-                                            bsncode = sncode.Text;
-                                            sncode.Text = "";
-                                            OperateResult.AppendText("<<请输入转换后的序列号\n", Color.Green);
+                                            //查询ms_firstsn
+                                            string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + bsncode + "'").ToString();
+                                            //记录本次修改，存入makesnrelation表中
+                                            string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "'";
+                                            string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
+                                            dh.ExecuteSQLTran(updateSql, insertSql);
+                                            OperateResult.AppendText(">>转换成功\n", Color.Green);
+                                            //写入日志
+                                            LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
+                                            OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
+                                            //置空
+                                            bsncode = "";
+                                            //更新数量
+                                            changenum.Text = int.Parse(changenum.Text) + 1 + "";
                                         }
                                         else
-                                        //不为空，进行过转换。不勾选修改结果，就不能再修改
-                                        {
-                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
-                                            sncode.Text = "";
-                                            OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
-                                        }
-                                        break;
-                                    default:
-                                        break;
+                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                    }
                                 }
+                                else
+                                    OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
                             }
-                            else
-                                OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
                         }
-                        //bsncode不为空,说明输入的是转换后的序列号
                         else
                         {
-                            //判断用户是否锁定输入转换后序列号长度，
-                            if (!checkLengthOrPre(afterTransSNLength_checkBox, afterTransSNLength, "长度"))
-                                return;
-                            //判断用户是否锁定输入转换后序列号前缀，
-                            if (!checkLengthOrPre(afterTransSNPre_checkBox, afterTransSNPre, "前缀"))
-                                return;
-                            //如果两次输入的序列号相同进行提示，不相同则进行下一步
-                            if (bsncode != sncode.Text)
+                            macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "' or ms_beforesn='" + sncode.Text + "'").ToString();
+                            if (macode == "")
                             {
-                                //勾选了修改转换结果
-                                if (ChangeResult.Checked)
-                                {
-                                    if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
-                                    {
-                                        //查询ms_firstsn
-                                        string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "'").ToString();
-                                        //记录本次修改，存入makesnrelation表中
-                                        string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "'";
-                                        string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
-                                        dh.ExecuteSQLTran(updateSql, insertSql);
-                                        OperateResult.AppendText(">>转换成功");
-                                        //写入日志
-                                        LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                        OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
-                                        //置空
-                                        bsncode = "";
-                                        //更新数量
-                                        changenum.Text = int.Parse(changenum.Text) + 1 + "";
-                                    }
-                                    else
-                                        OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
-                                }
-                                //未勾选修改转换结果
-                                else
-                                {
-                                    if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
-                                    {
-                                        //查询ms_firstsn
-                                        string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_sncode='" + bsncode + "'").ToString();
-                                        //记录本次修改，存入makesnrelation表中
-                                        string updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "'";
-                                        string insertSql = "insert into  makesnrelation (BEFORESN,SN,FIRSTSN,MAKECODE,msr_indate, msr_inman)values('" + bsncode + "','" + sncode.Text + "','" + firstsn + "','" + ma_code.Text + "', sysdate ,'" + User.UserCode + "')";
-                                        dh.ExecuteSQLTran(updateSql, insertSql);
-                                        OperateResult.AppendText(">>转换成功\n", Color.Green);
-                                        //写入日志
-                                        LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                        OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
-                                        //置空
-                                        bsncode = "";
-                                        //更新数量
-                                        changenum.Text = int.Parse(changenum.Text) + 1 + "";
-                                    }
-                                    else
-                                        OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
-                                }
+                                OperateResult.AppendText(">>无该序列号对应工单！\n", Color.Red);
                             }
-                            else
-                                OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
                         }
                     }
-                    else
-                    {
-                        macode = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + sncode.Text + "' or ms_beforesn='" + sncode.Text + "'").ToString();
-                        if (macode == "")
-                        {
-                            OperateResult.AppendText(">>无该序列号对应工单！\n", Color.Red);
-                        }
+                    else {
+                        OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red);
+                        sncode.Text = "";
                     }
                 }
                 else