Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 f4cd7e79
全部展开
内嵌 并排
正在显示 24 个修改的文件 包含 246 行增加 和 267 行删除
source/AssemblyLineClient/FrmLineIO.cs
...@@ -110,6 +110,13 @@ namespace OnlineStore.AssemblyLine ...@@ -110,6 +110,13 @@ namespace OnlineStore.AssemblyLine
{ {
ReadIOList(); ReadIOList();
lblMoveInfo.Text = LineManager.Line.GetMoveStr(); lblMoveInfo.Text = LineManager.Line.GetMoveStr();
lblTrayNum.Text ="T3-C1托盘号："+ LineManager.Line.T3C1_TrayNum.ToString();
if (cmbTray.SelectedIndex >= 0)
{
int trayNum = cmbTray.SelectedIndex + 1;
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
lblSelTrayNum.Text = tray.ToStr();
}
} }
} }
...@@ -188,8 +195,68 @@ namespace OnlineStore.AssemblyLine ...@@ -188,8 +195,68 @@ namespace OnlineStore.AssemblyLine
{ {
// KNDAIManager.NeedShow = true; // KNDAIManager.NeedShow = true;
//tabControl1.TabPages.RemoveAt(1); //tabControl1.TabPages.RemoveAt(1);
LoadTray();
} }
private void LoadTray()
{
cmbTray.Items.Clear();
for (int i = 1; i <= 30; i++)
{
cmbTray.Items.Add(i.ToString());
}
cmbWidth.Items.Clear();
cmbHeight.Items.Clear();
foreach (int heigth in LineManager.GetTrayList())
{
cmbHeight.Items.Add(heigth);
}
cmbWidth.Items.AddRange(new object[] { 7, 11, 13, 15 });
cmbWidth.SelectedIndex = 0;
cmbHeight.SelectedIndex = 0;
cmbTrayType.SelectedIndex = 0;
cmbTray.SelectedIndex = 0;
}
private void btnUpdateTray_Click(object sender, EventArgs e)
{
int num = cmbTray.SelectedIndex + 1;
DialogResult resut = MessageBox.Show("确定手动更新托盘【" + num + "】的信息？", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
int trayType = cmbTrayType.SelectedIndex;
string posId = txtTrayPosid.Text;
int ph = Convert.ToInt32(cmbHeight.Text);
int pw = Convert.ToInt32(cmbWidth.Text);
bool hasTray = trayType > 0;
bool inNg = chbInStoNG.Checked;
bool isSmall = chbSmall.Checked;
bool urg = rdbUrg.Checked;
bool cutReel = rdbCutreel.Checked;
int loc = FormUtil.GetIntValue(txtTrayLoc);
string code = txtTrayCode.Text.Trim();
if (hasTray)
{
InOutParam inoutP = new InOutParam(num, "CodeTest", posId, ph, pw, inNg,urg,cutReel, isSmall, "",loc);
TrayManager.UpdateTrayInfo(num, hasTray, trayType, inoutP, "InStoreNG ");
}
else
{
TrayManager.UpdateTrayInfo(num, hasTray);
}
if (trayType.Equals(1) && inNg)
{
TrayManager.UpdateInStoreNG(num, inNg, "手动更新");
}
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("手动更新托盘信息：" + info.ToStr());
}
}
private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e) private void cmbWriteIO_DrawItem(object sender, DrawItemEventArgs e)
{ {
if (e.Index < 0) if (e.Index < 0)
...@@ -307,5 +374,42 @@ namespace OnlineStore.AssemblyLine ...@@ -307,5 +374,42 @@ namespace OnlineStore.AssemblyLine
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW); LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
} }
private void cmbTray_SelectedIndexChanged(object sender, EventArgs e)
{
if (cmbTray.SelectedIndex >= 0)
{
int trayNum = cmbTray.SelectedIndex + 1;
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
cmbTrayType.SelectedIndex = tray.InOrOutStore;
if (tray.IsFull)
{
txtTrayCode.Text = tray.InoutPar.WareCode;
txtTrayPosid.Text = tray.InoutPar.PosId;
cmbWidth.Text = tray.InoutPar.PlateW.ToString();
cmbHeight.Text = tray.InoutPar.PlateH.ToString();
rdbCutreel.Checked = tray.InoutPar.cutReel;
rdbUrg.Checked = tray.InoutPar.urgentReel;
chbSmall.Checked = tray.InoutPar.smallReel;
txtTrayLoc.Text = tray.InoutPar.rfidLoc.ToString();
chbInStoNG.Checked = tray.InoutPar.InStoreNg;
}
else
{
txtTrayCode.Text = "";
txtTrayPosid.Text = "";
cmbWidth.Text = "";
cmbHeight.Text = "";
rdbCutreel.Checked = false ;
rdbUrg.Checked = false ;
chbSmall.Checked = false ;
txtTrayLoc.Text = "";
chbInStoNG.Checked = false ;
}
}
}
} }
} }
source/AssemblyLineClient/FrmLineStore.cs
...@@ -35,7 +35,8 @@ namespace OnlineStore.AssemblyLine ...@@ -35,7 +35,8 @@ namespace OnlineStore.AssemblyLine
} }
private void LoadStoreData() private void LoadStoreData()
{ {
this.Opacity = 0;
formLineStatus(false); formLineStatus(false);
string title = ConfigAppSettings.GetValue(Setting_Init.App_Title); string title = ConfigAppSettings.GetValue(Setting_Init.App_Title);
this.Text = title; this.Text = title;
...@@ -52,15 +53,12 @@ namespace OnlineStore.AssemblyLine ...@@ -52,15 +53,12 @@ namespace OnlineStore.AssemblyLine
FrmIOTest ioStatus = new FrmIOTest(); FrmIOTest ioStatus = new FrmIOTest();
AddForm(" IO列表查看 ", ioStatus); AddForm(" IO列表查看 ", ioStatus);
FrmLineIO frmIOStatus = new FrmLineIO(); FrmLineIO frmIOStatus = new FrmLineIO();
AddForm(" 流水线IO ", frmIOStatus); AddForm(" 流水线IO ", frmIOStatus);
LoadMoveList();
LoadListView(); LoadMoveList();
LoadListView();
托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1); 托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1);
cmbTray.Items.Clear();
for (int i = 1; i <= 30; i++)
{
cmbTray.Items.Add(i.ToString());
}
if (autoValue.Equals(1)) if (autoValue.Equals(1))
{ {
开机自动启动ToolStripMenuItem.Text = gouStr + " 开机自动启动"; 开机自动启动ToolStripMenuItem.Text = gouStr + " 开机自动启动";
...@@ -77,12 +75,11 @@ namespace OnlineStore.AssemblyLine ...@@ -77,12 +75,11 @@ namespace OnlineStore.AssemblyLine
{ {
启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器"; 启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
} }
cmbTrayType.SelectedIndex = 0;
cmbTray.SelectedIndex = 0;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
LoadOk = true;
//HideForm();
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
this.Opacity = 100;
LoadOk = true;
} }
private void AddForm(string text, Form form) private void AddForm(string text, Form form)
{ {
...@@ -820,37 +817,7 @@ namespace OnlineStore.AssemblyLine ...@@ -820,37 +817,7 @@ namespace OnlineStore.AssemblyLine
} }
} }
private void btnUpdateTray_Click(object sender, EventArgs e)
{
int num = cmbTray.SelectedIndex + 1;
DialogResult resut = MessageBox.Show("确定手动更新托盘【" + num + "】的信息？", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
int trayType = cmbTrayType.SelectedIndex;
string posId = txtTrayPosid.Text;
int ph = FormUtil.GetIntValue(txtTrayH);
int pw = FormUtil.GetIntValue(txtTrayW);
bool hasTray = trayType > 0;
bool inNg = chbInStoNG.Checked;
if (hasTray)
{
InOutParam inoutP = new InOutParam(num, "CodeTest", posId, ph, pw, inNg);
TrayManager.UpdateTrayInfo(num, hasTray, trayType, inoutP, "InStoreNG ");
}
else
{
TrayManager.UpdateTrayInfo(num, hasTray);
}
//if (trayType.Equals(1) && inNg)
//{
// TrayManager.UpdateInStoreNG(num, inNg, );
//}
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("手动更新托盘信息：" + info.ToStr());
}
}
private void logBox_VisibleChanged(object sender, EventArgs e) private void logBox_VisibleChanged(object sender, EventArgs e)
{ {
...@@ -1070,11 +1037,18 @@ namespace OnlineStore.AssemblyLine ...@@ -1070,11 +1037,18 @@ namespace OnlineStore.AssemblyLine
} }
} }
private EquipBase seleEquip = null; private EquipBase seleEquip = null;
private EquipControl selControl = null;
private void Control_Click(object sender ,EventArgs s) private void Control_Click(object sender ,EventArgs s)
{ {
if (sender is EquipControl) if (sender is EquipControl)
{ {
EquipControl control = (EquipControl)sender; EquipControl control = (EquipControl)sender;
if (selControl != null)
{
selControl.UnSelectStyle();
}
selControl = control;
selControl.SelectStyle();
int deviceId = control.DeviceId; int deviceId = control.DeviceId;
if (lineBean.MoveEquipMap.ContainsKey(deviceId)) if (lineBean.MoveEquipMap.ContainsKey(deviceId))
......
source/AssemblyLineClient/equip/FrmFeedingEquipF.Designer.cs deleted 100644 → 0
namespace OnlineStore.AssemblyLine
{
partial class FrmFeedingEquipF
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Text = "FrmFeedingEquipF";
}
#endregion
}
}
\ No newline at end of file \ No newline at end of file
source/AssemblyLineClient/equip/FrmFeedingEquipF.cs deleted 100644 → 0
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.AssemblyLine
{
public partial class FrmFeedingEquipF : FrmEquipBaseForm
{
public FrmFeedingEquipF()
{
InitializeComponent();
}
}
}
source/AssemblyLineClient/equip/FrmMoveEquipForm.Designer.cs deleted 100644 → 0
namespace OnlineStore.AssemblyLine
{
partial class FrmMoveEquipForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1399, 800);
this.Text = "FrmMoveEquipForm";
}
#endregion
}
}
\ No newline at end of file \ No newline at end of file
source/AssemblyLineClient/equip/FrmMoveEquipForm.cs deleted 100644 → 0
using OnlineStore.DeviceLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OnlineStore.AssemblyLine
{
public partial class FrmMoveEquipForm : FrmEquipBaseForm
{
private MoveEquip equipBean;
public FrmMoveEquipForm( )
{
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
}
public FrmMoveEquipForm(MoveEquip moveEquip) : base(moveEquip)
{
equipBase = moveEquip;
this.equipBean = moveEquip;
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
}
}
}
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png

27.9 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png

61.4 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -56,16 +56,19 @@ ...@@ -56,16 +56,19 @@
// //
// lblName // lblName
// //
this.lblName.AutoSize = true;
this.lblName.BackColor = System.Drawing.Color.Transparent; this.lblName.BackColor = System.Drawing.Color.Transparent;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black; this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblName.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblName.Location = new System.Drawing.Point(3, 2); this.lblName.Location = new System.Drawing.Point(3, 2);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(182, 22); this.lblName.Size = new System.Drawing.Size(99, 22);
this.lblName.TabIndex = 1; this.lblName.TabIndex = 1;
this.lblName.Text = "移栽D1-1_1"; this.lblName.Text = "移栽D1-1_1";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblName.DoubleClick += new System.EventHandler(this.lblName_DoubleClick);
this.lblName.MouseEnter += new System.EventHandler(this.lblName_MouseEnter);
// //
// lblStatus // lblStatus
// //
...@@ -136,6 +139,8 @@ ...@@ -136,6 +139,8 @@
this.panName.Name = "panName"; this.panName.Name = "panName";
this.panName.Size = new System.Drawing.Size(246, 28); this.panName.Size = new System.Drawing.Size(246, 28);
this.panName.TabIndex = 7; this.panName.TabIndex = 7;
this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick);
this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter);
// //
// EquipControl // EquipControl
// //
......
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -41,26 +41,33 @@ namespace OnlineStore.AssemblyLine ...@@ -41,26 +41,33 @@ namespace OnlineStore.AssemblyLine
this.BackColor = value; this.BackColor = value;
} }
} }
public void SelectStyle()
{
panName.BackColor = Color.DeepSkyBlue;
}
public void UnSelectStyle()
{
panName.BackColor = Color.Transparent;
}
public void InitData(EquipBase equip) public void InitData(EquipBase equip)
{ {
if (equip is MoveEquip) if (equip is MoveEquip)
{ {
panName.BackColor = Color.DeepSkyBlue; //panName.BackColor = Color.DeepSkyBlue;
lblBox.Visible = true; lblBox.Visible = true;
lblBox.Text = ""; lblBox.Text = "";
} }
else if (equip is FeedingEquip) else if (equip is FeedingEquip)
{ {
panName.BackColor = Color.Lime; //panName.BackColor = Color.Lime;
panName.BackColor = Color.MediumSpringGreen; //panName.BackColor = Color.MediumSpringGreen;
lblBox.Visible = false ; lblBox.Visible = false ;
lblBox.Text = ""; lblBox.Text = "";
} }
else else
{ {
panName.BackColor = Color.Aqua; //panName.BackColor = Color.Aqua;
panName.BackColor = Color.DarkTurquoise; //panName.BackColor = Color.DarkTurquoise;
lblBox.Visible = false ; lblBox.Visible = false ;
lblBox.Text = ""; lblBox.Text = "";
} }
...@@ -179,6 +186,25 @@ namespace OnlineStore.AssemblyLine ...@@ -179,6 +186,25 @@ namespace OnlineStore.AssemblyLine
control.ShowData(equip); control.ShowData(equip);
return control; return control;
} }
private void lblName_DoubleClick(object sender, EventArgs e)
{
this.OnDoubleClick(e);
}
private void lblName_MouseEnter(object sender, EventArgs e)
{
this.OnMouseEnter(e);
}
private void panName_MouseEnter(object sender, EventArgs e)
{
this.OnMouseEnter(e);
}
private void panName_DoubleClick(object sender, EventArgs e)
{
this.OnDoubleClick(e);
}
} }
} }
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -162,10 +162,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -162,10 +162,11 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " BusyMoveProcess 出错：" + ex.ToString()); LogUtil.error(Name + " BusyMoveProcess 出错：" + ex.ToString());
} }
} }
protected void MoveTimeOut(string msg) protected void MoveTimeOut(LineMoveInfo move, string msg)
{ {
WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待移栽机构开始抓料超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; WarnMsg = move.Name + "[" + move.MoveStep + "] "+ msg + " [" + Math.Round(move.StepSpan().TotalSeconds, 1) + "]秒";
LogUtil.error(WarnMsg, DeviceID * 1000 + 30); int logId = DeviceID * 10000 + (int)move.MoveStep;
LogUtil.error(WarnMsg, logId);
Alarm(LineAlarmType.IoSingleTimeOut); Alarm(LineAlarmType.IoSingleTimeOut);
} }
protected void ClearTimeoutAlarm(string msg) protected void ClearTimeoutAlarm(string msg)
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -319,7 +319,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -319,7 +319,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (ScanCodeTask == null || ScanCodeTask.IsCompleted) if (ScanCodeTask == null || ScanCodeTask.IsCompleted)
{ {
ClearTimeoutAlarm("扫码执行结束超时"); ClearTimeoutAlarm("扫码结束超时");
MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake); MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端"); InLog("料盘移栽" + MoveInfo.SLog + "：上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
...@@ -327,9 +327,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -327,9 +327,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "] 扫码执行结束超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "扫码结束超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 30);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_21_CylinderTake)) else if (MoveInfo.IsStep(LineMoveStep.FI_21_CylinderTake))
...@@ -484,9 +482,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -484,9 +482,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsTimeOut(120)) else if (MoveInfo.IsTimeOut(120))
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "] 获取库位号超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "获取库位号超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 30);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_32_WaitTray))//TODO else if (MoveInfo.IsStep(LineMoveStep.FI_32_WaitTray))//TODO
...@@ -514,9 +510,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -514,9 +510,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsTimeOut(180)) else if (MoveInfo.IsTimeOut(180))
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待空托盘到达超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待空托盘到达超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_33_CylinderDown)) else if (MoveInfo.IsStep(LineMoveStep.FI_33_CylinderDown))
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary
private bool StartTrayOut(InOutParam outParam) internal bool StartTrayOut(InOutParam outParam)
{ {
if (outParam == null || outParam.PosId == null || outParam.PosId.Equals("")) if (outParam == null || outParam.PosId == null || outParam.PosId.Equals(""))
{ {
...@@ -715,9 +715,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -715,9 +715,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "] 等待给服务器发送afterPut完成超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待给服务器发送afterPut完成超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 21);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -376,24 +376,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -376,24 +376,24 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free)) else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
{ {
if (GetHyOutEquip().MoveInfo.MoveType.Equals(LineMoveType.None)) HYEquipBase hyout = GetHyOutEquip();
if (hyout.MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready); MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待HY" + HyOutDeviceId + " 准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待" + hyout.Name + " 准备完成(顶升上升，定位下降) ");
GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture); GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待横移出口可以横移超时"); ClearTimeoutAlarm("等待"+ hyout .Name+ "可以横移超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待横移出口可以横移超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待" + hyout.Name + "可以横移超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready)) else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready))
{ {
bool result = GetHyOutEquip().MoveInfo.MoveStep >= LineMoveStep.HY54_HY2Ready; HYEquipBase hyout = GetHyOutEquip();
bool result = hyout.MoveInfo.MoveStep >= LineMoveStep.HY54_HY2Ready;
if (result) if (result)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY14_HYLineRun); MoveInfo.NextMoveStep(LineMoveStep.HY14_HYLineRun);
...@@ -401,13 +401,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -401,13 +401,12 @@ namespace OnlineStore.DeviceLibrary
LineRun(MoveInfo); LineRun(MoveInfo);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
ClearTimeoutAlarm("等待横移出口顶升上升完成超时"); ClearTimeoutAlarm("等待"+ hyout .Name+ "顶升上升完成超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待横移出口顶升上升完成超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待" + hyout.Name + "顶升上升完成超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
...@@ -418,23 +417,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -418,23 +417,23 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck)) else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
{ {
bool result = GetHyOutEquip().MoveInfo.MoveStep >= LineMoveStep.HY55_WaitTrayCheck; HYEquipBase hyout = GetHyOutEquip();
bool result = hyout.MoveInfo.MoveStep >= LineMoveStep.HY55_WaitTrayCheck;
if (result) if (result)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2); MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达HY" + HyOutDeviceId + "持续一段时间 "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达" + hyout.Name + "持续一段时间 ");
ClearTimeoutAlarm("等待托盘到达横移出口超时"); ClearTimeoutAlarm("等待托盘到达"+ hyout .Name+ "超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待托盘到达横移出口超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待托盘到达" + hyout.Name + "超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2)) else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2))
{ {
bool result = GetHyOutEquip().MoveInfo.MoveStep >= LineMoveStep.HY56_CheckWait; HYEquipBase hyout = GetHyOutEquip();
bool result = hyout.MoveInfo.MoveStep >= LineMoveStep.HY56_CheckWait;
if (result) if (result)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY17_TopDown); MoveInfo.NextMoveStep(LineMoveStep.HY17_TopDown);
...@@ -443,13 +442,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -443,13 +442,11 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
HY_StopCylinderUp(MoveInfo); HY_StopCylinderUp(MoveInfo);
OL_StopCylinderUp(MoveInfo); OL_StopCylinderUp(MoveInfo);
ClearTimeoutAlarm("等待托盘到达横移出口"); ClearTimeoutAlarm("等待托盘到达"+ hyout .Name+ "");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待托盘到达横移出口[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待托盘到达" + hyout.Name + "");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY17_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.HY17_TopDown))
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -311,9 +311,32 @@ namespace OnlineStore.DeviceLibrary ...@@ -311,9 +311,32 @@ namespace OnlineStore.DeviceLibrary
{ {
if (TrayNeedSL(currTrayNum)) if (TrayNeedSL(currTrayNum))
{ {
//如果是出库，且盘高大于30，暂不顶升 FeedingEquip feed = LineManager.Line.FeedingEquipMap[Config.WorkDevice];
MoveInfo.NextMoveStep(LineMoveStep.HY08_SL_WaitProcessReel); if (feed.Config.IsCanOut.Equals(1))
CheckLog("托盘阻挡" + MoveInfo.SLog + " 等待料盘放入或料盘离开 "); {
//紧急出料
if (feed.StartTrayOut(MoveInfo.MoveParam))
{
MoveInfo.NextMoveStep(LineMoveStep.HY08_SL_WaitProcessReel);
CheckLog("托盘阻挡" + MoveInfo.SLog + " " + feed.Name + "始抓料，等待料盘放入或料盘离开 ");
}
else if (MoveInfo.IsTimeOut(30))
{
MoveTimeOut(MoveInfo, "等待"+ feed .Name+ "开始出库超时");
//如果当前无料串，或者料串已离开，直接放行 托盘
TrayCanLeave();
}
else if (MoveInfo.IsTimeOut(20))
{
MoveTimeOut(MoveInfo, "等待" + feed.Name + "开始出库超时");
}
}
else
{
//如果是出库，且盘高大于30，暂不顶升
MoveInfo.NextMoveStep(LineMoveStep.HY08_SL_WaitProcessReel);
CheckLog("托盘阻挡" + MoveInfo.SLog + " 等待料盘放入或料盘离开 ");
}
} }
else else
{ {
...@@ -331,37 +354,35 @@ namespace OnlineStore.DeviceLibrary ...@@ -331,37 +354,35 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free)) else if (MoveInfo.IsStep(LineMoveStep.HY12_WaitHY2Free))
{ {
if (GetHyOutEquip().MoveInfo.MoveType.Equals(LineMoveType.None)) HYEquipBase hyOut = GetHyOutEquip();
if (hyOut.MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready); MoveInfo.NextMoveStep(LineMoveStep.HY13_WaitHY2Ready);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待HY"+ HyOutDeviceId + "准备完成(顶升上升，定位下降) "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待"+ hyOut.Name + "准备完成(顶升上升，定位下降) ");
GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture); GetHyOutEquip().MoveInfo.NewMove(LineMoveType.CheckFixture);
GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree); GetHyOutEquip().MoveInfo.NextMoveStep(LineMoveStep.HY51_WaitFree);
ClearTimeoutAlarm("等待横移出口可以横移超时"); ClearTimeoutAlarm("等待"+ hyOut .Name+ "可以横移超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待横移出口可以横移超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待" + hyOut.Name + "可以横移超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready)) else if (MoveInfo.IsStep(LineMoveStep.HY13_WaitHY2Ready))
{ {
bool result = GetHyOutEquip().MoveInfo.MoveStep >= LineMoveStep.HY54_HY2Ready; HYEquipBase hyOut = GetHyOutEquip();
bool result = hyOut.MoveInfo.MoveStep >= LineMoveStep.HY54_HY2Ready;
if (result) if (result)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY14_HYLineRun); MoveInfo.NextMoveStep(LineMoveStep.HY14_HYLineRun);
CheckLog("托盘横移" + MoveInfo.SLog + " ，横移电机转动 "); CheckLog("托盘横移" + MoveInfo.SLog + " ，横移电机转动 ");
LineRun(MoveInfo); LineRun(MoveInfo);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
ClearTimeoutAlarm("等待横移出口顶升上升完成超时"); ClearTimeoutAlarm("等待"+ hyOut + "顶升上升完成超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待横移出口顶升上升完成超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待"+ hyOut + "顶升上升完成超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
...@@ -372,23 +393,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,23 +393,23 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck)) else if (MoveInfo.IsStep(LineMoveStep.HY15_WaitOutCheck))
{ {
bool result = GetHyOutEquip().MoveInfo.MoveStep >= LineMoveStep.HY55_WaitTrayCheck; HYEquipBase hyOut = GetHyOutEquip();
bool result = hyOut.MoveInfo.MoveStep >= LineMoveStep.HY55_WaitTrayCheck;
if (result) if (result)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2); MoveInfo.NextMoveStep(LineMoveStep.HY16_WatOutFixture2);
CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达HY" + HyOutDeviceId + " 持续一段时间 "); CheckLog("托盘横移" + MoveInfo.SLog + " ，等待托盘到达" + hyOut.Name + " 持续一段时间 ");
ClearTimeoutAlarm("等待托盘到达横移出口超时"); ClearTimeoutAlarm("等待托盘到达"+ hyOut .Name+ "超时");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待托盘到达横移出口超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待托盘到达"+ hyOut .Name+ "超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2)) else if (MoveInfo.IsStep(LineMoveStep.HY16_WatOutFixture2))
{ {
bool result = GetHyOutEquip().MoveInfo.MoveStep >= LineMoveStep.HY56_CheckWait; HYEquipBase hyOut = GetHyOutEquip();
bool result = hyOut.MoveInfo.MoveStep >= LineMoveStep.HY56_CheckWait;
if (result) if (result)
{ {
MoveInfo.NextMoveStep(LineMoveStep.HY17_TopDown); MoveInfo.NextMoveStep(LineMoveStep.HY17_TopDown);
...@@ -396,13 +417,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -396,13 +417,11 @@ namespace OnlineStore.DeviceLibrary
LineStop(MoveInfo); LineStop(MoveInfo);
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
LocationCylinderDown(MoveInfo); LocationCylinderDown(MoveInfo);
ClearTimeoutAlarm("等待托盘到达横移出口"); ClearTimeoutAlarm("等待托盘到达"+ hyOut .Name+ "");
} }
else if (MoveInfo.IsTimeOut()) else if (MoveInfo.IsTimeOut())
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待托盘到达横移出口[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待托盘到达" + hyOut.Name + "");
LogUtil.error(WarnMsg, DeviceID * 1000 + 22);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.HY17_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.HY17_TopDown))
...@@ -539,11 +558,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -539,11 +558,11 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
//判断T3是否在入库等待托盘 //判断上料T是否在入库等待托盘
FeedingEquip feedT3 = LineManager.Line.FeedingEquipMap[Config.WorkDevice]; FeedingEquip feedT = LineManager.Line.FeedingEquipMap[Config.WorkDevice];
if (feedT3.CurrTrayIsNeed(currTrayNum, false)) if (feedT.CurrTrayIsNeed(currTrayNum, false))
{ {
LogInfo(" " + feedT3.Name + "拦截托盘【" + currTrayNum + "】"); LogInfo(" " + feedT.Name + "拦截托盘【" + currTrayNum + "】");
return true; return true;
} }
} }
...@@ -554,7 +573,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -554,7 +573,7 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
internal override bool TrayIsReady() internal override bool TrayIsReady()
{ {
if (Config.IsSideWayIn.Equals(1)) if (Config.IsSideWayIn.Equals(1))
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -192,16 +192,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -192,16 +192,12 @@ namespace OnlineStore.DeviceLibrary
} }
else if (SecondMoveInfo.IsTimeOut()) else if (SecondMoveInfo.IsTimeOut())
{ {
WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待移栽机构开始抓料超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(SecondMoveInfo, "等待移栽机构开始抓料超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 30);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (SecondMoveInfo.IsTimeOut()) else if (SecondMoveInfo.IsTimeOut())
{ {
WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待移栽机构开始抓料超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(SecondMoveInfo, "等待移栽机构开始抓料超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 30);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_10_ReelProEnd)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_10_ReelProEnd))
...@@ -556,9 +552,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -556,9 +552,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]等待 给服务器发送afterPutCutTask完成 " + "超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待给服务器发送afterPutCutTask完成");
LogUtil.error(WarnMsg, DeviceID * 1000 + 20);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
......
source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs
...@@ -16,7 +16,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,7 +16,7 @@ namespace OnlineStore.DeviceLibrary
private bool T3C1_Pro = false; private bool T3C1_Pro = false;
private DateTime T3C1_ProTime = DateTime.Now; private DateTime T3C1_ProTime = DateTime.Now;
private static LineMoveInfo T3C1_MoveInfo = null; private static LineMoveInfo T3C1_MoveInfo = null;
internal int T3C1_TrayNum = 0; public int T3C1_TrayNum = 0;
private void Update_T3C1_TrayNum() private void Update_T3C1_TrayNum()
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -220,9 +220,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -220,9 +220,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsTimeOut(180)) else if (MoveInfo.IsTimeOut(180))
{ {
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.SLog + "]等待空托盘到达超时[" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒"; MoveTimeOut(MoveInfo, "等待空托盘到达超时");
LogUtil.error(WarnMsg, DeviceID * 1000 + 12);
Alarm(LineAlarmType.IoSingleTimeOut);
return false; return false;
} }
return false; return false;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!