Browse Source

提示调整

shim 8 years ago
parent
commit
fa6f6a6e39

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

@@ -274,12 +274,18 @@ namespace UAS_MES.Make
                                 if (TSN == code.Text)
                                 {
                                     //写入日志
-                                    LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, code.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
+                                    if (LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, code.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage))
+                                    {
+                                        //记录日志
+                                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", code.Text, "");
+                                        OperateResult.AppendText(">>转换成功\n", Color.Green, code);
+                                    }
+                                    else
+                                    {
+                                        OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red, code);
+                                    }
                                     if (errorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + errorMessage + "\n");
-                                    //记录日志
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_macode.Text, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", code.Text, "");
-                                    OperateResult.AppendText(">>转换成功\n", Color.Green, code);
                                     onlyPass = false;
                                     ChangeResult.Enabled = true;
                                     step = 0;

+ 10 - 4
UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -252,12 +252,18 @@ namespace UAS_MES.Make
                                 if (bsncode == sncode.Text)
                                 {
                                     //写入日志
-                                    LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
+                                    if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage))
+                                    {
+                                        //记录日志
+                                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
+                                        OperateResult.AppendText(">>转换成功\n", Color.Green, sncode);
+                                    }
+                                    else
+                                    {
+                                        OperateResult.AppendText(">>" + errorMessage + "\n", Color.Red, sncode);
+                                    }
                                     if (errorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + errorMessage + "\n");
-                                    //记录日志
-                                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
-                                    OperateResult.AppendText(">>转换成功\n", Color.Green, sncode);
                                     flag = false;
                                     ChangeResult.Enabled = true;
                                     bsncode = "";