Merge branch 'master' of repos.ubtob.net:usoft/mes-client

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -279,7 +279,8 @@ namespace UAS_LabelMachine
             if (SplitData.Length < 5)
             {
 
-                SplitData2 = Input.Text.Split(System.Convert.ToChar(29));
+                SplitData2 = Input.Text.Split(System.Convert.ToChar(29));//< GS >
+                SplitData2 = Regex.Split(Input.Text, "<GS>", RegexOptions.IgnoreCase);
                 for (int i = 0; i < SplitData2.Length; i++)
                 {
                     Console.WriteLine(SplitData2[i]);
@@ -317,11 +318,11 @@ namespace UAS_LabelMachine
 
                 Data.Add("BRAND","NEX");
 
-                Data.Add("LOTNO", SplitData2[5].Substring(3, SplitData2[5].Length - 3));
+                Data.Add("LOTNO", SplitData2[5].Substring(2, SplitData2[5].Length - 2));
 
-                Data.Add("PO", SplitData2[5].Substring(3, SplitData2[5].Length - 3));
+                Data.Add("PO", SplitData2[5].Substring(2, SplitData2[5].Length - 2));
 
-                Data.Add("SERIAL", SplitData2[5].Substring(3, SplitData2[5].Length - 3));
+                Data.Add("SERIAL", SplitData2[5].Substring(2, SplitData2[5].Length - 2));