Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 93b160df
内嵌 并排
正在显示 4 个修改的文件 包含 17 行增加 和 18 行删除
source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs
......@@ -137,7 +137,7 @@
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(133, 84);
this.txtBusyStatus.Location = new System.Drawing.Point(133, 75);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
......@@ -145,7 +145,7 @@
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(19, 119);
this.label11.Location = new System.Drawing.Point(19, 110);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17);
this.label11.TabIndex = 292;
......@@ -154,7 +154,7 @@
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(133, 116);
this.txtHomeStatus.Location = new System.Drawing.Point(133, 107);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
......@@ -162,7 +162,7 @@
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(58, 87);
this.label10.Location = new System.Drawing.Point(58, 78);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289;
......@@ -171,7 +171,7 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(65, 55);
this.label3.Location = new System.Drawing.Point(65, 46);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286;
......@@ -180,7 +180,7 @@
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(53, 215);
this.label24.Location = new System.Drawing.Point(53, 206);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(71, 17);
this.label24.TabIndex = 316;
......@@ -210,7 +210,7 @@
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(133, 52);
this.txtAlarmStatus.Location = new System.Drawing.Point(133, 43);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
......@@ -218,7 +218,7 @@
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(133, 212);
this.txtLimit2.Location = new System.Drawing.Point(133, 203);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313;
......@@ -234,7 +234,7 @@
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(53, 183);
this.label22.Location = new System.Drawing.Point(53, 174);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(71, 17);
this.label22.TabIndex = 312;
......@@ -244,7 +244,7 @@
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(133, 180);
this.txtLimit1.Location = new System.Drawing.Point(133, 171);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
......@@ -252,7 +252,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(65, 151);
this.label6.Location = new System.Drawing.Point(65, 142);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.TabIndex = 300;
......@@ -261,7 +261,7 @@
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(133, 148);
this.txtHomeSingle.Location = new System.Drawing.Point(133, 139);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -457,9 +457,8 @@ namespace OnlineStore.DeviceLibrary
protected void InStoreLog(string msg)
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
if (posId.Equals(""))
{
if (String.IsNullOrEmpty( posId))
{
LogUtil.info(Name + msg);
}
else
......@@ -470,7 +469,7 @@ namespace OnlineStore.DeviceLibrary
protected void OutStoreLog(string msg)
{
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
if (posId.Equals(""))
if (String.IsNullOrEmpty(posId))
{
LogUtil.info(Name + msg);
}
......
source/DeviceLibrary/assemblyLine/FeedingEquip_Partial.cs
......@@ -113,7 +113,7 @@ namespace OnlineStore.DeviceLibrary
#region 托盘检测
if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_StopCylinder1Down))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_02_FixtureCheck);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopCylinder2Down);
CheckLog("托盘检测：" + SecondMoveInfo.MoveStep + "阻挡1上升，等待FL_TrayCheck=1）");
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW));
......
source/DeviceLibrary/model/LineMoveInfo.cs
......@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
}
public string SLog
{
get { return moveStep + ""; }
get { return MoveStep + ""; }
}
public void NextMoveStep(LineMoveStep step)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!