Skip to content

李娜 / SO827-OutletEquip

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 842a18ba 由 LN
选项

1

1 个父辈 92c5d69a
内嵌 并排
正在显示 5 个修改的文件 包含 21 行增加 和 55 行删除
source/DeviceLibrary/StoreConfig/StoreConfig.csv
......@@ -32,9 +32,9 @@ PRO,0,压紧轴（轴4）P1速度,CompAxis_P1_Speed,20000,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P2速度,CompAxis_P2_Speed,20000,,,,,,,,,,,,
PRO,0,压紧轴（轴4）P3速度,CompAxis_P3_Speed,20000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,上料口工位1料架RFIDIP,RFID_IP1,192.168.103.11,,,,,,,,,,,,
PRO,0,上料口工位2料架RFIDIP,RFID_IP2,192.168.103.12,,,,,,,,,,,,
PRO,0,上料口工位3料架RFIDIP,RFID_IP3,192.168.103.13,,,,,,,,,,,,
PRO,0,上料口工位1料架RFIDIP,RFID_IP1,192.168.103.21,,,,,,,,,,,,
PRO,0,上料口工位2料架RFIDIP,RFID_IP2,192.168.103.22,,,,,,,,,,,,
PRO,0,上料口工位3料架RFIDIP,RFID_IP3,192.168.103.23,,,,,,,,,,,,
PRO,0,上料口工位1AGV节点名称,AgvName1,D1,,,,,,,,,,,,
PRO,0,上料口工位2AGV节点名称,AgvName2,D2,,,,,,,,,,,,
PRO,0,上料口工位3AGV节点名称,AgvName3,D3,,,,,,,,,,,,
......
source/DeviceLibrary/model/InOutParam.cs
......@@ -115,8 +115,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public bool IsNg { get; set; }
public string ToStr()
{
return " [" + barcode + "] [" + ShelfPosId + "] [" + PlateW + "x" + PlateH + "],boxPos[" + BoxPosId + "],rfid [" + rfid + "]";
{
return $" [{ barcode }] [{ ShelfPosId }] [{PlateW }x{ PlateH }],boxPos[{ BoxPosId }],rfid [{ rfid}]";
}
}
}
source/DeviceLibrary/model/StoreMoveInfo.cs
......@@ -195,41 +195,7 @@ namespace OnlineStore.DeviceLibrary
wait.IsHomeMove = true;
wait.IsEnd = false;
return wait;
}
//public static WaitResultInfo WaitStell(byte slvAddr, int targetPosition, int speed)
//{
// WaitResultInfo wait = new WaitResultInfo();
// wait.CanWhileMoveCount =10;
// wait.WaitType = 4;
// wait.SlvAddr = slvAddr;
// wait.IsHomeMove = false;
// wait.TargetPosition = targetPosition;
// wait.TargetSpeed = speed;
// wait.IsEnd = false;
// return wait;
//}
// public static WaitResultInfo WaitStellHome(byte slvAddr, int targetPosition, int speed)
//{
// WaitResultInfo wait = new WaitResultInfo();
// wait.CanWhileMoveCount = 10;
// wait.WaitType = 4;
// wait.SlvAddr = slvAddr;
// wait.IsHomeMove = true;
// wait.TargetPosition = 0;
// wait.TargetSpeed = speed;
// wait.IsEnd = false;
// return wait;
//}
//public static WaitResultInfo WaitShuoKe(int slvAddr, int targetPosition, bool isHome)
//{
// WaitResultInfo wait = new WaitResultInfo();
// wait.CanWhileMoveCount = 0;
// wait.WaitType = 5;
// wait.SlvAddr =(byte) slvAddr;
// wait.TargetPosition = targetPosition;
// wait.IsHomeMove = isHome;
// return wait;
//}
}
public static WaitResultInfo WaitTime(int MScends)
{
WaitResultInfo wait = new WaitResultInfo();
......@@ -257,39 +223,39 @@ namespace OnlineStore.DeviceLibrary
{
if (IsHomeMove)
{
return "轴【" + AxisInfo.DisplayStr + "】原点返回";
return $"轴【{ AxisInfo.DisplayStr}】原点返回";
}
else
{
return "轴【" + AxisInfo.DisplayStr + "】绝对运动，目标位置【" + TargetPosition + "】";
return $"轴【{ AxisInfo.DisplayStr }】绝对运动，目标位置【{ TargetPosition }】";
}
}
else if (WaitType == 2)
{
return "IO信号等待，IO类型【" + IoType + "】,等待值【" + IoValue + "】";
return $"IO信号等待，IO类型【{ IoType }】,等待值【{ IoValue }】";
}
else if (WaitType == 3)
{
return "时间等待：【" + TimeMSeconds + "】毫秒";
return $"时间等待：【{ TimeMSeconds }】毫秒";
}
else if (WaitType == 4)
{
return "电钢目标位置：【" + TargetPosition + "】 ";
return $"电钢目标位置：【{ TargetPosition }】 ";
}
else if (WaitType == 5)
{
return "硕科电机目标位置：【" + TargetPosition + "】 ";
return $"硕科电机目标位置：【{ TargetPosition }】 ";
}
else if (WaitType == 6)
{
return "轴【" + AxisInfo.DisplayStr + "】ORG信号：【" + IoValue + "】 ";
return $"轴【{ AxisInfo.DisplayStr}】ORG信号：【{ IoValue }】 ";
}else if (WaitType == 7)
{
return "料盘高度【" + HeightValue + "】 ";
return $"料盘高度【{ HeightValue }】 ";
}
else
{
return "Wait位置类型：WaitType=【" + WaitType + "】";
return $"Wait位置类型：WaitType=【{ WaitType }】";
}
}
/// <summary>
......
source/HCSingleStore/FrmAxisDebug.Designer.cs
......@@ -352,7 +352,7 @@
this.btnMCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMCopy.Location = new System.Drawing.Point(875, 71);
this.btnMCopy.Name = "btnMCopy";
this.btnMCopy.Size = new System.Drawing.Size(69, 28);
this.btnMCopy.Size = new System.Drawing.Size(57, 28);
this.btnMCopy.TabIndex = 31;
this.btnMCopy.Text = "复制";
this.btnMCopy.UseVisualStyleBackColor = true;
......@@ -363,7 +363,7 @@
this.btnUCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUCopy.Location = new System.Drawing.Point(875, 128);
this.btnUCopy.Name = "btnUCopy";
this.btnUCopy.Size = new System.Drawing.Size(69, 28);
this.btnUCopy.Size = new System.Drawing.Size(57, 28);
this.btnUCopy.TabIndex = 32;
this.btnUCopy.Text = "复制";
this.btnUCopy.UseVisualStyleBackColor = true;
......@@ -374,7 +374,7 @@
this.btnICopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnICopy.Location = new System.Drawing.Point(875, 186);
this.btnICopy.Name = "btnICopy";
this.btnICopy.Size = new System.Drawing.Size(69, 28);
this.btnICopy.Size = new System.Drawing.Size(57, 28);
this.btnICopy.TabIndex = 33;
this.btnICopy.Text = "复制";
this.btnICopy.UseVisualStyleBackColor = true;
......@@ -385,7 +385,7 @@
this.btnCCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCCopy.Location = new System.Drawing.Point(875, 246);
this.btnCCopy.Name = "btnCCopy";
this.btnCCopy.Size = new System.Drawing.Size(69, 28);
this.btnCCopy.Size = new System.Drawing.Size(57, 28);
this.btnCCopy.TabIndex = 34;
this.btnCCopy.Text = "复制";
this.btnCCopy.UseVisualStyleBackColor = true;
......@@ -394,7 +394,7 @@
// picAxis
//
this.picAxis.Image = ((System.Drawing.Image)(resources.GetObject("picAxis.Image")));
this.picAxis.Location = new System.Drawing.Point(7, 12);
this.picAxis.Location = new System.Drawing.Point(6, 12);
this.picAxis.Name = "picAxis";
this.picAxis.Size = new System.Drawing.Size(288, 452);
this.picAxis.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
......
source/HCSingleStore/FrmBase.cs
......@@ -44,7 +44,7 @@ namespace OnlineStore.ACSingleStore
}
return str;
}
internal static string GetCodeNum(string codeName = "SO664-OutletEquip")
internal static string GetCodeNum(string codeName = "SO827-OutletEquip")
{
byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
string result = "";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!