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

UAS-MES/DataOperate/DataHelper.cs

@@ -1031,7 +1031,7 @@ namespace UAS_MES.DataOperate
             string[] caption = field.Split(',');
             for (int i = 0; i < caption.Length; i++)
             {
-                caption[i] = caption[i].Substring(0, caption[i].LastIndexOf("as")).Trim();
+                caption[i] = caption[i].Substring(0, caption[i].LastIndexOf(" as ")).Trim();
             }
             return caption;
         }
@@ -1046,7 +1046,7 @@ namespace UAS_MES.DataOperate
             string[] fields = field.Split(',');
             for (int i = 0; i < fields.Length; i++)
             {
-                fields[i] = fields[i].Substring(fields[i].LastIndexOf("as") + 2, fields[i].Length - fields[i].LastIndexOf("as") - 2).Trim();
+                fields[i] = fields[i].Substring(fields[i].LastIndexOf(" as ") + 4, fields[i].Length - fields[i].LastIndexOf(" as ") - 4).Trim();
             }
             return fields;
         }