修改

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -147,54 +147,40 @@ namespace UAS_MES.Make
                             //如果两次输入的序列号相同进行提示，不相同则进行下一步
                             if (bsncode != sncode.Text)
                             {
-                                //勾选了修改转换结果
-                                if (ChangeResult.Checked)
+                                if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
                                 {
-                                    if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
+                                    string firstsn = "";
+                                    string updateSql = "";
+                                    //勾选了修改转换结果
+                                    if (ChangeResult.Checked)
                                     {
                                         //查询ms_firstsn
-                                        string firstsn = dh.getFieldDataByCondition("makeserial", "ms_firstsn", "ms_beforesn='" + bsncode + "'").ToString();
+                                        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(">>转换成功");
-                                        LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "序列转换", User.UserSourceCode, User.UserCode, "序列转换成功", out errorMessage);
-                                        //写入日志
-                                        LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                        OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
-                                        //置空
-                                        bsncode = "";
-                                        //更新数量
-                                        changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                        updateSql = "update makeserial set ms_sncode='" + sncode.Text + "' where ms_beforesn='" + bsncode + "'";
                                     }
+                                    //未勾选修改转换结果
                                     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();
+                                        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);
-                                        //写入日志
-                                        LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "序列转换", User.UserSourceCode, User.UserCode, "序列转换成功", out errorMessage);
-                                        LogManager.DoLog("修改序列号：" + bsncode + "为" + sncode.Text + "成功！" + "操作人：" + User.UserCode);
-                                        OperateResult.AppendText(">>请输入转换前的序列号\n", Color.Green);
-                                        //置空
-                                        bsncode = "";
-                                        //更新数量
-                                        changenum.Text = int.Parse(changenum.Text) + 1 + "";
+                                        updateSql = "update makeserial set ms_sncode='" + sncode.Text + "', ms_beforesn='" + bsncode + "' where ms_sncode='" + bsncode + "'";
                                     }
-                                    else
-                                        OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
+                                    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);
+                                    //写入日志
+                                    LogicHandler.UpdateMakeMessage(sncode.Text, ma_code.Text, "序列转换", User.UserSourceCode, User.UserCode, "序列转换成功", out errorMessage);
+                                    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
                             {