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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -176,7 +176,7 @@ namespace UAS_MES.Make
                                             }
                                             else
                                             {
-                                                OperateResult.AppendText(">>序列号:" + code.Text + "错误\n", Color.Red, code);
+                                                OperateResult.AppendText(">>序列号:" + code.Text + "已转换过\n", Color.Red, code);
                                                 OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                             }
                                         }

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -156,7 +156,7 @@ namespace UAS_MES.Make
                                             }
                                             else
                                             {
-                                                OperateResult.AppendText(">>序列号:" + sncode.Text + "错误\n", Color.Red, sncode);
+                                                OperateResult.AppendText(">>序列号:" + sncode.Text + "已转换过\n", Color.Red, sncode);
                                                 OperateResult.AppendText("<<请重新输入序列号\n", Color.Black);
                                             }
                                         }