Commit 2823b2db 张东亮

两个仓可同时自动跑位

1 个父辈 2efb4cde
......@@ -20,8 +20,8 @@
<add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_SA" />
<add key="Store_CID" value="D1" />
<add key="Store_CID_1" value="line-ac-01" />
<add key="Store_CID_2" value="line-ac-02" />
<add key="Store_CID_1" value="line-ac-05" />
<add key="Store_CID_2" value="line-ac-06" />
<!--end one store config-->
<add key="ACBaudRate" value="115200" />
<add key="InOutDefaultPosition" value="5000" />
......
......@@ -314,7 +314,7 @@
this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(11, 420);
this.groupBox1.Location = new System.Drawing.Point(11, 428);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217;
......@@ -493,7 +493,7 @@
this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 336);
this.groupBox2.Location = new System.Drawing.Point(11, 344);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276;
......@@ -669,7 +669,7 @@
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(580, 559);
this.tabPage5.Size = new System.Drawing.Size(573, 558);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "点位示意图";
this.tabPage5.UseVisualStyleBackColor = true;
......@@ -746,7 +746,7 @@
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(5, 6);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(494, 585);
this.groupInout.Size = new System.Drawing.Size(899, 585);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -1432,10 +1432,10 @@
// tabPage1
//
this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1091, 607);
this.tabPage1.Size = new System.Drawing.Size(192, 74);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
......
......@@ -1103,7 +1103,7 @@ namespace OnlineStore.ACSingleStore
private void btnInOutTest_Click(object sender, EventArgs e)
{
FrmInOutStore frmInOutStore = new FrmInOutStore(boxBean);
frmInOutStore.ShowDialog();
frmInOutStore.Show();
}
}
}
......@@ -115,6 +115,7 @@ namespace OnlineStore.ACSingleStore
{
InitializeComponent();
this.store = store;
this.Text = "D"+store.Config.GetStoreId()+" 自动跑位";
lastStageInOutStep = new LastStageInOutStep();
generalInOutStep = new GeneralInOutStep();
moveToStartPosStep = new MoveToStartPosStep();
......@@ -180,7 +181,6 @@ namespace OnlineStore.ACSingleStore
preOpen = isOpen;
btnOutStore.Enabled = !isOpen;
cmbPosition.Enabled = !isOpen;
btnStoreStart.Enabled = !isOpen;
......@@ -1232,7 +1232,7 @@ namespace OnlineStore.ACSingleStore
bool result = ACStorePosition.CheckPosition(position, boxBean.Config);
if (result && position.StoreId.Equals(boxBean.Config.GetStoreId()))
{
size = position.BagHigh + "*" + position.BagWidth;
size = position.BagWidth + "*" + position.BagHigh;
if (PositionDic.ContainsKey(size))
{
PositionDic[size].Add(position.PositionNum);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!