diff --git a/Aucma.Core.DoorFoam/Business/DoorCollection.cs b/Aucma.Core.DoorFoam/Business/DoorCollection.cs index 6edf9f2a..d2d98d8f 100644 --- a/Aucma.Core.DoorFoam/Business/DoorCollection.cs +++ b/Aucma.Core.DoorFoam/Business/DoorCollection.cs @@ -433,123 +433,123 @@ namespace Aucma.Core.DoorFoam.Business #region 1-20台车 if (info1 != null) { - string item1 = asciiEncoding.GetString(info1.Skip(0).Take(10).ToArray()).Trim('\n'); + string item1 = asciiEncoding.GetString(info1.Skip(2).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 1, MoldType = item1 }); - string item2 = asciiEncoding.GetString(info1.Skip(10).Take(10).ToArray()).Trim('\n'); + string item2 = asciiEncoding.GetString(info1.Skip(12).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 2, MoldType = item2 }); - string item3 = asciiEncoding.GetString(info1.Skip(20).Take(10).ToArray()).Trim('\n'); + string item3 = asciiEncoding.GetString(info1.Skip(22).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 3, MoldType = item3 }); - string item4 = asciiEncoding.GetString(info1.Skip(30).Take(10).ToArray()).Trim('\n'); + string item4 = asciiEncoding.GetString(info1.Skip(32).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 4, MoldType = item4 }); - string item5 = asciiEncoding.GetString(info1.Skip(40).Take(10).ToArray()).Trim('\n'); + string item5 = asciiEncoding.GetString(info1.Skip(42).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 5, MoldType = item5 }); - string item6 = asciiEncoding.GetString(info1.Skip(50).Take(10).ToArray()).Trim('\n'); + string item6 = asciiEncoding.GetString(info1.Skip(52).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 6, MoldType = item6 }); - string item7 = asciiEncoding.GetString(info1.Skip(60).Take(10).ToArray()).Trim('\n'); + string item7 = asciiEncoding.GetString(info1.Skip(62).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 7, MoldType = item7 }); - string item8 = asciiEncoding.GetString(info1.Skip(70).Take(10).ToArray()).Trim('\n'); + string item8 = asciiEncoding.GetString(info1.Skip(72).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 8, MoldType = item8 }); - string item9 = asciiEncoding.GetString(info1.Skip(80).Take(10).ToArray()).Trim('\n'); + string item9 = asciiEncoding.GetString(info1.Skip(82).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 9, MoldType = item9 }); - string item10 = asciiEncoding.GetString(info1.Skip(90).Take(10).ToArray()).Trim('\n'); + string item10 = asciiEncoding.GetString(info1.Skip(92).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 10, MoldType = item10 }); - string item11 = asciiEncoding.GetString(info1.Skip(100).Take(10).ToArray()).Trim('\n'); + string item11 = asciiEncoding.GetString(info1.Skip(102).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 11, MoldType = item11 }); - string item12 = asciiEncoding.GetString(info1.Skip(110).Take(10).ToArray()).Trim('\n'); + string item12 = asciiEncoding.GetString(info1.Skip(112).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 12, MoldType = item12 }); - string item13 = asciiEncoding.GetString(info1.Skip(120).Take(10).ToArray()).Trim('\n'); + string item13 = asciiEncoding.GetString(info1.Skip(122).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 13, MoldType = item13 }); - string item14 = asciiEncoding.GetString(info1.Skip(130).Take(10).ToArray()).Trim('\n'); + string item14 = asciiEncoding.GetString(info1.Skip(132).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 14, MoldType = item14 }); - string item15 = asciiEncoding.GetString(info1.Skip(140).Take(10).ToArray()).Trim('\n'); + string item15 = asciiEncoding.GetString(info1.Skip(142).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 15, MoldType = item15 }); - string item16 = asciiEncoding.GetString(info1.Skip(150).Take(10).ToArray()).Trim('\n'); + string item16 = asciiEncoding.GetString(info1.Skip(152).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 16, MoldType = item16 }); - string item17 = asciiEncoding.GetString(info1.Skip(160).Take(10).ToArray()).Trim('\n'); + string item17 = asciiEncoding.GetString(info1.Skip(162).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 17, MoldType = item17 }); - string item18 = asciiEncoding.GetString(info1.Skip(170).Take(10).ToArray()).Trim('\n'); + string item18 = asciiEncoding.GetString(info1.Skip(172).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 18, MoldType = item18 }); - string item19 = asciiEncoding.GetString(info1.Skip(180).Take(10).ToArray()).Trim('\n'); + string item19 = asciiEncoding.GetString(info1.Skip(182).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 19, MoldType = item19 }); - string item20 = asciiEncoding.GetString(info1.Skip(190).Take(10).ToArray()).Trim('\n'); + string item20 = asciiEncoding.GetString(info1.Skip(192).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 20, @@ -563,123 +563,123 @@ namespace Aucma.Core.DoorFoam.Business #region 20-40车 if(info2 != null) { - string item1 = asciiEncoding.GetString(info2.Skip(0).Take(10).ToArray()).Trim('\n'); + string item1 = asciiEncoding.GetString(info2.Skip(2).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 21, MoldType = item1 }); - string item2 = asciiEncoding.GetString(info2.Skip(10).Take(10).ToArray()).Trim('\n'); + string item2 = asciiEncoding.GetString(info2.Skip(12).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 22, MoldType = item2 }); - string item3 = asciiEncoding.GetString(info2.Skip(20).Take(10).ToArray()).Trim('\n'); + string item3 = asciiEncoding.GetString(info2.Skip(22).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 23, MoldType = item3 }); - string item4 = asciiEncoding.GetString(info2.Skip(30).Take(10).ToArray()).Trim('\n'); + string item4 = asciiEncoding.GetString(info2.Skip(32).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 24, MoldType = item4 }); - string item5 = asciiEncoding.GetString(info2.Skip(40).Take(10).ToArray()).Trim('\n'); + string item5 = asciiEncoding.GetString(info2.Skip(42).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 25, MoldType = item5 }); - string item6 = asciiEncoding.GetString(info2.Skip(50).Take(10).ToArray()).Trim('\n'); + string item6 = asciiEncoding.GetString(info2.Skip(52).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 26, MoldType = item6 }); - string item7 = asciiEncoding.GetString(info2.Skip(60).Take(10).ToArray()).Trim('\n'); + string item7 = asciiEncoding.GetString(info2.Skip(62).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 27, MoldType = item7 }); - string item8 = asciiEncoding.GetString(info2.Skip(70).Take(10).ToArray()).Trim('\n'); + string item8 = asciiEncoding.GetString(info2.Skip(72).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 28, MoldType = item8 }); - string item9 = asciiEncoding.GetString(info2.Skip(80).Take(10).ToArray()).Trim('\n'); + string item9 = asciiEncoding.GetString(info2.Skip(82).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 29, MoldType = item9 }); - string item10 = asciiEncoding.GetString(info2.Skip(90).Take(10).ToArray()).Trim('\n'); + string item10 = asciiEncoding.GetString(info2.Skip(92).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 30, MoldType = item10 }); - string item11 = asciiEncoding.GetString(info2.Skip(100).Take(10).ToArray()).Trim('\n'); + string item11 = asciiEncoding.GetString(info2.Skip(102).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 31, MoldType = item11 }); - string item12 = asciiEncoding.GetString(info2.Skip(110).Take(10).ToArray()).Trim('\n'); + string item12 = asciiEncoding.GetString(info2.Skip(112).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 32, MoldType = item12 }); - string item13 = asciiEncoding.GetString(info2.Skip(120).Take(10).ToArray()).Trim('\n'); + string item13 = asciiEncoding.GetString(info2.Skip(122).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 33, MoldType = item13 }); - string item14 = asciiEncoding.GetString(info2.Skip(130).Take(10).ToArray()).Trim('\n'); + string item14 = asciiEncoding.GetString(info2.Skip(132).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 34, MoldType = item14 }); - string item15 = asciiEncoding.GetString(info2.Skip(140).Take(10).ToArray()).Trim('\n'); + string item15 = asciiEncoding.GetString(info2.Skip(142).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 35, MoldType = item15 }); - string item16 = asciiEncoding.GetString(info2.Skip(150).Take(10).ToArray()).Trim('\n'); + string item16 = asciiEncoding.GetString(info2.Skip(152).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 36, MoldType = item16 }); - string item17 = asciiEncoding.GetString(info2.Skip(160).Take(10).ToArray()).Trim('\n'); + string item17 = asciiEncoding.GetString(info2.Skip(162).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 37, MoldType = item17 }); - string item18 = asciiEncoding.GetString(info2.Skip(170).Take(10).ToArray()).Trim('\n'); + string item18 = asciiEncoding.GetString(info2.Skip(172).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 38, MoldType = item18 }); - string item19 = asciiEncoding.GetString(info2.Skip(180).Take(10).ToArray()).Trim('\n'); + string item19 = asciiEncoding.GetString(info2.Skip(182).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 39, MoldType = item19 }); - string item20 = asciiEncoding.GetString(info2.Skip(190).Take(10).ToArray()).Trim('\n'); + string item20 = asciiEncoding.GetString(info2.Skip(192).Take(8).ToArray()).Replace("\0", "").Trim('\n'); doorFoams.Add(new DoorFoamMachine() { StationTrolleyNumber = 40,