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

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -143,7 +143,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);
                                         }
                                         break;