Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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;
@@ -404,7 +410,7 @@ namespace UAS_MES.Make
                 macOrBt = code.Text.Replace(":", "").Replace("-", "");
             }
             //如果前缀和长度都满足的话
-            if ((ListA.Rows[step - 2]["psr_length"].ToString() == "" ? true : code.Text.Length != int.Parse(ListA.Rows[step - 2]["psr_length"].ToString())))
+            if ((ListA.Rows[step - 2]["psr_length"].ToString() == "0" ? false : code.Text.Length != int.Parse(ListA.Rows[step - 2]["psr_length"].ToString())))
             {
                 OperateResult.AppendText(">>" + ListA.Rows[step - 2]["psr_type"] + "长度校验不通过,请重新输入\n", Color.Red);
                 OperateResult.AppendText(">>请重新输入" + ListA.Rows[step - 2]["psr_type"] + "\n", Color.Black, code);

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 = "";

UAS-MES/FunctionCode/Make/Make_UpdateCollectCode.cs

@@ -268,7 +268,7 @@ namespace UAS_MES.Make
                 if ((((CheckBox)list[step - 1]).Text.Split('/')[0] == "网标" ? "NETCODE" : ((CheckBox)list[step - 1]).Text.Split('/')[0]) == info.Rows[i]["psr_type"].ToString())
                 {
                     //校验长度
-                    if ((info.Rows[i]["psr_length"].ToString() == "" ? true : inputValue.Text.Length != int.Parse(info.Rows[i]["psr_length"].ToString())))
+                    if ((info.Rows[i]["psr_length"].ToString() == "0" ? false : inputValue.Text.Length != int.Parse(info.Rows[i]["psr_length"].ToString())))
                     {
                         OperateResult.AppendText(">>" + info.Rows[i]["psr_type"] + "长度校验不通过,请重新输入\n", Color.Red);
                         OperateResult.AppendText(">>请重新输入" + info.Rows[i]["psr_type"] + "\n", Color.Black, inputValue);