Skip to content

孙克 / RC1250-AssemblyLine

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

状态显示修改

1 个父辈 ad2c340d
内嵌 并排
正在显示 12 个修改的文件 包含 137 行增加 和 126 行删除
source/AssemblyLineClient/FrmDischargeLine.cs
......@@ -79,6 +79,22 @@ namespace OnlineStore.AssemblyLine
ReadIOList();
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
if (equipBean.runStatus > LineRunStatus.Wait)
{
lblName.BackColor = Color.Green;
if (btnStart.Enabled)
{
FormStatus(true);
}
}
else
{
lblName.BackColor = System.Drawing.Color.DodgerBlue;
if (!btnStart.Enabled)
{
FormStatus(false);
}
}
lblMoveInfo.Text = equipBean.GetMoveStr();
// string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) ;
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -57,11 +57,10 @@
this.btnStart = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button();
this.btnReset = new System.Windows.Forms.Button();
this.btnInStore = new System.Windows.Forms.Button();
this.btnOutStore = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblwidth = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblAgvInfo = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label();
......@@ -94,7 +93,6 @@
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.lblName = new System.Windows.Forms.Label();
this.btnScan = new System.Windows.Forms.Button();
this.lblwidth = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -567,7 +565,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(881, 15);
this.chbDebug.Location = new System.Drawing.Point(651, 15);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -595,7 +593,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(1065, 17);
this.lblStoreStatus.Location = new System.Drawing.Point(835, 17);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -642,32 +640,6 @@
this.btnReset.UseVisualStyleBackColor = false;
this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
//
// btnInStore
//
this.btnInStore.BackColor = System.Drawing.Color.White;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(650, 5);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(110, 40);
this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false;
this.btnInStore.Click += new System.EventHandler(this.btnInStore_Click);
//
// btnOutStore
//
this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(535, 5);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false;
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
//
// tabControl1
//
this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
......@@ -709,6 +681,17 @@
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
//
// lblwidth
//
this.lblwidth.AutoSize = true;
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblwidth.Location = new System.Drawing.Point(248, 78);
this.lblwidth.Name = "lblwidth";
this.lblwidth.Size = new System.Drawing.Size(92, 17);
this.lblwidth.TabIndex = 279;
this.lblwidth.Text = "当前料盘宽度：";
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
......@@ -1105,9 +1088,7 @@
this.panel1.Controls.Add(this.btnScan);
this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.lblStoreStatus);
this.panel1.Controls.Add(this.btnOutStore);
this.panel1.Controls.Add(this.btnStart);
this.panel1.Controls.Add(this.btnInStore);
this.panel1.Controls.Add(this.btnStop);
this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(2, 1);
......@@ -1119,7 +1100,7 @@
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(971, 15);
this.chbMoveStop.Location = new System.Drawing.Point(741, 15);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 250;
......@@ -1144,7 +1125,7 @@
this.btnScan.BackColor = System.Drawing.Color.White;
this.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScan.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScan.Location = new System.Drawing.Point(765, 5);
this.btnScan.Location = new System.Drawing.Point(534, 5);
this.btnScan.Name = "btnScan";
this.btnScan.Size = new System.Drawing.Size(110, 40);
this.btnScan.TabIndex = 248;
......@@ -1152,17 +1133,6 @@
this.btnScan.UseVisualStyleBackColor = false;
this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
//
// lblwidth
//
this.lblwidth.AutoSize = true;
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblwidth.Location = new System.Drawing.Point(248, 78);
this.lblwidth.Name = "lblwidth";
this.lblwidth.Size = new System.Drawing.Size(92, 17);
this.lblwidth.TabIndex = 279;
this.lblwidth.Text = "当前料盘宽度：";
//
// FrmFeedingEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -1225,8 +1195,6 @@
private System.Windows.Forms.Button btnStart;
private System.Windows.Forms.Button btnStop;
private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.Button btnInStore;
private System.Windows.Forms.Button btnOutStore;
private System.Windows.Forms.CheckBox chbDebug;
private System.Windows.Forms.Button btnOutTopCylinder;
private System.Windows.Forms.Button btnLocationCylinder;
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -108,10 +108,18 @@ namespace OnlineStore.AssemblyLine
if (equipBean.runStatus > LineRunStatus.Wait)
{
lblName.BackColor = Color.Green;
if (btnStart.Enabled)
{
FormStatus(true);
}
}
else
{
lblName.BackColor= System.Drawing.Color.DodgerBlue;
if (!btnStart.Enabled)
{
FormStatus(false );
}
}
lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
......@@ -274,9 +282,7 @@ namespace OnlineStore.AssemblyLine
{
btnStart.Enabled = !isStart;
btnStop.Enabled = true;
btnReset.Enabled = isStart;
btnInStore.Enabled = isStart;
btnOutStore.Enabled = isStart;
btnReset.Enabled = isStart;
}
private void FrmIOStatus_Shown(object sender, EventArgs e)
{
......@@ -337,29 +343,7 @@ namespace OnlineStore.AssemblyLine
}
}
private void btnOutStore_Click(object sender, EventArgs e)
{
if (equipBean.runStatus.Equals(LineRunStatus.Runing))
{
equipBean.StartOutStoreMove(new InOutParam());
}
else
{
MessageBox.Show("未启动或不在空闲中，无法入库测试！");
}
}
private void btnInStore_Click(object sender, EventArgs e)
{
if (equipBean.runStatus.Equals(LineRunStatus.Runing))
{
equipBean.StartInStoreMove(new InOutParam());
}
else
{
MessageBox.Show("未启动或不在空闲中，无法入库测试！");
}
}
private void btnLocationCylinder_Click(object sender, EventArgs e)
{
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -34,6 +34,7 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btnTrayInfo = new System.Windows.Forms.Button();
this.lblCID = new System.Windows.Forms.Label();
this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.chkDebug = new System.Windows.Forms.CheckBox();
......@@ -79,7 +80,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnTrayInfo = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
......@@ -146,6 +146,19 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "状态信息";
//
// btnTrayInfo
//
this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(445, 26);
this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195;
this.btnTrayInfo.Text = "托盘信息";
this.btnTrayInfo.UseVisualStyleBackColor = false;
this.btnTrayInfo.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// lblCID
//
this.lblCID.AutoSize = true;
......@@ -173,11 +186,11 @@
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(755, 32);
this.chkDebug.Location = new System.Drawing.Point(781, 31);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(76, 24);
this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194;
this.chkDebug.Text = "DEBUG";
this.chkDebug.Text = "debug";
this.chkDebug.UseVisualStyleBackColor = true;
//
// btnClearLog
......@@ -185,7 +198,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(635, 27);
this.btnClearLog.Location = new System.Drawing.Point(669, 26);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190;
......@@ -198,7 +211,7 @@
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(515, 27);
this.btnCopyLog.Location = new System.Drawing.Point(557, 26);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191;
......@@ -217,12 +230,13 @@
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(460, 85);
this.groupBox1.Location = new System.Drawing.Point(460, 84);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(860, 78);
this.groupBox1.TabIndex = 195;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "料仓通信测试";
this.groupBox1.Visible = false;
//
// lblPosId
//
......@@ -321,9 +335,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(460, 169);
this.logBox.Location = new System.Drawing.Point(460, 85);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(860, 433);
this.logBox.Size = new System.Drawing.Size(860, 517);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
//
......@@ -558,19 +572,6 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnTrayInfo
//
this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(401, 26);
this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195;
this.btnTrayInfo.Text = "托盘信息";
this.btnTrayInfo.UseVisualStyleBackColor = false;
this.btnTrayInfo.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// FrmLineStore
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -581,7 +581,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1315, 466);
this.tabPage2.Size = new System.Drawing.Size(1315, 479);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true;
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -107,6 +107,22 @@ namespace OnlineStore.AssemblyLine
ReadIOList();
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
if (equipBean.runStatus > LineRunStatus.Wait)
{
lblName.BackColor = Color.Green;
if (btnStart.Enabled)
{
FormStatus(true);
}
}
else
{
lblName.BackColor = System.Drawing.Color.DodgerBlue;
if (!btnStart.Enabled)
{
FormStatus(false);
}
}
lblMoveInfo.Text = equipBean.GetMoveStr();
string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库" : "不可出库";
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) + "(" + canOut + ")";
......@@ -308,6 +324,7 @@ namespace OnlineStore.AssemblyLine
{
if (equipBean.runStatus.Equals(LineRunStatus.Runing))
{
LogUtil.info(equipBean.Name + "点击：出库测试");
equipBean.StartOutStoreMove(new InOutParam());
}
else
......@@ -320,6 +337,7 @@ namespace OnlineStore.AssemblyLine
{
if (equipBean.runStatus.Equals(LineRunStatus.Runing))
{
LogUtil.info(equipBean.Name + "点击：入库测试");
equipBean.StartInStoreMove(new InOutParam());
}
else
......
source/AssemblyLineClient/FrmProvidingEquip.cs
......@@ -105,7 +105,22 @@ namespace OnlineStore.AssemblyLine
ReadIOList();
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
if (equipBean.runStatus > LineRunStatus.Wait)
{
lblName.BackColor = Color.Green;
if (btnStart.Enabled)
{
FormStatus(true);
}
}
else
{
lblName.BackColor = System.Drawing.Color.DodgerBlue;
if (!btnStart.Enabled)
{
FormStatus(false);
}
}
lblMoveInfo.Text = equipBean.GetMoveStr();
// string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) ;
......@@ -290,7 +305,8 @@ namespace OnlineStore.AssemblyLine
private void btnOutStore_Click(object sender, EventArgs e)
{
if (equipBean.runStatus .Equals(LineRunStatus.Runing))
{
{
LogUtil.info(equipBean.Name + "点击：出料测试");
equipBean.StartOutStoreMove(new InOutParam( ));
}
else
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -897,7 +897,10 @@ namespace OnlineStore.DeviceLibrary
if (Config.IsCanOut.Equals(1))
{
//此托盘是紧急出料盘，需要通过料架出库
if (info.EmergencyOut && info.IsFull && runStatus.Equals(LineRunStatus.Runing))
bool debugNeed = IsDebug && runStatus >= LineRunStatus.HomeMoving;
bool isJinji = info.EmergencyOut && info.IsFull && runStatus >= LineRunStatus.HomeMoving;
if (debugNeed || isJinji )
{
if (checkAndMove)
{
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -16,12 +16,12 @@ namespace OnlineStore.DeviceLibrary
public override bool StartOutStoreMove(InOutParam param)
{
string posId = param != null ? param.PosId : "";
//调试模式移栽装置不需要有操作
if (IsDebug)
{
LogInfo("需要出库【" + posId + "】处于调试模式，暂时不再进行出入库操作");
return false;
}
////调试模式移栽装置不需要有操作
//if (IsDebug)
//{
// LogInfo("需要出库【" + posId + "】处于调试模式，暂时不再进行出入库操作");
// return false;
//}
if (param.Equals(null))
{
LogUtil.error(Name + "出库【" + posId + "】失败，param=null");
......@@ -163,12 +163,12 @@ namespace OnlineStore.DeviceLibrary
public override bool StartInStoreMove(InOutParam param)
{
string posId = param != null ? param.PosId : "";
//调试模式移栽装置不需要有操作
if (IsDebug)
{
LogInfo("需要入库【" + posId + "】处于调试模式，暂时不再进行出入库操作");
return false ;
}
////调试模式移栽装置不需要有操作
//if (IsDebug)
//{
// LogInfo("需要入库【" + posId + "】处于调试模式，暂时不再进行出入库操作");
// return false ;
//}
if (runStatus.Equals(LineRunStatus.Runing))
{
runStatus = LineRunStatus.Busy;
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
......@@ -214,11 +214,11 @@ namespace OnlineStore.DeviceLibrary
{
string posId = param != null ? param.PosId : "";
//调试模式移栽装置不需要有操作
if (IsDebug)
{
LogInfo("需要出料【" + posId + "】处于调试模式，暂时不再进行出出料操作");
return false;
}
//if (IsDebug)
//{
// LogInfo("需要出料【" + posId + "】处于调试模式，暂时不再进行出出料操作");
// return false;
//}
if (runStatus.Equals(LineRunStatus.Runing))
{
runStatus = LineRunStatus.Busy;
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
......@@ -256,7 +256,12 @@ namespace OnlineStore.DeviceLibrary
if (equip.IsDebug || equip.runStatus <= LineRunStatus.Wait)
{
return true;
}
}
if (swNum.Equals(2) && equip.alarmType.Equals(LineAlarmType.None).Equals(false))
{
//上料3如果报警，可以直接处理移栽
return true;
}
}
}
foreach (ProvidingEquip equip in LineManager.Line.ProvidingEquipMap.Values)
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
......@@ -186,16 +186,16 @@ namespace OnlineStore.DeviceLibrary
{
cc = HDCodeHelper.DecodeCode(ho_Image, 1, GetCodeParamFilePath(codeType), codeType);
}
if (cc.Count > 0)
//if (cc.Count > 0)
//{
string r = "";
foreach (CodeInfo c in cc)
{
string r = "";
foreach (CodeInfo c in cc)
{
codeList.Add(c.CodeStr);
r = r + "##" + c.CodeStr;
}
LogUtil.info(" 【" + cameraName + "】【" + codeType + "】扫码完成："+r);
codeList.Add(c.CodeStr);
r = r + "##" + c.CodeStr;
}
LogUtil.info(" 【" + cameraName + "】【" + codeType + "】扫码完成：" + r);
//}
}
bitmap.Dispose();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!