Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4e882e84 由 张东亮
选项

连续出工单问题优化

1 个父辈 29cf234f
内嵌 并排
正在显示 6 个修改的文件 包含 151 行增加 和 85 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs
......@@ -807,6 +807,61 @@ namespace OnlineStore.DeviceLibrary
dtUpperB = DateTime.Now;
}
}
/// <summary>
/// 获取指定面的出库任务
/// </summary>
/// <param name="sideA"></param>
/// <param name="param"></param>
/// <returns></returns>
bool GetOutInOutParam(bool sideA,out InOutParam param)
{
param = null;
try
{
if (sideA)//A面
{
var pos = waitAOutStoreList.First();
if(!string.IsNullOrEmpty(CurHSerial))
{
if(CurHSerial.Equals(pos.PosInfo.hSerial))
{
return waitAOutStoreList.TryDequeue(out param);
}
else
{
if(CheckBOutDoor())
{
return waitAOutStoreList.TryDequeue(out param);
}
}
}
}
else
{
var pos = waitBOutStoreList.First();
if (!string.IsNullOrEmpty(CurHSerial))
{
if (CurHSerial.Equals(pos.PosInfo.hSerial))
{
return waitBOutStoreList.TryDequeue(out param);
}
else
{
if (CheckAOutDoor())
{
return waitBOutStoreList.TryDequeue(out param);
}
}
}
}
}catch(Exception ex)
{
LogUtil.error($"GetOutInOutParam error [{sideA}]",ex);
}
return false;
}
private void ExecuteOutListProcess()
{
try
......@@ -831,7 +886,7 @@ namespace OnlineStore.DeviceLibrary
else if (CheckAOutDoor())
{
InOutParam param = null;
bool result = waitAOutStoreList.TryDequeue(out param);
bool result = GetOutInOutParam(true,out param);
if (result && param != null)
{
LogInfo("执行A面排队的出库【" + param.PosInfo.ToStr() + "】");
......@@ -856,7 +911,7 @@ namespace OnlineStore.DeviceLibrary
else if (CheckBOutDoor())
{
InOutParam param = null;
bool result = waitBOutStoreList.TryDequeue(out param);
bool result = GetOutInOutParam(false,out param);
if (result && param != null)
{
LogInfo("执行B面排队的出库【" + param.PosInfo.ToStr() + "】");
......@@ -963,7 +1018,7 @@ namespace OnlineStore.DeviceLibrary
msg += "runStatus： " + runStatus + "\n";
msg += "runStep： " + MoveInfo.MoveStep + "\n";
msg += "alarm： " + alarmType + "\n";
msg += "hSerial： " + CurHSerial + "\n";
return msg;
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs
......@@ -15,6 +15,11 @@ namespace OnlineStore.DeviceLibrary
{
partial class BoxEquip
{
/// <summary>
/// 当前需求单号
/// </summary>
public string CurHSerial = "";
/// <summary>
/// 料盘放到出料口成功，并将料盘信息写入该口
/// </summary>
......@@ -184,7 +189,7 @@ namespace OnlineStore.DeviceLibrary
{
if (waitBOutStoreList.Count > 0 && CheckBOutDoor())
{
if (waitBOutStoreList.TryDequeue(out InOutParam inOutParam))//B面料叉空且B面出料口无料，有出库任务
if (GetOutInOutParam(false,out InOutParam inOutParam))//B面料叉空且B面出料口无料，有出库任务
{
MoveInfo.NextMoveStep(StepEnum.SO_01_PullAxis_Ready);
LogInfo($"存储机构-出库 {MoveInfo.SLog}：A面切换到B面，B面取料[{inOutParam.PosInfo.barcode}]");
......@@ -201,7 +206,7 @@ namespace OnlineStore.DeviceLibrary
{
if (waitAOutStoreList.Count > 0 && CheckAOutDoor())
{
if (waitAOutStoreList.TryDequeue(out InOutParam inOutParam))
if (GetOutInOutParam(true,out InOutParam inOutParam))
{
MoveInfo.NextMoveStep(StepEnum.SO_01_PullAxis_Ready);
LogInfo($"存储机构-出库 {MoveInfo.SLog}：B面切换到A面，A面取料[{inOutParam.PosInfo.barcode}]");
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
......@@ -1172,6 +1172,7 @@ namespace OnlineStore.DeviceLibrary
param.MoveP = new LineMoveP(Config, param.PosInfo.PosId);
SetBoxStatus(DeviceStatus.OutStoreExecute, RunStatus.Busy, param.PosInfo.PosId, param.PosInfo.barcode);
MoveInfo.NewMove(MoveType.OutStore, param);
CurHSerial = param.PosInfo.hSerial;
LogInfo("启动出库【" + param.PosInfo.ToStr() + "】 ");
///开始记录
StartRecord();
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs
......@@ -524,7 +524,7 @@ namespace OnlineStore.DeviceLibrary
}
}
internal bool ShelfReadyOut(InOutPosInfo posInfo = null, bool SendShelfOut = false)
internal bool ReelReadyOut(InOutPosInfo posInfo = null, bool SendShelfOut = false)
{
if (MoveInfo.MoveType.Equals(MoveType.OutStore) && MoveInfo.IsStep(StepEnum.IS11_ShelfReady))
{
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
......@@ -9,6 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Web.UI.WebControls;
namespace OnlineStore.DeviceLibrary
{
......@@ -403,14 +404,17 @@ namespace OnlineStore.DeviceLibrary
}
else
{
//如果有物料且不能放料，需要送一个料串离开
if (BufferDataManager.AOutStoreInfo != null)
{
CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.UnderArea_Check_A, BatchMoveList, true);
}
else if (BufferDataManager.BOutStoreInfo != null)
//如果两侧都有物料且不能放料，需要送一个料串离开
if (BufferDataManager.AOutStoreInfo != null && BufferDataManager.BOutStoreInfo != null)
{
CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, IO_Type.UnderArea_Check_B, BatchMoveList, true);
if(!CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.UnderArea_Check_A, BatchMoveList, true))
{
if(!CheckStartOutPos("B下暂存区", BufferDataManager.BOutStoreInfo, IO_Type.UnderArea_Check_B, BatchMoveList, true))
{
LogUtil.error(Name + "A下和B下均有料，但没有合适处理");
}
}
}
}
......@@ -452,7 +456,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo($"当前{moveBean.Name}料串的 hSerial:{curhSerial}，与{posType}料盘{posInfo.barcode}的工单hSerial:{posInfo.hSerial}不符 [{shelfAutoLeave}]");
moveBean.ShelfNeedLeave = true;
}
else if (moveBean.ShelfReadyOut(posInfo, shelfAutoLeave))
else if (moveBean.ReelReadyOut(posInfo, shelfAutoLeave))
{
InOutParam param = new InOutParam(posInfo.ToCopy());
param.ShelfType = moveBean.ShelfType;
......
source/XLRStoreClient/boxForm/FrmAutoFindPos.Designer.cs
......@@ -65,6 +65,7 @@
this.txtDrawerColumns = new System.Windows.Forms.TextBox();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnOpenImg = new System.Windows.Forms.Button();
this.cmbColor = new System.Windows.Forms.ComboBox();
this.btnPullUpdwnToPos1 = new System.Windows.Forms.Button();
this.btnMoveAxisToPos1 = new System.Windows.Forms.Button();
......@@ -113,7 +114,6 @@
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnOpenImg = new System.Windows.Forms.Button();
this.tableLayoutPanel1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
......@@ -164,10 +164,10 @@
this.tabPage1.Controls.Add(this.groupBox5);
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(786, 314);
this.tabPage1.Size = new System.Drawing.Size(786, 311);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "参数设置";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -190,7 +190,7 @@
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(23, 165);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(43, 17);
this.label8.Size = new System.Drawing.Size(53, 20);
this.label8.TabIndex = 10;
this.label8.Text = "label8";
//
......@@ -252,7 +252,7 @@
//
this.txtCoofY.Location = new System.Drawing.Point(237, 168);
this.txtCoofY.Name = "txtCoofY";
this.txtCoofY.Size = new System.Drawing.Size(100, 23);
this.txtCoofY.Size = new System.Drawing.Size(100, 27);
this.txtCoofY.TabIndex = 24;
this.txtCoofY.Text = "100";
this.txtCoofY.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -262,7 +262,7 @@
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(6, 177);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(235, 17);
this.label15.Size = new System.Drawing.Size(291, 20);
this.label15.TabIndex = 25;
this.label15.Text = "Y方向系数（Mark点Y轴->料屉升降轴）：";
//
......@@ -271,7 +271,7 @@
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(209, 46);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(80, 17);
this.label13.Size = new System.Drawing.Size(99, 20);
this.label13.TabIndex = 23;
this.label13.Text = "抽屉开始列：";
//
......@@ -279,7 +279,7 @@
//
this.txtStartCol.Location = new System.Drawing.Point(295, 43);
this.txtStartCol.Name = "txtStartCol";
this.txtStartCol.Size = new System.Drawing.Size(100, 23);
this.txtStartCol.Size = new System.Drawing.Size(100, 27);
this.txtStartCol.TabIndex = 22;
this.txtStartCol.Text = "2";
this.txtStartCol.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -288,7 +288,7 @@
//
this.txtCoffX.Location = new System.Drawing.Point(237, 135);
this.txtCoffX.Name = "txtCoffX";
this.txtCoffX.Size = new System.Drawing.Size(100, 23);
this.txtCoffX.Size = new System.Drawing.Size(100, 27);
this.txtCoffX.TabIndex = 22;
this.txtCoffX.Text = "100";
this.txtCoffX.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -298,7 +298,7 @@
this.label16.AutoSize = true;
this.label16.Location = new System.Drawing.Point(6, 141);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(225, 17);
this.label16.Size = new System.Drawing.Size(278, 20);
this.label16.TabIndex = 23;
this.label16.Text = "X方向系数（Mark点X轴->行走机构）：";
//
......@@ -306,7 +306,7 @@
//
this.txtRowSpacing.Location = new System.Drawing.Point(216, 106);
this.txtRowSpacing.Name = "txtRowSpacing";
this.txtRowSpacing.Size = new System.Drawing.Size(100, 23);
this.txtRowSpacing.Size = new System.Drawing.Size(100, 27);
this.txtRowSpacing.TabIndex = 16;
this.txtRowSpacing.Text = "1";
this.txtRowSpacing.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -316,7 +316,7 @@
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(59, 108);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(140, 17);
this.label12.Size = new System.Drawing.Size(174, 20);
this.label12.TabIndex = 17;
this.label12.Text = "抽屉列间距（脉冲值）：";
//
......@@ -324,7 +324,7 @@
//
this.txtColumnSpacing.Location = new System.Drawing.Point(216, 77);
this.txtColumnSpacing.Name = "txtColumnSpacing";
this.txtColumnSpacing.Size = new System.Drawing.Size(100, 23);
this.txtColumnSpacing.Size = new System.Drawing.Size(100, 27);
this.txtColumnSpacing.TabIndex = 18;
this.txtColumnSpacing.Text = "1";
this.txtColumnSpacing.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -334,7 +334,7 @@
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(60, 80);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(140, 17);
this.label11.Size = new System.Drawing.Size(174, 20);
this.label11.TabIndex = 19;
this.label11.Text = "抽屉层间距（脉冲值）：";
//
......@@ -343,7 +343,7 @@
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(5, 46);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(80, 17);
this.label14.Size = new System.Drawing.Size(99, 20);
this.label14.TabIndex = 23;
this.label14.Text = "抽屉开始层：";
//
......@@ -351,7 +351,7 @@
//
this.txtStartRow.Location = new System.Drawing.Point(91, 43);
this.txtStartRow.Name = "txtStartRow";
this.txtStartRow.Size = new System.Drawing.Size(100, 23);
this.txtStartRow.Size = new System.Drawing.Size(100, 27);
this.txtStartRow.TabIndex = 22;
this.txtStartRow.Text = "1";
this.txtStartRow.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -361,7 +361,7 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(5, 19);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(80, 17);
this.label1.Size = new System.Drawing.Size(99, 20);
this.label1.TabIndex = 1;
this.label1.Text = "抽屉所在层：";
//
......@@ -369,7 +369,7 @@
//
this.txtCurRow.Location = new System.Drawing.Point(91, 16);
this.txtCurRow.Name = "txtCurRow";
this.txtCurRow.Size = new System.Drawing.Size(100, 23);
this.txtCurRow.Size = new System.Drawing.Size(100, 27);
this.txtCurRow.TabIndex = 0;
this.txtCurRow.Text = "1";
this.txtCurRow.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -379,7 +379,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(209, 19);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(80, 17);
this.label2.Size = new System.Drawing.Size(99, 20);
this.label2.TabIndex = 3;
this.label2.Text = "抽屉所在列：";
//
......@@ -387,7 +387,7 @@
//
this.txtCurCol.Location = new System.Drawing.Point(295, 16);
this.txtCurCol.Name = "txtCurCol";
this.txtCurCol.Size = new System.Drawing.Size(100, 23);
this.txtCurCol.Size = new System.Drawing.Size(100, 27);
this.txtCurCol.TabIndex = 2;
this.txtCurCol.Text = "1";
this.txtCurCol.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -415,7 +415,7 @@
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(185, 50);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(104, 17);
this.label6.Size = new System.Drawing.Size(129, 20);
this.label6.TabIndex = 11;
this.label6.Text = "抽屉内库位列数：";
//
......@@ -423,7 +423,7 @@
//
this.txtRowsInDrawer.Location = new System.Drawing.Point(295, 18);
this.txtRowsInDrawer.Name = "txtRowsInDrawer";
this.txtRowsInDrawer.Size = new System.Drawing.Size(100, 23);
this.txtRowsInDrawer.Size = new System.Drawing.Size(100, 27);
this.txtRowsInDrawer.TabIndex = 8;
this.txtRowsInDrawer.Text = "4";
this.txtRowsInDrawer.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -433,7 +433,7 @@
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(185, 24);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(104, 17);
this.label7.Size = new System.Drawing.Size(129, 20);
this.label7.TabIndex = 9;
this.label7.Text = "抽屉内库位行数：";
//
......@@ -441,7 +441,7 @@
//
this.txtColsInDrawer.Location = new System.Drawing.Point(295, 47);
this.txtColsInDrawer.Name = "txtColsInDrawer";
this.txtColsInDrawer.Size = new System.Drawing.Size(100, 23);
this.txtColsInDrawer.Size = new System.Drawing.Size(100, 27);
this.txtColsInDrawer.TabIndex = 10;
this.txtColsInDrawer.Text = "20";
this.txtColsInDrawer.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -450,7 +450,7 @@
//
this.txtDrawerRows.Location = new System.Drawing.Point(79, 21);
this.txtDrawerRows.Name = "txtDrawerRows";
this.txtDrawerRows.Size = new System.Drawing.Size(100, 23);
this.txtDrawerRows.Size = new System.Drawing.Size(100, 27);
this.txtDrawerRows.TabIndex = 12;
this.txtDrawerRows.Text = "1";
this.txtDrawerRows.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -460,7 +460,7 @@
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(5, 50);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(68, 17);
this.label9.Size = new System.Drawing.Size(84, 20);
this.label9.TabIndex = 15;
this.label9.Text = "抽屉列数：";
//
......@@ -469,7 +469,7 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(5, 24);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(68, 17);
this.label10.Size = new System.Drawing.Size(84, 20);
this.label10.TabIndex = 13;
this.label10.Text = "抽屉层数：";
//
......@@ -477,7 +477,7 @@
//
this.txtDrawerColumns.Location = new System.Drawing.Point(79, 47);
this.txtDrawerColumns.Name = "txtDrawerColumns";
this.txtDrawerColumns.Size = new System.Drawing.Size(100, 23);
this.txtDrawerColumns.Size = new System.Drawing.Size(100, 27);
this.txtDrawerColumns.TabIndex = 14;
this.txtDrawerColumns.Text = "1";
this.txtDrawerColumns.TextChanged += new System.EventHandler(this.txtChanged);
......@@ -486,10 +486,10 @@
//
this.tabPage2.Controls.Add(this.groupBox6);
this.tabPage2.Controls.Add(this.pictureBox1);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(786, 314);
this.tabPage2.Size = new System.Drawing.Size(786, 311);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "配置对位抽屉模板[相机在中间位置]";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -518,6 +518,16 @@
this.groupBox6.TabStop = false;
this.groupBox6.Text = "groupBox6";
//
// btnOpenImg
//
this.btnOpenImg.Location = new System.Drawing.Point(273, 88);
this.btnOpenImg.Name = "btnOpenImg";
this.btnOpenImg.Size = new System.Drawing.Size(86, 57);
this.btnOpenImg.TabIndex = 19;
this.btnOpenImg.Text = "打开";
this.btnOpenImg.UseVisualStyleBackColor = true;
this.btnOpenImg.Click += new System.EventHandler(this.btnOpenImg_Click);
//
// cmbColor
//
this.cmbColor.AutoCompleteCustomSource.AddRange(new string[] {
......@@ -531,7 +541,7 @@
"Blue"});
this.cmbColor.Location = new System.Drawing.Point(288, 171);
this.cmbColor.Name = "cmbColor";
this.cmbColor.Size = new System.Drawing.Size(79, 25);
this.cmbColor.Size = new System.Drawing.Size(79, 28);
this.cmbColor.TabIndex = 18;
//
// btnPullUpdwnToPos1
......@@ -579,7 +589,7 @@
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(6, 28);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(112, 17);
this.label17.Size = new System.Drawing.Size(138, 20);
this.label17.TabIndex = 5;
this.label17.Text = "抽屉Mark_X坐标：";
//
......@@ -587,7 +597,7 @@
//
this.txtMark_X.Location = new System.Drawing.Point(167, 22);
this.txtMark_X.Name = "txtMark_X";
this.txtMark_X.Size = new System.Drawing.Size(100, 23);
this.txtMark_X.Size = new System.Drawing.Size(100, 27);
this.txtMark_X.TabIndex = 4;
this.txtMark_X.Text = "1";
//
......@@ -606,7 +616,7 @@
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(6, 59);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(111, 17);
this.label19.Size = new System.Drawing.Size(137, 20);
this.label19.TabIndex = 7;
this.label19.Text = "抽屉Mark_Y坐标：";
//
......@@ -614,7 +624,7 @@
//
this.txtMark_Y.Location = new System.Drawing.Point(167, 56);
this.txtMark_Y.Name = "txtMark_Y";
this.txtMark_Y.Size = new System.Drawing.Size(100, 23);
this.txtMark_Y.Size = new System.Drawing.Size(100, 27);
this.txtMark_Y.TabIndex = 6;
this.txtMark_Y.Text = "1";
//
......@@ -622,7 +632,7 @@
//
this.txtMark_Y_err.Location = new System.Drawing.Point(167, 122);
this.txtMark_Y_err.Name = "txtMark_Y_err";
this.txtMark_Y_err.Size = new System.Drawing.Size(100, 23);
this.txtMark_Y_err.Size = new System.Drawing.Size(100, 27);
this.txtMark_Y_err.TabIndex = 10;
this.txtMark_Y_err.Text = "1";
//
......@@ -631,7 +641,7 @@
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(6, 125);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(159, 17);
this.label21.Size = new System.Drawing.Size(197, 20);
this.label21.TabIndex = 11;
this.label21.Text = "抽屉Mark_Y允许误差范围：";
//
......@@ -640,7 +650,7 @@
this.label20.AutoSize = true;
this.label20.Location = new System.Drawing.Point(6, 86);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(160, 17);
this.label20.Size = new System.Drawing.Size(198, 20);
this.label20.TabIndex = 9;
this.label20.Text = "抽屉Mark_X允许误差范围：";
//
......@@ -648,7 +658,7 @@
//
this.txtMark_X_err.Location = new System.Drawing.Point(167, 86);
this.txtMark_X_err.Name = "txtMark_X_err";
this.txtMark_X_err.Size = new System.Drawing.Size(100, 23);
this.txtMark_X_err.Size = new System.Drawing.Size(100, 27);
this.txtMark_X_err.TabIndex = 8;
this.txtMark_X_err.Text = "1";
//
......@@ -665,9 +675,9 @@
//
this.tabPage3.Controls.Add(this.groupBox7);
this.tabPage3.Controls.Add(this.pictureBox2);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(786, 314);
this.tabPage3.Size = new System.Drawing.Size(786, 311);
this.tabPage3.TabIndex = 4;
this.tabPage3.Text = "配置验证抽屉模板[相机在两边位置]";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -739,7 +749,7 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(6, 28);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(112, 17);
this.label3.Size = new System.Drawing.Size(138, 20);
this.label3.TabIndex = 5;
this.label3.Text = "抽屉Mark_X坐标：";
//
......@@ -747,7 +757,7 @@
//
this.txtMarkX_Validate.Location = new System.Drawing.Point(167, 22);
this.txtMarkX_Validate.Name = "txtMarkX_Validate";
this.txtMarkX_Validate.Size = new System.Drawing.Size(100, 23);
this.txtMarkX_Validate.Size = new System.Drawing.Size(100, 27);
this.txtMarkX_Validate.TabIndex = 4;
this.txtMarkX_Validate.Text = "1";
//
......@@ -766,7 +776,7 @@
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(6, 59);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(111, 17);
this.label4.Size = new System.Drawing.Size(137, 20);
this.label4.TabIndex = 7;
this.label4.Text = "抽屉Mark_Y坐标：";
//
......@@ -774,7 +784,7 @@
//
this.txtMarkY_Validate.Location = new System.Drawing.Point(167, 56);
this.txtMarkY_Validate.Name = "txtMarkY_Validate";
this.txtMarkY_Validate.Size = new System.Drawing.Size(100, 23);
this.txtMarkY_Validate.Size = new System.Drawing.Size(100, 27);
this.txtMarkY_Validate.TabIndex = 6;
this.txtMarkY_Validate.Text = "1";
//
......@@ -782,7 +792,7 @@
//
this.txtMarkY_err_Validate.Location = new System.Drawing.Point(167, 122);
this.txtMarkY_err_Validate.Name = "txtMarkY_err_Validate";
this.txtMarkY_err_Validate.Size = new System.Drawing.Size(100, 23);
this.txtMarkY_err_Validate.Size = new System.Drawing.Size(100, 27);
this.txtMarkY_err_Validate.TabIndex = 10;
this.txtMarkY_err_Validate.Text = "1";
//
......@@ -791,7 +801,7 @@
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(6, 125);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(159, 17);
this.label22.Size = new System.Drawing.Size(197, 20);
this.label22.TabIndex = 11;
this.label22.Text = "抽屉Mark_Y允许误差范围：";
//
......@@ -800,7 +810,7 @@
this.label23.AutoSize = true;
this.label23.Location = new System.Drawing.Point(6, 86);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(160, 17);
this.label23.Size = new System.Drawing.Size(198, 20);
this.label23.TabIndex = 9;
this.label23.Text = "抽屉Mark_X允许误差范围：";
//
......@@ -808,7 +818,7 @@
//
this.txtMarkX_err_Validate.Location = new System.Drawing.Point(167, 86);
this.txtMarkX_err_Validate.Name = "txtMarkX_err_Validate";
this.txtMarkX_err_Validate.Size = new System.Drawing.Size(100, 23);
this.txtMarkX_err_Validate.Size = new System.Drawing.Size(100, 27);
this.txtMarkX_err_Validate.TabIndex = 8;
this.txtMarkX_err_Validate.Text = "1";
//
......@@ -829,9 +839,9 @@
this.tabPage4.Controls.Add(this.label18);
this.tabPage4.Controls.Add(this.button10);
this.tabPage4.Controls.Add(this.btnStartVision);
this.tabPage4.Location = new System.Drawing.Point(4, 26);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(786, 314);
this.tabPage4.Size = new System.Drawing.Size(786, 311);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "视觉对位";
this.tabPage4.UseVisualStyleBackColor = true;
......@@ -839,10 +849,10 @@
// listBox1
//
this.listBox1.FormattingEnabled = true;
this.listBox1.ItemHeight = 17;
this.listBox1.ItemHeight = 20;
this.listBox1.Location = new System.Drawing.Point(214, 45);
this.listBox1.Name = "listBox1";
this.listBox1.Size = new System.Drawing.Size(386, 191);
this.listBox1.Size = new System.Drawing.Size(386, 184);
this.listBox1.TabIndex = 23;
//
// btnStopVision
......@@ -870,7 +880,7 @@
this.label18.AutoSize = true;
this.label18.Location = new System.Drawing.Point(356, 14);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(80, 17);
this.label18.Size = new System.Drawing.Size(99, 20);
this.label18.TabIndex = 20;
this.label18.Text = "抽屉当前行列";
//
......@@ -915,10 +925,11 @@
this.chkCloseOutStoreCheck.AutoSize = true;
this.chkCloseOutStoreCheck.Location = new System.Drawing.Point(568, 22);
this.chkCloseOutStoreCheck.Name = "chkCloseOutStoreCheck";
this.chkCloseOutStoreCheck.Size = new System.Drawing.Size(147, 21);
this.chkCloseOutStoreCheck.Size = new System.Drawing.Size(181, 24);
this.chkCloseOutStoreCheck.TabIndex = 9;
this.chkCloseOutStoreCheck.Text = "关闭出库前的碗里检查";
this.chkCloseOutStoreCheck.UseVisualStyleBackColor = true;
this.chkCloseOutStoreCheck.Visible = false;
this.chkCloseOutStoreCheck.CheckedChanged += new System.EventHandler(this.chkCloseOutStoreCheck_CheckedChanged);
//
// lblResult
......@@ -926,7 +937,7 @@
this.lblResult.AutoSize = true;
this.lblResult.Location = new System.Drawing.Point(565, 58);
this.lblResult.Name = "lblResult";
this.lblResult.Size = new System.Drawing.Size(0, 17);
this.lblResult.Size = new System.Drawing.Size(0, 20);
this.lblResult.TabIndex = 8;
//
// chkBoxCloseCam
......@@ -934,7 +945,7 @@
this.chkBoxCloseCam.AutoSize = true;
this.chkBoxCloseCam.Location = new System.Drawing.Point(6, 49);
this.chkBoxCloseCam.Name = "chkBoxCloseCam";
this.chkBoxCloseCam.Size = new System.Drawing.Size(154, 21);
this.chkBoxCloseCam.Size = new System.Drawing.Size(188, 24);
this.chkBoxCloseCam.TabIndex = 7;
this.chkBoxCloseCam.Text = "关闭视觉检查抽屉Mark";
this.chkBoxCloseCam.UseVisualStyleBackColor = true;
......@@ -946,7 +957,7 @@
this.checkBoxOpenAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBoxOpenAuto.Location = new System.Drawing.Point(9, 22);
this.checkBoxOpenAuto.Name = "checkBoxOpenAuto";
this.checkBoxOpenAuto.Size = new System.Drawing.Size(112, 23);
this.checkBoxOpenAuto.Size = new System.Drawing.Size(142, 29);
this.checkBoxOpenAuto.TabIndex = 4;
this.checkBoxOpenAuto.Text = "开启视觉对位";
this.checkBoxOpenAuto.UseVisualStyleBackColor = true;
......@@ -980,7 +991,7 @@
this.radioButton2.AutoSize = true;
this.radioButton2.Location = new System.Drawing.Point(121, 34);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(46, 21);
this.radioButton2.Size = new System.Drawing.Size(54, 24);
this.radioButton2.TabIndex = 5;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "B面";
......@@ -993,7 +1004,7 @@
this.radioButton1.Checked = true;
this.radioButton1.Location = new System.Drawing.Point(6, 34);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(46, 21);
this.radioButton1.Size = new System.Drawing.Size(56, 24);
this.radioButton1.TabIndex = 4;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "A面";
......@@ -1005,19 +1016,9 @@
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// btnOpenImg
//
this.btnOpenImg.Location = new System.Drawing.Point(273, 88);
this.btnOpenImg.Name = "btnOpenImg";
this.btnOpenImg.Size = new System.Drawing.Size(86, 57);
this.btnOpenImg.TabIndex = 19;
this.btnOpenImg.Text = "打开";
this.btnOpenImg.UseVisualStyleBackColor = true;
this.btnOpenImg.Click += new System.EventHandler(this.btnOpenImg_Click);
//
// FrmAutoFindPos
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Controls.Add(this.tableLayoutPanel1);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!