Skip to content

李娜 / VerticalStore

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

出入库开光灯bug

1 个父辈 3aeffef1
内嵌 并排
正在显示 3 个修改的文件 包含 11 行增加 和 11 行删除
source/DeviceLibrary/acVerticalStore/VerticalStoreBean_InOut.cs
...@@ -202,7 +202,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -202,7 +202,7 @@ namespace OnlineStore.DeviceLibrary
{ {
lights.Add(Light.BlueLight(MoveInfo.MoveParam.Position.LedDmx, index)); lights.Add(Light.BlueLight(MoveInfo.MoveParam.Position.LedDmx, index));
} }
LEDManager.GetLedModule(Config.LED_IP).LightOff(lights.ToArray<Light>()); LEDManager.GetLedModule(Config.LED_IP).OnlyLightOn(lights.ToArray<Light>());
UpdateLastStatus(StoreStatus.InStoreEnd); UpdateLastStatus(StoreStatus.InStoreEnd);
} }
...@@ -312,7 +312,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -312,7 +312,7 @@ namespace OnlineStore.DeviceLibrary
{ {
lights.Add(Light.GreenLight(MoveInfo.MoveParam.Position.LedDmx, index)); lights.Add(Light.GreenLight(MoveInfo.MoveParam.Position.LedDmx, index));
} }
LEDManager.GetLedModule(Config.LED_IP).LightOff(lights.ToArray<Light>()); LEDManager.GetLedModule(Config.LED_IP).OnlyLightOn(lights.ToArray<Light>());
UpdateLastStatus(StoreStatus.OutStoreBoxEnd); UpdateLastStatus(StoreStatus.OutStoreBoxEnd);
} }
......
source/VerticalStoreClinet/FrmIOStatus.Designer.cs
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
this.groupBox2.Controls.Add(this.btnOpenAxisBreak); this.groupBox2.Controls.Add(this.btnOpenAxisBreak);
this.groupBox2.Location = new System.Drawing.Point(482, 163); this.groupBox2.Location = new System.Drawing.Point(482, 163);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(335, 296); this.groupBox2.Size = new System.Drawing.Size(335, 266);
this.groupBox2.TabIndex = 255; this.groupBox2.TabIndex = 255;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "操作测试"; this.groupBox2.Text = "操作测试";
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
// button1 // button1
// //
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.Location = new System.Drawing.Point(683, 477); this.button1.Location = new System.Drawing.Point(681, 447);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37); this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.TabIndex = 254; this.button1.TabIndex = 254;
...@@ -301,7 +301,7 @@ ...@@ -301,7 +301,7 @@
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(247, 8); this.groupBox4.Location = new System.Drawing.Point(247, 8);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(229, 508); this.groupBox4.Size = new System.Drawing.Size(229, 481);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 488); this.tableLayoutPanel2.Size = new System.Drawing.Size(218, 461);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(12, 8); this.groupBox3.Location = new System.Drawing.Point(12, 8);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(229, 508); this.groupBox3.Size = new System.Drawing.Size(229, 481);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 488); this.tableLayoutPanel1.Size = new System.Drawing.Size(218, 461);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// chbAutoRead // chbAutoRead
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
this.chbAutoRead.Checked = true; this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked; this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(498, 482); this.chbAutoRead.Location = new System.Drawing.Point(496, 452);
this.chbAutoRead.Name = "chbAutoRead"; this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21); this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244; this.chbAutoRead.TabIndex = 244;
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(828, 526); this.ClientSize = new System.Drawing.Size(828, 500);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
......
source/VerticalStoreClinet/FrmStoreBox.Designer.cs
...@@ -774,7 +774,7 @@ ...@@ -774,7 +774,7 @@
this.btnCloseDoor.Name = "btnCloseDoor"; this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(194, 39); this.btnCloseDoor.Size = new System.Drawing.Size(194, 39);
this.btnCloseDoor.TabIndex = 275; this.btnCloseDoor.TabIndex = 275;
this.btnCloseDoor.Text = "料盒已放入/拿出，关闭升降门"; this.btnCloseDoor.Text = "取放料完成，关闭升降门";
this.btnCloseDoor.UseVisualStyleBackColor = false; this.btnCloseDoor.UseVisualStyleBackColor = false;
this.btnCloseDoor.Visible = false; this.btnCloseDoor.Visible = false;
this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click); this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!