Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 eebd5458
内嵌 并排
正在显示 5 个修改的文件 包含 21 行增加 和 12 行删除
source/AssemblyLineClient/FrmDischargeLine.cs
...@@ -45,7 +45,7 @@ namespace OnlineStore.AssemblyLine ...@@ -45,7 +45,7 @@ namespace OnlineStore.AssemblyLine
this.tableLayoutPanel1.RowCount = equipBean.Config.DIList.Count; this.tableLayoutPanel1.RowCount = equipBean.Config.DIList.Count;
foreach (ConfigIO ioValue in equipBean.Config.DIList.Values) foreach (ConfigIO ioValue in equipBean.Config.DIList.Values)
{ {
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 25));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
...@@ -437,7 +437,15 @@ namespace OnlineStore.AssemblyLine ...@@ -437,7 +437,15 @@ namespace OnlineStore.AssemblyLine
private void btnNgMove_Click(object sender, EventArgs e) private void btnNgMove_Click(object sender, EventArgs e)
{ {
BtnMove(btnNgMove, "NG气缸前进", "NG气缸后退", IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before); //判断line2是否停止
if (equipBase.IOValue(IO_Type.DLine_Run2).Equals(IO_VALUE.LOW))
{
BtnMove(btnNgMove, "NG气缸前进", "NG气缸后退", IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before);
}
else
{
MessageBox.Show(line2Name+"运转中，NG气缸不能动作");
}
} }
} }
......
source/AssemblyLineClient/FrmIOStatus.Designer.cs
...@@ -516,6 +516,7 @@ ...@@ -516,6 +516,7 @@
this.btnNGCylinder.TabIndex = 268; this.btnNGCylinder.TabIndex = 268;
this.btnNGCylinder.Text = "NG料盘气缸前进"; this.btnNGCylinder.Text = "NG料盘气缸前进";
this.btnNGCylinder.UseVisualStyleBackColor = true; this.btnNGCylinder.UseVisualStyleBackColor = true;
this.btnNGCylinder.Visible = false;
this.btnNGCylinder.Click += new System.EventHandler(this.btnNGCylinder_Click); this.btnNGCylinder.Click += new System.EventHandler(this.btnNGCylinder_Click);
// //
// btnSW4Run // btnSW4Run
......
source/DeviceLibrary/LineConfig/Config_Line.csv
...@@ -75,8 +75,8 @@ DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001 ...@@ -75,8 +75,8 @@ DI,0,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X001,X001
DI,0,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X002,X002 DI,0,复位,Reset_BTN,1,PRO_AOI_IP_1,0,复位,X002,X002
DI,0,联动,Start_BTN,2,PRO_AOI_IP_1,0,联动,X003,X003 DI,0,联动,Start_BTN,2,PRO_AOI_IP_1,0,联动,X003,X003
DI,0,气压检测,Airpressure_Check,3,PRO_AOI_IP_1,0,气压检测,X004,X004 DI,0,气压检测,Airpressure_Check,3,PRO_AOI_IP_1,0,气压检测,X004,X004
DI,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,0,NG料盘推出气缸前进端,X005,X005 ,0,NG料盘推出气缸前进端,NGCylinder_Before,4,PRO_AOI_IP_1,0,NG料盘推出气缸前进端,X005,X005
DI,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,0,NG料盘推出气缸后退端,X006,X006 ,0,NG料盘推出气缸后退端,NGCylinder_After,5,PRO_AOI_IP_1,0,NG料盘推出气缸后退端,X006,X006
DI,0,环形线横移4定位上升端,SW4_LocationCylinder_Up,6,PRO_AOI_IP_1,0,环形线横移4定位上升端,X007,X007 DI,0,环形线横移4定位上升端,SW4_LocationCylinder_Up,6,PRO_AOI_IP_1,0,环形线横移4定位上升端,X007,X007
DI,0,环形线横移4定位下降端,SW4_LocationCylinder_Down,7,PRO_AOI_IP_1,0,环形线横移4定位下降端,X008,X008 DI,0,环形线横移4定位下降端,SW4_LocationCylinder_Down,7,PRO_AOI_IP_1,0,环形线横移4定位下降端,X008,X008
,0,,,8,PRO_AOI_IP_1,0,,X009,X009 ,0,,,8,PRO_AOI_IP_1,0,,X009,X009
...@@ -97,8 +97,8 @@ DO,0,驱动电机2正转,DriveMotor_Run2,5,PRO_AOI_IP_1,0,驱动电机2正转,Y006,Y006 ...@@ -97,8 +97,8 @@ DO,0,驱动电机2正转,DriveMotor_Run2,5,PRO_AOI_IP_1,0,驱动电机2正转,Y006,Y006
DO,0,驱动电机3正转,DriveMotor_Run3,6,PRO_AOI_IP_1,0,驱动电机3正转,Y007,Y007 DO,0,驱动电机3正转,DriveMotor_Run3,6,PRO_AOI_IP_1,0,驱动电机3正转,Y007,Y007
DO,0,驱动电机4正转,DriveMotor_Run4,7,PRO_AOI_IP_1,0,驱动电机4正转,Y008,Y008 DO,0,驱动电机4正转,DriveMotor_Run4,7,PRO_AOI_IP_1,0,驱动电机4正转,Y008,Y008
DO,0,环形线横移4电机运转,SW4_MotorRun,8,PRO_AOI_IP_1,0,环形线横移4电机运转,Y009,Y009 DO,0,环形线横移4电机运转,SW4_MotorRun,8,PRO_AOI_IP_1,0,环形线横移4电机运转,Y009,Y009
DO,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,0,NG料盘推出气缸前进SOL,Y010,Y010 ,0,NG料盘推出气缸前进SOL,NGCylinder_Before,9,PRO_AOI_IP_1,0,NG料盘推出气缸前进SOL,Y010,Y010
DO,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,0,NG料盘推出气缸后退SOL,Y011,Y011 ,0,NG料盘推出气缸后退SOL,NGCylinder_After,10,PRO_AOI_IP_1,0,NG料盘推出气缸后退SOL,Y011,Y011
DO,0,环形线横移4定位上升SOL,SW4_LocationCylinder_Up,11,PRO_AOI_IP_1,0,环形线横移4定位上升SOL,Y012,Y012 DO,0,环形线横移4定位上升SOL,SW4_LocationCylinder_Up,11,PRO_AOI_IP_1,0,环形线横移4定位上升SOL,Y012,Y012
DO,0,环形线横移4定位下降SOL,SW4_LocationCylinder_Down,12,PRO_AOI_IP_1,0,环形线横移4定位下降SOL,Y013,Y013 DO,0,环形线横移4定位下降SOL,SW4_LocationCylinder_Down,12,PRO_AOI_IP_1,0,环形线横移4定位下降SOL,Y013,Y013
,0,,,13,PRO_AOI_IP_1,0,,Y014,Y014 ,0,,,13,PRO_AOI_IP_1,0,,Y014,Y014
......
source/DeviceLibrary/model/LineMoveInfo.cs
...@@ -391,10 +391,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -391,10 +391,10 @@ namespace OnlineStore.DeviceLibrary
} }
else if (WaitType.Equals(WaitEnum.W201_ProvidingCanOut)) else if (WaitType.Equals(WaitEnum.W201_ProvidingCanOut))
{ {
return "移栽模块可移栽出库"; return "可移栽出料";
}else if (WaitType.Equals(WaitEnum.W202_DLineCanOut)) }else if (WaitType.Equals(WaitEnum.W202_DLineCanOut))
{ {
return "出料流水线可接收料盘"; return "皮带线可放料盘";
} }
else if (WaitType.Equals(WaitEnum.W301_DLineScanCode)) else if (WaitType.Equals(WaitEnum.W301_DLineScanCode))
{ {
......
source/LoadCVSLibrary/storeConfig/config/Line_Config.cs
...@@ -141,8 +141,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -141,8 +141,8 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.Reset_BTN); MustHaveDIList.Add(IO_Type.Reset_BTN);
MustHaveDIList.Add(IO_Type.Start_BTN); MustHaveDIList.Add(IO_Type.Start_BTN);
MustHaveDIList.Add(IO_Type.Airpressure_Check); MustHaveDIList.Add(IO_Type.Airpressure_Check);
MustHaveDIList.Add(IO_Type.NGCylinder_Before); //MustHaveDIList.Add(IO_Type.NGCylinder_Before);
MustHaveDIList.Add(IO_Type.NGCylinder_After); //MustHaveDIList.Add(IO_Type.NGCylinder_After);
MustHaveDIList.Add(IO_Type.TopCylinder_UP); MustHaveDIList.Add(IO_Type.TopCylinder_UP);
MustHaveDIList.Add(IO_Type.TopCylinder_Down); MustHaveDIList.Add(IO_Type.TopCylinder_Down);
...@@ -156,8 +156,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -156,8 +156,8 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDOList.Add(IO_Type.DriveMotor_Run3); MustHaveDOList.Add(IO_Type.DriveMotor_Run3);
MustHaveDOList.Add(IO_Type.DriveMotor_Run4); MustHaveDOList.Add(IO_Type.DriveMotor_Run4);
MustHaveDOList.Add(IO_Type.SW4_MotorRun); MustHaveDOList.Add(IO_Type.SW4_MotorRun);
MustHaveDOList.Add(IO_Type.NGCylinder_Before); //MustHaveDOList.Add(IO_Type.NGCylinder_Before);
MustHaveDOList.Add(IO_Type.NGCylinder_After); //MustHaveDOList.Add(IO_Type.NGCylinder_After);
MustHaveDOList.Add(IO_Type.TopCylinder_UP); MustHaveDOList.Add(IO_Type.TopCylinder_UP);
MustHaveDOList.Add(IO_Type.TopCylinder_Down); MustHaveDOList.Add(IO_Type.TopCylinder_Down);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!