|
|
@@ -44,14 +44,14 @@ namespace WCS.WorkEngineering
|
|
|
|
|
|
#region 初始化RGV相关信息
|
|
|
|
|
|
- List<RgvSegmentInfo> RgvInfo = new List<RgvSegmentInfo>
|
|
|
- {
|
|
|
- new RgvSegmentInfo( 1, "10.30.37.113"),
|
|
|
- //new RGVSegmentInfo( 2, "10.30.37.118"),
|
|
|
- //new RGVSegmentInfo( 3, "10.30.37.123"),
|
|
|
- //new RGVSegmentInfo( 4, "10.30.37.128"),
|
|
|
- //new RGVSegmentInfo( 5, "10.30.37.133"),
|
|
|
- //new RGVSegmentInfo( 6, "10.30.37.138")
|
|
|
+ var RgvInfo = new List<RgvSegmentInfo>
|
|
|
+ {
|
|
|
+ //new RgvSegmentInfo( 1, "10.30.37.113"),
|
|
|
+ new RgvSegmentInfo( 2, "10.30.37.118"),
|
|
|
+ //new RgvSegmentInfo( 3, "10.30.37.123"),
|
|
|
+ //new RgvSegmentInfo( 4, "10.30.37.128"),
|
|
|
+ //new RgvSegmentInfo( 5, "10.30.37.133"),
|
|
|
+ //new RgvSegmentInfo( 6, "10.30.37.138")
|
|
|
};
|
|
|
|
|
|
foreach (var item in RgvInfo)
|
|
|
@@ -60,7 +60,6 @@ namespace WCS.WorkEngineering
|
|
|
conv.AddFlag(DeviceFlags.RGV);
|
|
|
conv.AddProtocol<IRGV520>(0, 520, item.Ip);
|
|
|
conv.AddProtocol<IRGV521>(0, 521, item.Ip);
|
|
|
- //conv.AddProtocol<IStation523>(, 523, item.IP);
|
|
|
}
|
|
|
|
|
|
#endregion 初始化RGV相关信息
|
|
|
@@ -113,10 +112,15 @@ namespace WCS.WorkEngineering
|
|
|
|
|
|
var mLtuples523 = new List<Tuple<string, List<Tuple<int, int>>>>()
|
|
|
{
|
|
|
- new("10.30.37.166",new List<Tuple<int, int>>()
|
|
|
+ //new("10.30.37.166",new List<Tuple<int, int>>()
|
|
|
+ //{
|
|
|
+ // new(1, 110),
|
|
|
+ // new(401, 599),
|
|
|
+ //}),
|
|
|
+ new("10.30.37.198",new List<Tuple<int, int>>()
|
|
|
{
|
|
|
- new(1, 110),
|
|
|
- new(401, 599),
|
|
|
+ new(101, 210),
|
|
|
+ new(601, 799),
|
|
|
})
|
|
|
};
|
|
|
|
|
|
@@ -146,7 +150,8 @@ namespace WCS.WorkEngineering
|
|
|
//Item2表示线体号集合,Item1表示IP
|
|
|
var mLTuples520 = new List<Tuple<string, List<int>>>()
|
|
|
{
|
|
|
- new("10.30.37.166",new List<int>(){1,22,41,61,418,426,435,444,455,466,480,494,508,522,536,550,564,578})
|
|
|
+ //new("10.30.37.166",new List<int>(){1,22,41,61,418,426,435,444,455,466,480,494,508,522,536,550,564,578}),
|
|
|
+ new("10.30.37.198",new List<int>(){101,122,141,161,618,426,635,644,655,666,680,694,708,722,736,750,764,778,791})
|
|
|
};
|
|
|
|
|
|
foreach (var item in mLTuples520)
|
|
|
@@ -174,7 +179,8 @@ namespace WCS.WorkEngineering
|
|
|
//Item2表示线体号集合,Item1表示IP
|
|
|
var mLTuples83 = new List<Tuple<string, List<int>>>()
|
|
|
{
|
|
|
- new("10.30.37.166",new List<int>(){1,22,41,61,18})
|
|
|
+ //new("10.30.37.166",new List<int>(){1,22,41,61,18}),
|
|
|
+ new("10.30.37.198",new List<int>(){101,122,141,161,118,})
|
|
|
};
|
|
|
|
|
|
foreach (var item in mLTuples83)
|
|
|
@@ -196,7 +202,8 @@ namespace WCS.WorkEngineering
|
|
|
//Item2表示线体号集合,Item1表示IP
|
|
|
var mLTuples525 = new List<Tuple<string, List<int>>>()
|
|
|
{
|
|
|
- new("10.30.37.166",new List<int>(){18})
|
|
|
+ //new("10.30.37.166",new List<int>(){18}),
|
|
|
+ new("10.30.37.198",new List<int>(){118}),
|
|
|
};
|
|
|
|
|
|
foreach (var item in mLTuples525)
|
|
|
@@ -217,7 +224,8 @@ namespace WCS.WorkEngineering
|
|
|
//Item2表示线体号集合,Item1表示IP
|
|
|
var mLTuples91 = new List<Tuple<string, List<int>>>()
|
|
|
{
|
|
|
- new("10.30.37.166",new List<int>(){418})
|
|
|
+ //new("10.30.37.166",new List<int>(){418}),
|
|
|
+ new("10.30.37.166",new List<int>(){618})
|
|
|
};
|
|
|
|
|
|
foreach (var item in mLTuples91)
|
|
|
@@ -267,11 +275,11 @@ namespace WCS.WorkEngineering
|
|
|
|
|
|
foreach (var item in shapeInfo)
|
|
|
{
|
|
|
- for (int i = 0; i < item.DeviceNo.Length; i++)
|
|
|
+ for (var i = 0; i < item.DeviceNo.Length; i++)
|
|
|
{
|
|
|
var conv = Device.All.FirstOrDefault(x => x.Code == item.DeviceNo[i].ToString());
|
|
|
conv.AddFlag(DeviceFlags.外检);
|
|
|
- int pos = i * 14;
|
|
|
+ var pos = i * 14;
|
|
|
conv.AddProtocol<IStation91>(pos, 91, item.Ip);
|
|
|
}
|
|
|
}
|
|
|
@@ -334,7 +342,8 @@ namespace WCS.WorkEngineering
|
|
|
|
|
|
List<TrussSegmentInfo> TrussInfo1 = new List<TrussSegmentInfo>
|
|
|
{
|
|
|
- new TrussSegmentInfo( 1, "10.30.37.230"),
|
|
|
+ //new TrussSegmentInfo( 1, "10.30.37.230"),
|
|
|
+ new TrussSegmentInfo( 1, "10.30.37.232"),
|
|
|
};
|
|
|
|
|
|
foreach (var item in TrussInfo1)
|
|
|
@@ -352,9 +361,9 @@ namespace WCS.WorkEngineering
|
|
|
|
|
|
#region 初始化堆垛机相关信息
|
|
|
|
|
|
- int ip = 41;
|
|
|
+ var ip = 41;
|
|
|
|
|
|
- for (int i = 0; i <= 1; i++)
|
|
|
+ for (var i = 0; i <= 1; i++)
|
|
|
{
|
|
|
var srm = new Device($"SRM{i + 1}");
|
|
|
srm.AddFlag(DeviceFlags.堆垛机);
|