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

UAS-MES/PublicMethod/ftpOperater.cs

@@ -287,7 +287,7 @@ namespace UAS_MES.PublicMethod
                 File.Copy(sourceFile, destFile, true);
             }
             catch {
-                MessageBox.Show("标签文件不在指定维护路径"+ URL + "中","提示",MessageBoxButtons.OK,MessageBoxIcon.Warning);
+                MessageBox.Show("标签文件更新失败，不在指定维护路径"+ URL + "中或已被占用","提示",MessageBoxButtons.OK,MessageBoxIcon.Warning);
             }
             return destFile;
         }