Skip to content

李娜 / SO827-OutletEquip

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

链条转动bug修改。界面调整。

1 个父辈 868e9121
内嵌 并排
正在显示 2 个修改的文件 包含 36 行增加 和 32 行删除
source/DeviceLibrary/bean/WorkStation.cs
...@@ -173,9 +173,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -173,9 +173,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (CheckShelf(IO_VALUE.LOW)) else if (CheckShelf(IO_VALUE.LOW))
{ {
CurrShelf = new ShelfInfo(); ResetEnd();
LogUtil.info(Name + "复位完成，当前无料架");
MoveInfo.EndMove();
} }
else else
{ {
...@@ -191,9 +189,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -191,9 +189,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (CheckShelf(IO_VALUE.LOW)) else if (CheckShelf(IO_VALUE.LOW))
{ {
CurrShelf = new ShelfInfo(); ResetEnd();
LogUtil.info(Name + "复位完成，当前无料架");
MoveInfo.EndMove();
} }
else else
{ {
...@@ -203,6 +199,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,6 +199,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.IsStep(MoveStep.SR_04_LocationUp)) else if (MoveInfo.IsStep(MoveStep.SR_04_LocationUp))
{ {
LineStop();
if (LocationIsUp()) if (LocationIsUp())
{ {
LogUtil.info(Name + "复位：" + CurrShelf.ToStr() + "准备完成，可以放料 "); LogUtil.info(Name + "复位：" + CurrShelf.ToStr() + "准备完成，可以放料 ");
...@@ -217,6 +214,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -217,6 +214,13 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
private void ResetEnd()
{
LineStop();
CurrShelf = new ShelfInfo();
LogUtil.info(Name + "复位完成，当前无料架");
MoveInfo.EndMove();
}
private void SR_04_LocationUp() private void SR_04_LocationUp()
{ {
//MoveInfo.NewMove(StoreMoveType.StoreReset); //MoveInfo.NewMove(StoreMoveType.StoreReset);
......
source/HCSingleStore/FrmEquip.Designer.cs
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.lblHeartMsg = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.chbMoveStop = new System.Windows.Forms.CheckBox(); this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.checkBox3 = new System.Windows.Forms.CheckBox(); this.checkBox3 = new System.Windows.Forms.CheckBox();
...@@ -137,7 +138,6 @@ ...@@ -137,7 +138,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer2 = new System.Windows.Forms.Timer(this.components); this.timer2 = new System.Windows.Forms.Timer(this.components);
this.lblHeartMsg = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -200,15 +200,27 @@ ...@@ -200,15 +200,27 @@
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
// //
// lblHeartMsg
//
this.lblHeartMsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblHeartMsg.AutoSize = true;
this.lblHeartMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHeartMsg.ForeColor = System.Drawing.Color.Green;
this.lblHeartMsg.Location = new System.Drawing.Point(9, 583);
this.lblHeartMsg.Name = "lblHeartMsg";
this.lblHeartMsg.Size = new System.Drawing.Size(0, 17);
this.lblHeartMsg.TabIndex = 289;
this.lblHeartMsg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblWarnMsg // lblWarnMsg
// //
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(7, 231); this.lblWarnMsg.Location = new System.Drawing.Point(7, 212);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(975, 60); this.lblWarnMsg.Size = new System.Drawing.Size(710, 79);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -217,7 +229,7 @@ ...@@ -217,7 +229,7 @@
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true; 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.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(886, 190); this.chbMoveStop.Location = new System.Drawing.Point(886, 232);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24); this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 288; this.chbMoveStop.TabIndex = 288;
...@@ -230,7 +242,7 @@ ...@@ -230,7 +242,7 @@
this.checkBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox3.AutoSize = true; this.checkBox3.AutoSize = true;
this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox3.Location = new System.Drawing.Point(886, 154); this.checkBox3.Location = new System.Drawing.Point(886, 196);
this.checkBox3.Name = "checkBox3"; this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(89, 21); this.checkBox3.Size = new System.Drawing.Size(89, 21);
this.checkBox3.TabIndex = 286; this.checkBox3.TabIndex = 286;
...@@ -243,7 +255,7 @@ ...@@ -243,7 +255,7 @@
this.checkBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox2.AutoSize = true; this.checkBox2.AutoSize = true;
this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox2.Location = new System.Drawing.Point(886, 120); this.checkBox2.Location = new System.Drawing.Point(886, 162);
this.checkBox2.Name = "checkBox2"; this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(89, 21); this.checkBox2.Size = new System.Drawing.Size(89, 21);
this.checkBox2.TabIndex = 285; this.checkBox2.TabIndex = 285;
...@@ -256,7 +268,7 @@ ...@@ -256,7 +268,7 @@
this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox1.AutoSize = true; this.checkBox1.AutoSize = true;
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(886, 86); this.checkBox1.Location = new System.Drawing.Point(886, 128);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(89, 21); this.checkBox1.Size = new System.Drawing.Size(89, 21);
this.checkBox1.TabIndex = 284; this.checkBox1.TabIndex = 284;
...@@ -282,7 +294,7 @@ ...@@ -282,7 +294,7 @@
this.btnS3Reset.BackColor = System.Drawing.Color.White; this.btnS3Reset.BackColor = System.Drawing.Color.White;
this.btnS3Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS3Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS3Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS3Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS3Reset.Location = new System.Drawing.Point(727, 183); this.btnS3Reset.Location = new System.Drawing.Point(727, 225);
this.btnS3Reset.Name = "btnS3Reset"; this.btnS3Reset.Name = "btnS3Reset";
this.btnS3Reset.Size = new System.Drawing.Size(132, 39); this.btnS3Reset.Size = new System.Drawing.Size(132, 39);
this.btnS3Reset.TabIndex = 282; this.btnS3Reset.TabIndex = 282;
...@@ -296,7 +308,7 @@ ...@@ -296,7 +308,7 @@
this.btnS2Reset.BackColor = System.Drawing.Color.White; this.btnS2Reset.BackColor = System.Drawing.Color.White;
this.btnS2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS2Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS2Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS2Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS2Reset.Location = new System.Drawing.Point(727, 138); this.btnS2Reset.Location = new System.Drawing.Point(727, 180);
this.btnS2Reset.Name = "btnS2Reset"; this.btnS2Reset.Name = "btnS2Reset";
this.btnS2Reset.Size = new System.Drawing.Size(132, 39); this.btnS2Reset.Size = new System.Drawing.Size(132, 39);
this.btnS2Reset.TabIndex = 281; this.btnS2Reset.TabIndex = 281;
...@@ -310,7 +322,7 @@ ...@@ -310,7 +322,7 @@
this.btnS1Reset.BackColor = System.Drawing.Color.White; this.btnS1Reset.BackColor = System.Drawing.Color.White;
this.btnS1Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS1Reset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS1Reset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS1Reset.Location = new System.Drawing.Point(727, 93); this.btnS1Reset.Location = new System.Drawing.Point(727, 135);
this.btnS1Reset.Name = "btnS1Reset"; this.btnS1Reset.Name = "btnS1Reset";
this.btnS1Reset.Size = new System.Drawing.Size(132, 39); this.btnS1Reset.Size = new System.Drawing.Size(132, 39);
this.btnS1Reset.TabIndex = 280; this.btnS1Reset.TabIndex = 280;
...@@ -324,7 +336,7 @@ ...@@ -324,7 +336,7 @@
this.btnClearDoor.BackColor = System.Drawing.Color.White; this.btnClearDoor.BackColor = System.Drawing.Color.White;
this.btnClearDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClearDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearDoor.Location = new System.Drawing.Point(727, 48); this.btnClearDoor.Location = new System.Drawing.Point(727, 90);
this.btnClearDoor.Name = "btnClearDoor"; this.btnClearDoor.Name = "btnClearDoor";
this.btnClearDoor.Size = new System.Drawing.Size(132, 39); this.btnClearDoor.Size = new System.Drawing.Size(132, 39);
this.btnClearDoor.TabIndex = 279; this.btnClearDoor.TabIndex = 279;
...@@ -340,7 +352,7 @@ ...@@ -340,7 +352,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(4, 297); this.logBox.Location = new System.Drawing.Point(4, 297);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(978, 270); this.logBox.Size = new System.Drawing.Size(978, 280);
this.logBox.TabIndex = 278; this.logBox.TabIndex = 278;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -366,7 +378,7 @@ ...@@ -366,7 +378,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(6, 439); this.groupBox2.Location = new System.Drawing.Point(6, 433);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(972, 78); this.groupBox2.Size = new System.Drawing.Size(972, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -450,7 +462,7 @@ ...@@ -450,7 +462,7 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; 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.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(886, 49); this.chbDebug.Location = new System.Drawing.Point(886, 91);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -1527,18 +1539,6 @@ ...@@ -1527,18 +1539,6 @@
// //
this.timer2.Interval = 1000; this.timer2.Interval = 1000;
// //
// lblHeartMsg
//
this.lblHeartMsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblHeartMsg.AutoSize = true;
this.lblHeartMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHeartMsg.ForeColor = System.Drawing.Color.Green;
this.lblHeartMsg.Location = new System.Drawing.Point(9, 579);
this.lblHeartMsg.Name = "lblHeartMsg";
this.lblHeartMsg.Size = new System.Drawing.Size(0, 17);
this.lblHeartMsg.TabIndex = 289;
this.lblHeartMsg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// FrmEquip // FrmEquip
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!