Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_LabelCheck.Designer.cs

@@ -181,6 +181,7 @@
             // 
             // OperateResult
             // 
+            this.OperateResult.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(45, 176);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(602, 383);
@@ -205,6 +206,7 @@
             this.columnHeader2,
             this.columnHeader3,
             this.columnHeader4});
+            this.showResult.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.showResult.Location = new System.Drawing.Point(708, 176);
             this.showResult.Name = "showResult";
             this.showResult.Size = new System.Drawing.Size(585, 383);

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -86,8 +86,8 @@ namespace UAS_MES.Make
                                 if (LogicHandler.CheckStepSNAndMacode(makecode == ms_macode.Text ? makecode : "", User.UserSourceCode, code.Text, User.UserCode, out oMakecode, out oMsid, out errorMessage))
                                 {
                                     //核对TSN是否正确
-                                    string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
-                                    if (beforesn == "" || beforesn == null)
+                                    //string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + code.Text + "'").ToString().Trim();
+                                    if (dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "'"))
                                     {
                                         //按照out出的工单号查出工单相关信息，并赋值到相关控件
                                         sql.Clear();

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -93,7 +93,7 @@ namespace UAS_MES.Make
                                 {
                                     //勾选是修改已转换的序列，矫正修改错了的序列号
                                     case CheckState.Checked:
-                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "'"))
+                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "' and ms_id='"+oMsId+"' and ms_stepcode='"+User.CurrentStepCode+"'"))
                                         {
                                             bsncode = sncode.Text;
                                             sncode.Text = "";
@@ -108,9 +108,9 @@ namespace UAS_MES.Make
                                         break;
                                     case CheckState.Unchecked:
 
-                                        string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
+                                        //string beforesn = dh.getFieldDataByCondition("makeserial", "ms_beforesn", "ms_sncode='" + sncode.Text + "'").ToString().Trim();
                                         //为空，就说明，没有进行过序列号的转换
-                                        if (beforesn == "" || beforesn == null)
+                                        if (dh.CheckExist("makeserial","ms_sncode='"+sncode.Text+"' and ms_id='"+oMsId+"'"))
                                         {
                                             //记录转换前的序列号
                                             bsncode = sncode.Text;
@@ -120,7 +120,7 @@ namespace UAS_MES.Make
                                         else
                                         //不为空，进行过转换。不勾选修改结果，就不能再修改
                                         {
-                                            OperateResult.AppendText(">>序列号" + sncode.Text + "已进行了转换\n", Color.Red);
+                                            OperateResult.AppendText(">>序列号" + sncode.Text + "错误\n", Color.Red);
                                             sncode.Text = "";
                                             OperateResult.AppendText("<<请重新输入序列号\n", Color.Green);
                                         }
@@ -147,55 +147,46 @@ 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(">>转换成功");
-                                        //写入日志
-                                        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);
-                                        //写入日志
-                                        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
+                            {
                                 OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
+                            }
+                            sncode.Text = "";
                         }
                     }
                     else