shim 8 years ago
parent
commit
1f235376d0

+ 4 - 2
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -139,6 +139,7 @@ namespace UAS_MES.Make
                                             //修改转换结果时,输入两次SN直接过站
                                             if (dh.CheckExist("MakeSerial", "ms_sncode='" + code.Text + "' and ms_id='" + oMsid + "' and ms_beforesn is not null"))
                                             {
+                                                step = 1;
                                                 TSN = code.Text;
                                                 //显示序列号
                                                 show_sncode.Text = TSN;
@@ -225,13 +226,14 @@ namespace UAS_MES.Make
                                     LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, code.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
                                     //记录日志
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakecode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", code.Text, "");
-                                    OperateResult.AppendText(">>转换成功\n", Color.Green);
+                                    OperateResult.AppendText(">>转换成功\n", Color.Green,code);
                                     onlyPass = false;
                                     ChangeResult.Enabled = true;
+                                    step = 0;
                                 }
                                 else
                                 {
-                                    OperateResult.AppendText(">>输入一致才可过站\n", Color.Red);
+                                    OperateResult.AppendText(">>输入一致才可过站\n", Color.Red,code);
                                 }
                                 return;
                             }

+ 3 - 2
UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -204,13 +204,14 @@ namespace UAS_MES.Make
                                     LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
                                     //记录日志
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
-                                    OperateResult.AppendText(">>转换成功\n", Color.Green);
+                                    OperateResult.AppendText(">>转换成功\n", Color.Green,sncode);
                                     flag = false;
                                     ChangeResult.Enabled = true;
+                                    bsncode = "";
                                 }
                                 else
                                 {
-                                    OperateResult.AppendText(">>输入一致才可过站\n", Color.Red);
+                                    OperateResult.AppendText(">>输入一致才可过站\n", Color.Red,sncode);
                                 }
                                 return;
                             }