Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a63a8a86 由 几米阳光
选项

增加自动出入库功能

1 个父辈 4ec0cea8
内嵌 并排
正在显示 8 个修改的文件 包含 390 行增加 和 365 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -148,11 +148,7 @@ ...@@ -148,11 +148,7 @@
this.btnUpDownP3 = new System.Windows.Forms.Button(); this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button(); this.btnUpDownP4 = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button(); this.btnClearLog = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label(); this.lblTemp = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
this.btnStartAuTo = new System.Windows.Forms.Button();
this.label9 = new System.Windows.Forms.Label();
this.txtJiange = new System.Windows.Forms.TextBox();
this.btnInStore = new System.Windows.Forms.Button(); this.btnInStore = new System.Windows.Forms.Button();
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.料仓操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.料仓操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
...@@ -232,6 +228,7 @@ ...@@ -232,6 +228,7 @@
this.comboBoxPortName = new System.Windows.Forms.ComboBox(); this.comboBoxPortName = new System.Windows.Forms.ComboBox();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.btnClearBuzzer = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
...@@ -257,7 +254,10 @@ ...@@ -257,7 +254,10 @@
this.lblDoorStatus = new System.Windows.Forms.Label(); this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button(); this.btnBatchInStore = new System.Windows.Forms.Button();
this.lblOutInfo = new System.Windows.Forms.Label(); this.lblOutInfo = new System.Windows.Forms.Label();
this.btnClearBuzzer = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.label30 = new System.Windows.Forms.Label();
this.cmbJianGe = new System.Windows.Forms.ComboBox();
this.groupAuto = new System.Windows.Forms.GroupBox();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
...@@ -272,6 +272,7 @@ ...@@ -272,6 +272,7 @@
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.groupAuto.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -1204,7 +1205,6 @@ ...@@ -1204,7 +1205,6 @@
// //
this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.groupInout.Controls.Add(this.btnSave);
this.groupInout.Controls.Add(this.txtInoutP4); this.groupInout.Controls.Add(this.txtInoutP4);
this.groupInout.Controls.Add(this.btnInOutP4); this.groupInout.Controls.Add(this.btnInOutP4);
this.groupInout.Controls.Add(this.txtUpdownP8); this.groupInout.Controls.Add(this.txtUpdownP8);
...@@ -1226,8 +1226,6 @@ ...@@ -1226,8 +1226,6 @@
this.groupInout.Controls.Add(this.txtMiddleP2); this.groupInout.Controls.Add(this.txtMiddleP2);
this.groupInout.Controls.Add(this.txtUpDownP5); this.groupInout.Controls.Add(this.txtUpDownP5);
this.groupInout.Controls.Add(this.txtUpDownP6); this.groupInout.Controls.Add(this.txtUpDownP6);
this.groupInout.Controls.Add(this.cmbPosition);
this.groupInout.Controls.Add(this.label21);
this.groupInout.Controls.Add(this.txtUpDownP3); this.groupInout.Controls.Add(this.txtUpDownP3);
this.groupInout.Controls.Add(this.btnOutStore); this.groupInout.Controls.Add(this.btnOutStore);
this.groupInout.Controls.Add(this.txtUpDownP4); this.groupInout.Controls.Add(this.txtUpDownP4);
...@@ -1245,9 +1243,9 @@ ...@@ -1245,9 +1243,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(7, 146); this.groupInout.Location = new System.Drawing.Point(7, 261);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(573, 571); this.groupInout.Size = new System.Drawing.Size(573, 456);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "出入库操作"; this.groupInout.Text = "出入库操作";
...@@ -1255,7 +1253,7 @@ ...@@ -1255,7 +1253,7 @@
// btnSave // btnSave
// //
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(96, 76); this.btnSave.Location = new System.Drawing.Point(287, 68);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(257, 38); this.btnSave.Size = new System.Drawing.Size(257, 38);
this.btnSave.TabIndex = 279; this.btnSave.TabIndex = 279;
...@@ -1270,7 +1268,7 @@ ...@@ -1270,7 +1268,7 @@
this.txtInoutP4.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInoutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInoutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInoutP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP4.Location = new System.Drawing.Point(464, 360); this.txtInoutP4.Location = new System.Drawing.Point(464, 308);
this.txtInoutP4.MaxLength = 0; this.txtInoutP4.MaxLength = 0;
this.txtInoutP4.Name = "txtInoutP4"; this.txtInoutP4.Name = "txtInoutP4";
this.txtInoutP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInoutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1286,7 +1284,7 @@ ...@@ -1286,7 +1284,7 @@
this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP4.ForeColor = System.Drawing.Color.Green; this.btnInOutP4.ForeColor = System.Drawing.Color.Green;
this.btnInOutP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.Location = new System.Drawing.Point(288, 355); this.btnInOutP4.Location = new System.Drawing.Point(288, 303);
this.btnInOutP4.Name = "btnInOutP4"; this.btnInOutP4.Name = "btnInOutP4";
this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP4.Size = new System.Drawing.Size(174, 32); this.btnInOutP4.Size = new System.Drawing.Size(174, 32);
...@@ -1302,7 +1300,7 @@ ...@@ -1302,7 +1300,7 @@
this.txtUpdownP8.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP8.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP8.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP8.Location = new System.Drawing.Point(187, 246); this.txtUpdownP8.Location = new System.Drawing.Point(187, 194);
this.txtUpdownP8.MaxLength = 0; this.txtUpdownP8.MaxLength = 0;
this.txtUpdownP8.Name = "txtUpdownP8"; this.txtUpdownP8.Name = "txtUpdownP8";
this.txtUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1313,7 +1311,7 @@ ...@@ -1313,7 +1311,7 @@
// btnBatchOutTest // btnBatchOutTest
// //
this.btnBatchOutTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBatchOutTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchOutTest.Location = new System.Drawing.Point(378, 76); this.btnBatchOutTest.Location = new System.Drawing.Point(164, 21);
this.btnBatchOutTest.Name = "btnBatchOutTest"; this.btnBatchOutTest.Name = "btnBatchOutTest";
this.btnBatchOutTest.Size = new System.Drawing.Size(157, 38); this.btnBatchOutTest.Size = new System.Drawing.Size(157, 38);
this.btnBatchOutTest.TabIndex = 228; this.btnBatchOutTest.TabIndex = 228;
...@@ -1329,7 +1327,7 @@ ...@@ -1329,7 +1327,7 @@
this.btnUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpdownP8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP8.Location = new System.Drawing.Point(12, 241); this.btnUpdownP8.Location = new System.Drawing.Point(12, 189);
this.btnUpdownP8.Name = "btnUpdownP8"; this.btnUpdownP8.Name = "btnUpdownP8";
this.btnUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP8.Size = new System.Drawing.Size(174, 32); this.btnUpdownP8.Size = new System.Drawing.Size(174, 32);
...@@ -1345,7 +1343,7 @@ ...@@ -1345,7 +1343,7 @@
this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpdownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP2.Location = new System.Drawing.Point(187, 208); this.txtUpdownP2.Location = new System.Drawing.Point(187, 156);
this.txtUpdownP2.MaxLength = 0; this.txtUpdownP2.MaxLength = 0;
this.txtUpdownP2.Name = "txtUpdownP2"; this.txtUpdownP2.Name = "txtUpdownP2";
this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1361,7 +1359,7 @@ ...@@ -1361,7 +1359,7 @@
this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpdownP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP2.Location = new System.Drawing.Point(12, 203); this.btnUpdownP2.Location = new System.Drawing.Point(12, 151);
this.btnUpdownP2.Name = "btnUpdownP2"; this.btnUpdownP2.Name = "btnUpdownP2";
this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP2.Size = new System.Drawing.Size(174, 32); this.btnUpdownP2.Size = new System.Drawing.Size(174, 32);
...@@ -1377,7 +1375,7 @@ ...@@ -1377,7 +1375,7 @@
this.txtUpDownDoor.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownDoor.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownDoor.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownDoor.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownDoor.Location = new System.Drawing.Point(187, 170); this.txtUpDownDoor.Location = new System.Drawing.Point(187, 118);
this.txtUpDownDoor.MaxLength = 0; this.txtUpDownDoor.MaxLength = 0;
this.txtUpDownDoor.Name = "txtUpDownDoor"; this.txtUpDownDoor.Name = "txtUpDownDoor";
this.txtUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1393,7 +1391,7 @@ ...@@ -1393,7 +1391,7 @@
this.btnUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownDoor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownDoor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownDoor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownDoor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownDoor.Location = new System.Drawing.Point(12, 165); this.btnUpDownDoor.Location = new System.Drawing.Point(12, 113);
this.btnUpDownDoor.Name = "btnUpDownDoor"; this.btnUpDownDoor.Name = "btnUpDownDoor";
this.btnUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownDoor.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownDoor.Size = new System.Drawing.Size(174, 32); this.btnUpDownDoor.Size = new System.Drawing.Size(174, 32);
...@@ -1405,7 +1403,7 @@ ...@@ -1405,7 +1403,7 @@
// btnSavePosition // btnSavePosition
// //
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(368, 484); this.btnSavePosition.Location = new System.Drawing.Point(384, 384);
this.btnSavePosition.Name = "btnSavePosition"; this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(151, 38); this.btnSavePosition.Size = new System.Drawing.Size(151, 38);
this.btnSavePosition.TabIndex = 217; this.btnSavePosition.TabIndex = 217;
...@@ -1420,7 +1418,7 @@ ...@@ -1420,7 +1418,7 @@
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(187, 397); this.txtComP1.Location = new System.Drawing.Point(187, 345);
this.txtComP1.MaxLength = 0; this.txtComP1.MaxLength = 0;
this.txtComP1.Name = "txtComP1"; this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1435,7 +1433,7 @@ ...@@ -1435,7 +1433,7 @@
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(187, 360); this.txtInOutP2.Location = new System.Drawing.Point(187, 308);
this.txtInOutP2.MaxLength = 0; this.txtInOutP2.MaxLength = 0;
this.txtInOutP2.Name = "txtInOutP2"; this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1450,7 +1448,7 @@ ...@@ -1450,7 +1448,7 @@
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(187, 322); this.txtInOutP1.Location = new System.Drawing.Point(187, 270);
this.txtInOutP1.MaxLength = 0; this.txtInOutP1.MaxLength = 0;
this.txtInOutP1.Name = "txtInOutP1"; this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1465,7 +1463,7 @@ ...@@ -1465,7 +1463,7 @@
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(187, 284); this.txtMiddleP1.Location = new System.Drawing.Point(187, 232);
this.txtMiddleP1.MaxLength = 0; this.txtMiddleP1.MaxLength = 0;
this.txtMiddleP1.Name = "txtMiddleP1"; this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1480,7 +1478,7 @@ ...@@ -1480,7 +1478,7 @@
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(187, 133); this.txtUpDownP1.Location = new System.Drawing.Point(187, 81);
this.txtUpDownP1.MaxLength = 0; this.txtUpDownP1.MaxLength = 0;
this.txtUpDownP1.Name = "txtUpDownP1"; this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1495,7 +1493,7 @@ ...@@ -1495,7 +1493,7 @@
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(464, 397); this.txtComP3.Location = new System.Drawing.Point(464, 345);
this.txtComP3.MaxLength = 0; this.txtComP3.MaxLength = 0;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1510,7 +1508,7 @@ ...@@ -1510,7 +1508,7 @@
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(187, 436); this.txtComP2.Location = new System.Drawing.Point(187, 384);
this.txtComP2.MaxLength = 0; this.txtComP2.MaxLength = 0;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1525,7 +1523,7 @@ ...@@ -1525,7 +1523,7 @@
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(464, 322); this.txtInOutP3.Location = new System.Drawing.Point(464, 270);
this.txtInOutP3.MaxLength = 0; this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3"; this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1540,7 +1538,7 @@ ...@@ -1540,7 +1538,7 @@
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(464, 284); this.txtMiddleP2.Location = new System.Drawing.Point(464, 232);
this.txtMiddleP2.MaxLength = 0; this.txtMiddleP2.MaxLength = 0;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1555,7 +1553,7 @@ ...@@ -1555,7 +1553,7 @@
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(464, 208); this.txtUpDownP5.Location = new System.Drawing.Point(464, 156);
this.txtUpDownP5.MaxLength = 0; this.txtUpDownP5.MaxLength = 0;
this.txtUpDownP5.Name = "txtUpDownP5"; this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1570,7 +1568,7 @@ ...@@ -1570,7 +1568,7 @@
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(464, 246); this.txtUpDownP6.Location = new System.Drawing.Point(464, 194);
this.txtUpDownP6.MaxLength = 0; this.txtUpDownP6.MaxLength = 0;
this.txtUpDownP6.Name = "txtUpDownP6"; this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1586,7 +1584,7 @@ ...@@ -1586,7 +1584,7 @@
this.cmbPosition.Items.AddRange(new object[] { this.cmbPosition.Items.AddRange(new object[] {
"料仓0", "料仓0",
"料仓1"}); "料仓1"});
this.cmbPosition.Location = new System.Drawing.Point(164, 27); this.cmbPosition.Location = new System.Drawing.Point(167, 25);
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(189, 28); this.cmbPosition.Size = new System.Drawing.Size(189, 28);
this.cmbPosition.TabIndex = 174; this.cmbPosition.TabIndex = 174;
...@@ -1597,7 +1595,7 @@ ...@@ -1597,7 +1595,7 @@
this.label21.Cursor = System.Windows.Forms.Cursors.Default; this.label21.Cursor = System.Windows.Forms.Cursors.Default;
this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label21.ForeColor = System.Drawing.SystemColors.ControlText; this.label21.ForeColor = System.Drawing.SystemColors.ControlText;
this.label21.Location = new System.Drawing.Point(11, 27); this.label21.Location = new System.Drawing.Point(18, 25);
this.label21.Name = "label21"; this.label21.Name = "label21";
this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label21.Size = new System.Drawing.Size(147, 28); this.label21.Size = new System.Drawing.Size(147, 28);
...@@ -1612,7 +1610,7 @@ ...@@ -1612,7 +1610,7 @@
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(464, 133); this.txtUpDownP3.Location = new System.Drawing.Point(464, 81);
this.txtUpDownP3.MaxLength = 0; this.txtUpDownP3.MaxLength = 0;
this.txtUpDownP3.Name = "txtUpDownP3"; this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1623,7 +1621,7 @@ ...@@ -1623,7 +1621,7 @@
// btnOutStore // btnOutStore
// //
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(378, 27); this.btnOutStore.Location = new System.Drawing.Point(384, 21);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(157, 38); this.btnOutStore.Size = new System.Drawing.Size(157, 38);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
...@@ -1638,7 +1636,7 @@ ...@@ -1638,7 +1636,7 @@
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(464, 170); this.txtUpDownP4.Location = new System.Drawing.Point(464, 118);
this.txtUpDownP4.MaxLength = 0; this.txtUpDownP4.MaxLength = 0;
this.txtUpDownP4.Name = "txtUpDownP4"; this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1654,7 +1652,7 @@ ...@@ -1654,7 +1652,7 @@
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple; this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(12, 392); this.btnComP1.Location = new System.Drawing.Point(12, 340);
this.btnComP1.Name = "btnComP1"; this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(174, 32); this.btnComP1.Size = new System.Drawing.Size(174, 32);
...@@ -1671,7 +1669,7 @@ ...@@ -1671,7 +1669,7 @@
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green; this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(12, 355); this.btnInOutP2.Location = new System.Drawing.Point(12, 303);
this.btnInOutP2.Name = "btnInOutP2"; this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(174, 32); this.btnInOutP2.Size = new System.Drawing.Size(174, 32);
...@@ -1688,7 +1686,7 @@ ...@@ -1688,7 +1686,7 @@
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green; this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(12, 317); this.btnInOutP1.Location = new System.Drawing.Point(12, 265);
this.btnInOutP1.Name = "btnInOutP1"; this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(174, 32); this.btnInOutP1.Size = new System.Drawing.Size(174, 32);
...@@ -1705,7 +1703,7 @@ ...@@ -1705,7 +1703,7 @@
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(12, 279); this.btnMiddleP1.Location = new System.Drawing.Point(12, 227);
this.btnMiddleP1.Name = "btnMiddleP1"; this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(174, 32); this.btnMiddleP1.Size = new System.Drawing.Size(174, 32);
...@@ -1722,7 +1720,7 @@ ...@@ -1722,7 +1720,7 @@
this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(12, 128); this.btnUpDownP1.Location = new System.Drawing.Point(12, 76);
this.btnUpDownP1.Name = "btnUpDownP1"; this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(174, 32); this.btnUpDownP1.Size = new System.Drawing.Size(174, 32);
...@@ -1738,7 +1736,7 @@ ...@@ -1738,7 +1736,7 @@
this.btnComP3.Cursor = System.Windows.Forms.Cursors.Default; this.btnComP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple; this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(287, 392); this.btnComP3.Location = new System.Drawing.Point(287, 340);
this.btnComP3.Name = "btnComP3"; this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(174, 32); this.btnComP3.Size = new System.Drawing.Size(174, 32);
...@@ -1754,7 +1752,7 @@ ...@@ -1754,7 +1752,7 @@
this.btnComP2.Cursor = System.Windows.Forms.Cursors.Default; this.btnComP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple; this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(11, 431); this.btnComP2.Location = new System.Drawing.Point(11, 379);
this.btnComP2.Name = "btnComP2"; this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(174, 32); this.btnComP2.Size = new System.Drawing.Size(174, 32);
...@@ -1770,7 +1768,7 @@ ...@@ -1770,7 +1768,7 @@
this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default; this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green; this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(287, 317); this.btnInOutP3.Location = new System.Drawing.Point(287, 265);
this.btnInOutP3.Name = "btnInOutP3"; this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(174, 32); this.btnInOutP3.Size = new System.Drawing.Size(174, 32);
...@@ -1786,7 +1784,7 @@ ...@@ -1786,7 +1784,7 @@
this.btnMiddleP2.Cursor = System.Windows.Forms.Cursors.Default; this.btnMiddleP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(287, 279); this.btnMiddleP2.Location = new System.Drawing.Point(287, 227);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(174, 32); this.btnMiddleP2.Size = new System.Drawing.Size(174, 32);
...@@ -1802,7 +1800,7 @@ ...@@ -1802,7 +1800,7 @@
this.btnUpDownP5.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpDownP5.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownP5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP5.Location = new System.Drawing.Point(287, 203); this.btnUpDownP5.Location = new System.Drawing.Point(287, 151);
this.btnUpDownP5.Name = "btnUpDownP5"; this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(174, 32); this.btnUpDownP5.Size = new System.Drawing.Size(174, 32);
...@@ -1818,7 +1816,7 @@ ...@@ -1818,7 +1816,7 @@
this.btnUpDownP6.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpDownP6.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownP6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP6.Location = new System.Drawing.Point(287, 241); this.btnUpDownP6.Location = new System.Drawing.Point(287, 189);
this.btnUpDownP6.Name = "btnUpDownP6"; this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(174, 32); this.btnUpDownP6.Size = new System.Drawing.Size(174, 32);
...@@ -1834,7 +1832,7 @@ ...@@ -1834,7 +1832,7 @@
this.btnUpDownP3.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpDownP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP3.Location = new System.Drawing.Point(287, 128); this.btnUpDownP3.Location = new System.Drawing.Point(287, 76);
this.btnUpDownP3.Name = "btnUpDownP3"; this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(174, 32); this.btnUpDownP3.Size = new System.Drawing.Size(174, 32);
...@@ -1850,7 +1848,7 @@ ...@@ -1850,7 +1848,7 @@
this.btnUpDownP4.Cursor = System.Windows.Forms.Cursors.Default; this.btnUpDownP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.btnUpDownP4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.btnUpDownP4.Location = new System.Drawing.Point(287, 165); this.btnUpDownP4.Location = new System.Drawing.Point(287, 113);
this.btnUpDownP4.Name = "btnUpDownP4"; this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(174, 32); this.btnUpDownP4.Size = new System.Drawing.Size(174, 32);
...@@ -1881,51 +1879,7 @@ ...@@ -1881,51 +1879,7 @@
this.lblTemp.Size = new System.Drawing.Size(159, 20); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270; this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--，当前湿度--"; this.lblTemp.Text = "当前温度--，当前湿度--";
//
// lblMsg
//
this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Green;
this.lblMsg.Location = new System.Drawing.Point(294, 353);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(135, 20);
this.lblMsg.TabIndex = 223;
this.lblMsg.Text = "没有开启自动出入库";
this.lblMsg.Visible = false;
//
// btnStartAuTo
//
this.btnStartAuTo.Enabled = false;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(183, 344);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(105, 38);
this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "启动自动模式";
this.btnStartAuTo.UseVisualStyleBackColor = true;
this.btnStartAuTo.Visible = false;
this.btnStartAuTo.Click += new System.EventHandler(this.btnStartAuTo_Click);
//
// label9
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(37, 355);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(83, 17);
this.label9.TabIndex = 220;
this.label9.Text = "入库间隔仓位:";
this.label9.Visible = false;
//
// txtJiange
//
this.txtJiange.Location = new System.Drawing.Point(132, 350);
this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(37, 23);
this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "0";
this.txtJiange.Visible = false;
// //
// btnInStore // btnInStore
// //
...@@ -2211,43 +2165,43 @@ ...@@ -2211,43 +2165,43 @@
// 轴卡点动ToolStripMenuItem // 轴卡点动ToolStripMenuItem
// //
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem"; this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动"; this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click); this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
// //
// 扫码测试ToolStripMenuItem // 扫码测试ToolStripMenuItem
// //
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem"; this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试"; this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click); this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
// //
// toolStripSeparator10 // toolStripSeparator10
// //
this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator10.Size = new System.Drawing.Size(157, 6);
// //
// 摄像机调试ToolStripMenuItem // 摄像机调试ToolStripMenuItem
// //
this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem"; this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.摄像机调试ToolStripMenuItem.Text = "二维码学习"; this.摄像机调试ToolStripMenuItem.Text = "二维码学习";
this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click); this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(157, 6);
// //
// 出入库调试ToolStripMenuItem // 出入库调试ToolStripMenuItem
// //
this.出入库调试ToolStripMenuItem.Name = "出入库调试ToolStripMenuItem"; this.出入库调试ToolStripMenuItem.Name = "出入库调试ToolStripMenuItem";
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.出入库调试ToolStripMenuItem.Text = "启用调试"; this.出入库调试ToolStripMenuItem.Text = "启用调试";
this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click); this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click);
// //
...@@ -2264,19 +2218,19 @@ ...@@ -2264,19 +2218,19 @@
// 清理日志ToolStripMenuItem // 清理日志ToolStripMenuItem
// //
this.清理日志ToolStripMenuItem.Name = "清理日志ToolStripMenuItem"; this.清理日志ToolStripMenuItem.Name = "清理日志ToolStripMenuItem";
this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.清理日志ToolStripMenuItem.Text = "中文"; this.清理日志ToolStripMenuItem.Text = "中文";
this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click); this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(109, 6);
// //
// 英文ToolStripMenuItem // 英文ToolStripMenuItem
// //
this.英文ToolStripMenuItem.Name = "英文ToolStripMenuItem"; this.英文ToolStripMenuItem.Name = "英文ToolStripMenuItem";
this.英文ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.英文ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.英文ToolStripMenuItem.Text = "英文"; this.英文ToolStripMenuItem.Text = "英文";
this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click); this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
// //
...@@ -2298,7 +2252,7 @@ ...@@ -2298,7 +2252,7 @@
this.groupBox3.Controls.Add(this.lblWarnMsg); this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Location = new System.Drawing.Point(7, 32); this.groupBox3.Location = new System.Drawing.Point(7, 32);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(573, 111); this.groupBox3.Size = new System.Drawing.Size(573, 107);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
...@@ -2609,6 +2563,18 @@ ...@@ -2609,6 +2563,18 @@
this.tabPage4.Text = "日志"; this.tabPage4.Text = "日志";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
// //
// btnClearBuzzer
//
this.btnClearBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearBuzzer.Location = new System.Drawing.Point(11, 418);
this.btnClearBuzzer.Name = "btnClearBuzzer";
this.btnClearBuzzer.Size = new System.Drawing.Size(151, 38);
this.btnClearBuzzer.TabIndex = 257;
this.btnClearBuzzer.Text = "清理蜂鸣器";
this.btnClearBuzzer.UseVisualStyleBackColor = true;
this.btnClearBuzzer.Click += new System.EventHandler(this.btnClearBuzzer_Click);
//
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.groupAxis); this.tabPage2.Controls.Add(this.groupAxis);
...@@ -2634,13 +2600,9 @@ ...@@ -2634,13 +2600,9 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.groupBox7); this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.lblTemp); this.tabPage1.Controls.Add(this.lblTemp);
this.tabPage1.Controls.Add(this.lblMsg);
this.tabPage1.Controls.Add(this.btnStartAuTo);
this.tabPage1.Controls.Add(this.btnInStore); this.tabPage1.Controls.Add(this.btnInStore);
this.tabPage1.Controls.Add(this.btnBatchReset); this.tabPage1.Controls.Add(this.btnBatchReset);
this.tabPage1.Controls.Add(this.txtJiange);
this.tabPage1.Controls.Add(this.label9);
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(655, 459); this.tabPage1.Size = new System.Drawing.Size(655, 459);
...@@ -2902,23 +2864,73 @@ ...@@ -2902,23 +2864,73 @@
this.lblOutInfo.Text = "累积出库信息"; this.lblOutInfo.Text = "累积出库信息";
this.lblOutInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblOutInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// btnClearBuzzer // btnStart
// //
this.btnClearBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Location = new System.Drawing.Point(387, 20);
this.btnClearBuzzer.Location = new System.Drawing.Point(11, 418); this.btnStart.Name = "btnStart";
this.btnClearBuzzer.Name = "btnClearBuzzer"; this.btnStart.Size = new System.Drawing.Size(157, 38);
this.btnClearBuzzer.Size = new System.Drawing.Size(151, 38); this.btnStart.TabIndex = 280;
this.btnClearBuzzer.TabIndex = 257; this.btnStart.Text = "开始自动出入库";
this.btnClearBuzzer.Text = "清理蜂鸣器"; this.btnStart.UseVisualStyleBackColor = true;
this.btnClearBuzzer.UseVisualStyleBackColor = true; this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
this.btnClearBuzzer.Click += new System.EventHandler(this.btnClearBuzzer_Click); //
// label30
//
this.label30.Cursor = System.Windows.Forms.Cursors.Default;
this.label30.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label30.ForeColor = System.Drawing.SystemColors.ControlText;
this.label30.Location = new System.Drawing.Point(18, 73);
this.label30.Name = "label30";
this.label30.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label30.Size = new System.Drawing.Size(147, 28);
this.label30.TabIndex = 281;
this.label30.Text = "自动出入口间隔:";
this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// cmbJianGe
//
this.cmbJianGe.AutoCompleteCustomSource.AddRange(new string[] {
"0",
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"10"});
this.cmbJianGe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbJianGe.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbJianGe.FormattingEnabled = true;
this.cmbJianGe.Location = new System.Drawing.Point(167, 73);
this.cmbJianGe.Name = "cmbJianGe";
this.cmbJianGe.Size = new System.Drawing.Size(93, 28);
this.cmbJianGe.TabIndex = 282;
//
// groupAuto
//
this.groupAuto.Controls.Add(this.btnSave);
this.groupAuto.Controls.Add(this.cmbJianGe);
this.groupAuto.Controls.Add(this.label30);
this.groupAuto.Controls.Add(this.btnStart);
this.groupAuto.Controls.Add(this.cmbPosition);
this.groupAuto.Controls.Add(this.label21);
this.groupAuto.Location = new System.Drawing.Point(7, 141);
this.groupAuto.Name = "groupAuto";
this.groupAuto.Size = new System.Drawing.Size(573, 118);
this.groupAuto.TabIndex = 303;
this.groupAuto.TabStop = false;
this.groupAuto.Text = "自动出入库";
// //
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1264, 729); this.ClientSize = new System.Drawing.Size(1264, 729);
this.Controls.Add(this.groupAuto);
this.Controls.Add(this.groupBox6); this.Controls.Add(this.groupBox6);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
...@@ -2957,6 +2969,7 @@ ...@@ -2957,6 +2969,7 @@
this.groupBox7.PerformLayout(); this.groupBox7.PerformLayout();
this.groupBox6.ResumeLayout(false); this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout(); this.groupBox6.PerformLayout();
this.groupAuto.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -3034,10 +3047,8 @@ ...@@ -3034,10 +3047,8 @@
private System.Windows.Forms.TextBox lblOutPulse1; private System.Windows.Forms.TextBox lblOutPulse1;
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox txtJiange;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Button btnStartAuTo;
private System.Windows.Forms.Label lblMsg;
private System.Windows.Forms.TextBox txtMiddleTarget; private System.Windows.Forms.TextBox txtMiddleTarget;
private System.Windows.Forms.TextBox txtInoutTarget; private System.Windows.Forms.TextBox txtInoutTarget;
private System.Windows.Forms.TextBox txtUpdownTarget; private System.Windows.Forms.TextBox txtUpdownTarget;
...@@ -3198,6 +3209,10 @@ ...@@ -3198,6 +3209,10 @@
private System.Windows.Forms.TabPage tabPage4; private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.ToolStripMenuItem 出入库调试ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 出入库调试ToolStripMenuItem;
private System.Windows.Forms.Button btnClearBuzzer; private System.Windows.Forms.Button btnClearBuzzer;
private System.Windows.Forms.Button btnStart;
private System.Windows.Forms.ComboBox cmbJianGe;
public System.Windows.Forms.Label label30;
private System.Windows.Forms.GroupBox groupAuto;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -192,7 +192,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -192,7 +192,7 @@ namespace OnlineStore.AutoInOutStore
} }
preOpen = isOpen; preOpen = isOpen;
btnOutStore.Enabled = isOpen; //btnOutStore.Enabled = isOpen;
//btnInStore.Enabled = isOpen; //btnInStore.Enabled = isOpen;
//btnAxisAMove.Enabled = isOpen; //btnAxisAMove.Enabled = isOpen;
...@@ -235,6 +235,14 @@ namespace OnlineStore.AutoInOutStore ...@@ -235,6 +235,14 @@ namespace OnlineStore.AutoInOutStore
cmbHomeType.SelectedIndex = 1; cmbHomeType.SelectedIndex = 1;
timer1.Start(); timer1.Start();
store.ResetEvent += Store_ResetEvent; store.ResetEvent += Store_ResetEvent;
cmbJianGe.Items.Clear();
for(int i = 0; i <= 20; i++)
{
cmbJianGe.Items.Add(i.ToString());
}
cmbJianGe.SelectedIndex = 0;
DebugStatus(false);
} }
private void Store_ResetEvent() private void Store_ResetEvent()
...@@ -326,10 +334,10 @@ namespace OnlineStore.AutoInOutStore ...@@ -326,10 +334,10 @@ namespace OnlineStore.AutoInOutStore
if (store.autoNext) if (store.autoNext)
{ {
string msg = store.autoMsg; string msg = store.autoMsg;
lblMsg.Text = msg; groupAuto.Text = msg;
if (btnStartAuTo.Text.Equals(StartAuto)) if (btnStart.Text.Equals(StartAuto))
{ {
btnStartAuTo.Text = StopAuto; btnStart.Text = StopAuto;
} }
try try
{ {
...@@ -345,18 +353,17 @@ namespace OnlineStore.AutoInOutStore ...@@ -345,18 +353,17 @@ namespace OnlineStore.AutoInOutStore
} }
else else
{ {
// lblMsg.Text = "没有开启自动出入库"; groupAuto.Text = "自动出入库操作";
if (btnStartAuTo.Text.Equals(StopAuto)) btnStart.Text = StartAuto;
{
btnStartAuTo.Text =StartAuto;
}
} }
} }
else else
{ {
groupAuto.Text = StartAuto;
lblThisSta.Text = WaitStart; lblThisSta.Text = WaitStart;
//lblWarnMsg.Text = ""; //lblWarnMsg.Text = "";
btnStartAuTo.Text =StartAuto; btnStart.Text =StartAuto;
lblDoorStatus.Text =ResourceCulture.GetString(ResourceCulture.NoDoorStatus, "仓门状态未知"); lblDoorStatus.Text =ResourceCulture.GetString(ResourceCulture.NoDoorStatus, "仓门状态未知");
} }
}catch(Exception ex) }catch(Exception ex)
...@@ -992,46 +999,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -992,46 +999,7 @@ namespace OnlineStore.AutoInOutStore
{ {
FormManager.ShowAxisDebug(store); FormManager.ShowAxisDebug(store);
} }
private void btnStartAuTo_Click(object sender, EventArgs e)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotSingleInStore,"此设备不支持单个入库"), ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示"), MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
{
if (store.autoNext)
{
store.autoNext = false;
btnStartAuTo.Text = StartAuto;
}
else
{
DialogResult res = MessageBox.Show(StartAuto+"？", ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示"), MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes))
{
store.autoNext = true;
int jiange = FormUtil.GetIntValue(txtJiange);
store.autoJiange = jiange;
if (cmbPosition.SelectedIndex >= 0)
{
int currIndex = cmbPosition.SelectedIndex;
store.autoPositionIndex = currIndex;
string poText = cmbPosition.Text;
store.autoMsg = "自动出库：" + poText;
LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
//store.StartOutStoreMove(new InOutStoreParam("", poText));
store.StartInStoreMove(new InOutStoreParam("", poText), false);
}
btnStartAuTo.Text = StopAuto;
}
}
}
else
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！"));
}
}
private void 轴卡点动ToolStripMenuItem_Click(object sender, EventArgs e) private void 轴卡点动ToolStripMenuItem_Click(object sender, EventArgs e)
{ {
button1_Click(null, null); button1_Click(null, null);
...@@ -1313,16 +1281,11 @@ namespace OnlineStore.AutoInOutStore ...@@ -1313,16 +1281,11 @@ namespace OnlineStore.AutoInOutStore
{ {
this.timer1.Enabled = false; this.timer1.Enabled = false;
} }
if (this.停止ToolStripMenuItem.Enabled) LogUtil.info("ExitApp:停止料仓运行");
{
stop_button_Click(null, null);
}
LogUtil.info("ExitApp:停止料仓运行");
store.Exit(); store.Exit();
LogUtil.info("ExitApp:料仓已停止，关闭所有DO"); ACServerManager.CloseAllPort();
IOManager.instance.CloseAllDO(); StoreOpenStatus(false);
StoreOpenStatus(false); LogUtil.info("ExitApp: 端口所有IO连接");
LogUtil.info("ExitApp:关闭所有DO完成，端口所有IO连接");
IOManager.instance.CloseAllConnection(); IOManager.instance.CloseAllConnection();
//KNDAIManager.CloseAllConnection(); //KNDAIManager.CloseAllConnection();
//WCFControl.CloseWCF(); //WCFControl.CloseWCF();
...@@ -1351,7 +1314,6 @@ namespace OnlineStore.AutoInOutStore ...@@ -1351,7 +1314,6 @@ namespace OnlineStore.AutoInOutStore
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.notifyIcon1.Visible = true; this.notifyIcon1.Visible = true;
this.Hide(); this.Hide();
DebugStatus(false);
} }
private void FrmStoreBox_FormClosed(object sender, FormClosedEventArgs e) private void FrmStoreBox_FormClosed(object sender, FormClosedEventArgs e)
{ {
...@@ -1520,7 +1482,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1520,7 +1482,7 @@ namespace OnlineStore.AutoInOutStore
{ {
ACServerManager.ServoOff(store.Config.Batch_Axis.DeviceName, store.Config.Batch_Axis.GetAxisValue()); ACServerManager.ServoOff(store.Config.Batch_Axis.DeviceName, store.Config.Batch_Axis.GetAxisValue());
//关闭串口，等下次重新打开 //关闭串口，等下次重新打开
ACServerManager.ColsePort(store.Config.Batch_Axis.DeviceName); //ACServerManager.ColsePort(store.Config.Batch_Axis.DeviceName);
Thread.Sleep(100); Thread.Sleep(100);
IOManager.IOMove(IO_Type.Run_Sign, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Run_Sign, IO_VALUE.LOW);
...@@ -1688,9 +1650,9 @@ namespace OnlineStore.AutoInOutStore ...@@ -1688,9 +1650,9 @@ namespace OnlineStore.AutoInOutStore
} }
private void DebugStatus(bool status) private void DebugStatus(bool status)
{ {
if (status) if (status)
{ {
出入库调试ToolStripMenuItem.Text = "禁用调试"; 出入库调试ToolStripMenuItem.Text = "禁用调试";
} }
else else
...@@ -1700,11 +1662,71 @@ namespace OnlineStore.AutoInOutStore ...@@ -1700,11 +1662,71 @@ namespace OnlineStore.AutoInOutStore
groupAxis.Enabled = status; groupAxis.Enabled = status;
groupComAxis.Enabled = status; groupComAxis.Enabled = status;
groupInout.Enabled = status; groupInout.Enabled = status;
if ( store.autoNext)
{
groupAuto.Enabled = true;
cmbJianGe.Enabled = false;
}
else
{
groupAuto.Enabled = status;
}
} }
private void btnClearBuzzer_Click(object sender, EventArgs e) private void btnClearBuzzer_Click(object sender, EventArgs e)
{ {
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
} }
private void btnStart_Click(object sender, EventArgs e)
{
if (store.storeRunStatus >= StoreRunStatus.HomeMoving )
{
if (store.autoNext)
{
store.autoNext = false;
btnStart.Text = StartAuto;
}
else
{
DialogResult res = MessageBox.Show("确定开始自动出入库？", "提示", MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes))
{
store.autoNext = true;
int jiange = cmbJianGe.SelectedIndex;
store.autoJiange = jiange;
if (cmbPosition.SelectedIndex >= 0)
{
int currIndex = cmbPosition.SelectedIndex;
store.autoPositionIndex = currIndex;
store.AutoStartIndex = currIndex;
string poText = cmbPosition.Text;
ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, poText);
store.autoMsg = "自动入库：" + poText;
string msg = AutomaticBaiting.doStartBatchIn();
if (msg.Equals(""))
{
btnStart.Text = StopAuto;
LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
}
else
{
MessageBox.Show(msg);
store.autoNext = false;
btnStart.Text = StartAuto;
LogUtil.info(LOGGER, store.StoreName + "自动出入库失败【"+msg+"】，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
}
DebugStatus(false);
}
}
}
}
else
{
MessageBox.Show("请先启动料仓！");
}
}
} }
} }
source/ACSingleStore/记录.txt
...@@ -149,6 +149,9 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,, ...@@ -149,6 +149,9 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,,
新料仓修改：增加一对门锁气缸输入信号 新料仓修改：增加一对门锁气缸输入信号
蜂鸣器和报警灯分开处理。 蜂鸣器和报警灯分开处理。
20190428
增加自动出入库功能。
......
source/DeviceLibrary/DeviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -119,8 +119,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -119,8 +119,19 @@ namespace OnlineStore.DeviceLibrary
{ {
serialBeanMap.Remove(portName); serialBeanMap.Remove(portName);
} }
LogUtil.info("ACServerManager 关闭串口【" + portName + "】 ");
} }
public static void CloseAllPort()
{
List<string> kes = new List<string>(serialBeanMap.Keys);
foreach (string key in kes)
{
ColsePort(key);
}
}
/// <summary> /// <summary>
/// 是否成功打开伺服 /// 是否成功打开伺服
/// </summary> /// </summary>
......
source/DeviceLibrary/DeviceLibrary/PanasonicServo/BatchAxisController.cs
...@@ -22,7 +22,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -22,7 +22,7 @@ namespace OnlineStore.DeviceLibrary
{ {
checkTimer = new System.Timers.Timer(); checkTimer = new System.Timers.Timer();
checkTimer.AutoReset = true; checkTimer.AutoReset = true;
checkTimer.Interval += 50; checkTimer.Interval += 49;
checkTimer.Elapsed += CheckTimer_Elapsed; checkTimer.Elapsed += CheckTimer_Elapsed;
checkTimer.Enabled = false; checkTimer.Enabled = false;
} }
...@@ -40,6 +40,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -40,6 +40,7 @@ namespace OnlineStore.DeviceLibrary
return true; return true;
} }
private static bool IsInProcess = false; private static bool IsInProcess = false;
private static DateTime preTime = DateTime.Now;
private static void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) private static void CheckTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{ {
if (IsInProcess) { return; } if (IsInProcess) { return; }
...@@ -50,11 +51,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -50,11 +51,15 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("批量上料轴，检测到【" + TargetIoType + "】信号，可以停止运动"); LogUtil.info("批量上料轴，检测到【" + TargetIoType + "】信号，可以停止运动");
result = true; result = true;
} }
//else if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1)) TimeSpan span = DateTime.Now - preTime;
//{ if (span.TotalMilliseconds > 100)
// LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动"); {
// result = true; if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(1))
//} {
LogUtil.info("批量上料轴，检测到正极限信号，可以停止运动");
result = true;
}
}
if (result) if (result)
{ {
//AutoAxisIsMove = 0; //AutoAxisIsMove = 0;
...@@ -62,6 +67,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -62,6 +67,7 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.SuddenStop(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue()); ACServerManager.SuddenStop(StoreManager.Config.Batch_Axis.DeviceName, StoreManager.Config.Batch_Axis.GetAxisValue());
StopCheck(); StopCheck();
} }
preTime = DateTime.Now;
IsInProcess = false; IsInProcess = false;
} }
} }
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -711,13 +711,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -711,13 +711,15 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(StoreName + "关闭刹车，关闭伺服"); LogUtil.info(StoreName + "关闭刹车，关闭伺服");
IOManager.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
LogUtil.debug(StoreName + "关闭刹车完成，开始关闭伺服");
foreach (ConfigMoveAxis axis in moveAxisList) foreach (ConfigMoveAxis axis in moveAxisList)
{ {
ACServerManager.ServoOff(axis.DeviceName, axis.GetAxisValue()); LogUtil.debug(StoreName + " 开始关闭伺服 " +axis.DisplayStr);
//关闭串口，等下次重新打开 ACServerManager.ServoOff(axis.DeviceName, axis.GetAxisValue());
ACServerManager.ColsePort(axis.DeviceName);
} }
Thread.Sleep(100); Thread.Sleep(100);
LogUtil.debug(StoreName + "关闭伺服完成，开始关闭Run_Sign");
IOManager.IOMove(IO_Type.Run_Sign, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Run_Sign, IO_VALUE.LOW);
} }
...@@ -778,11 +780,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -778,11 +780,11 @@ namespace OnlineStore.DeviceLibrary
} }
public void Exit() public void Exit()
{ {
if (!storeRunStatus.Equals(StoreRunStatus.Wait)) mainTimer.Enabled = false;
if (storeRunStatus > StoreRunStatus.Wait)
{ {
StopRun(); StopRun();
} }
mainTimer.Enabled = false;
} }
public override void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType) public override void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
{ {
...@@ -1124,20 +1126,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -1124,20 +1126,18 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(LOGGER, "IOTimeOutProcess出错：" + ex.ToString()); LogUtil.error(LOGGER, "IOTimeOutProcess出错：" + ex.ToString());
} }
} }
//private DateTime preProTime = DateTime.Now; private DateTime preProTime = DateTime.Now;
/// <summary>
/// 超过配置次数时需要复位
/// </summary>
private void AutoResetProcess() private void AutoResetProcess()
{ {
try try
{ {
//TimeSpan span = DateTime.Now - preProTime; TimeSpan span = DateTime.Now - preProTime;
//if (span.TotalSeconds < 1) if (span.TotalSeconds < 10)
//{ {
// return; return;
//} }
//preProTime = DateTime.Now; preProTime = DateTime.Now;
if (CurrInOutACount >= this.Config.Box_ResetACount) if (CurrInOutACount >= this.Config.Box_ResetACount)
{ {
if (storeRunStatus < StoreRunStatus.Runing || StoreMove.MoveType == StoreMoveType.InStore || StoreMove.MoveType == StoreMoveType.OutStore) if (storeRunStatus < StoreRunStatus.Runing || StoreMove.MoveType == StoreMoveType.InStore || StoreMove.MoveType == StoreMoveType.OutStore)
...@@ -1287,6 +1287,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1287,6 +1287,8 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW); IOManager.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
} }
} }
MeteringSignal.StopCheck();
AutomaticBaiting.StopMove();
if (IsCloseAxis) if (IsCloseAxis)
{ {
CloseAllAxis(); CloseAllAxis();
...@@ -1295,8 +1297,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -1295,8 +1297,6 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
AutomaticBaiting.StopMove();
MeteringSignal.StopCheck();
isInPro = false; isInPro = false;
} }
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -24,8 +24,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -24,8 +24,12 @@ namespace OnlineStore.DeviceLibrary
/// 自动出入库间隔 /// 自动出入库间隔
/// </summary> /// </summary>
public int autoJiange = 3; public int autoJiange = 3;
public int AutoStartIndex = 0;
public int autoPositionIndex = 0; public int autoPositionIndex = 0;
public string autoMsg = ""; public string autoMsg = "";
private static StoreMoveType lastMoveType = StoreMoveType.None;
#endregion #endregion
#region 出入库参数 #region 出入库参数
...@@ -308,6 +312,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -308,6 +312,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
storeStatus = StoreStatus.InStoreExecute; storeStatus = StoreStatus.InStoreExecute;
StoreMove.NewMove(StoreMoveType.InStore, param); StoreMove.NewMove(StoreMoveType.InStore, param);
lastMoveType = StoreMoveType.InStore;
StoreMove.IsBatchInOutStore = IsBatchWork; StoreMove.IsBatchInOutStore = IsBatchWork;
StoreMove.IsNeedInStore = isNeedInStore; StoreMove.IsNeedInStore = isNeedInStore;
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
...@@ -624,6 +629,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -624,6 +629,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + logMsg); LogUtil.info(LOGGER, StoreName + logMsg);
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
StoreMove.NewMove(StoreMoveType.OutStore, param); StoreMove.NewMove(StoreMoveType.OutStore, param);
lastMoveType = StoreMoveType.OutStore;
StoreMove.IsBatchInOutStore = IsBatchWork; StoreMove.IsBatchInOutStore = IsBatchWork;
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
...@@ -1005,78 +1011,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -1005,78 +1011,30 @@ namespace OnlineStore.DeviceLibrary
} }
if (storeMoveType.Equals(StoreMoveType.InStore)) if (storeMoveType.Equals(StoreMoveType.InStore))
{ {
int newIndex = autoPositionIndex - 1; string posid = PositionNumList[autoPositionIndex];
if (autoJiange == 0)
{
newIndex = autoPositionIndex;
}
if (newIndex < 0)
{
autoNext = false;
autoMsg = "自动出入库结束！";
LogUtil.info(LOGGER, StoreName + "下一个索引不存在，自动 出入库结束！");
}
else
{
autoPositionIndex = newIndex;
string posid = PositionNumList[autoPositionIndex];
//判断是否需要重置 autoMsg = "自动入库：" + posid;
if (CurrInOutACount >= Config.Box_ResetACount) //自动出入口，入库结束把出库加入队列
{ FixtureCodeInfo currInOutFixture = new FixtureCodeInfo(0, "", posid);
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutACount + "次，需要重置BOX，先把出库信息存入排队列表中"); AddWaitOutInfo(currInOutFixture);
Reset(false); LogUtil.info("自动出入口，入库结束，将库位号【"+ posid + "】加入出库等待中");
autoMsg = "自动出库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
}
else if (CurrInOutCount >= Config.Box_ResetMCount)
{
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
//ResetMiddleAxis(false);
autoMsg = "自动出库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
}
else
{
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid);
autoMsg = "自动出库：" + posid;
StartOutStoreMove(new InOutStoreParam("", posid), false);
}
}
} }
else if (storeMoveType.Equals(StoreMoveType.OutStore)) else if (storeMoveType.Equals(StoreMoveType.OutStore))
{ {
int newIndex = autoPositionIndex - autoJiange; int newIndex = autoPositionIndex - autoJiange;
if (newIndex < 0) if (newIndex < 0)
{ {
autoNext = false; newIndex = AutoStartIndex;
autoMsg = "自动出入库结束！";
LogUtil.info(LOGGER, StoreName + "下一个索引不存在，自动 出入库结束！");
} }
else else
{ {
autoPositionIndex = newIndex;
string posid = PositionNumList[newIndex]; string posid = PositionNumList[newIndex];
//判断是否需要重置 ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, posid);
if (CurrInOutACount >= Config.Box_ResetACount) //开始自动入库
{ autoMsg = "自动入库：" + posid;
LogUtil.info(LOGGER, StoreName + "自动进入下一个入库：posid=" + posid + ",当时已经出入库" + CurrInOutACount + "次，需要重置BOX，先把入库信息存入排队列表中"); string msg = AutomaticBaiting.doStartBatchIn();
Reset(false); LogUtil.info("自动出入库：库位号【"+posid+"】，开始入库"+msg);
autoMsg = "自动入库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid));
}
else if (CurrInOutCount >= Config.Box_ResetMCount)
{
LogUtil.info(LOGGER, StoreName + "自动进入下一个出库：posid=" + posid + ",当时已经出入库" + CurrInOutCount + "次，需要重置BOX旋转轴，先把出库信息存入排队列表中");
//ResetMiddleAxis(false);
autoMsg = "自动入库：" + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid ));
}
else
{
LogUtil.info(LOGGER, StoreName + "自动进入下一个入库：posid=" + posid);
autoMsg = "自动入库：" + posid;
StartInStoreMove(new InOutStoreParam("AAAA", posid), false);
}
} }
} }
} }
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
...@@ -275,15 +275,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -275,15 +275,15 @@ namespace OnlineStore.DeviceLibrary
} }
LastCodeList = hasList; LastCodeList = hasList;
LastCode = message; LastCode = message;
if (LastCode.Equals("")&&StoreManager.Store.IsDebug) if (LastCode.Equals("") && (StoreManager.Store.IsDebug || StoreManager.Store.autoNext))
{ {
LastCode = "NoCode"; LastCode = "NoCode";
LogUtil.info(Name + "模拟二维码：NoCode"); LogUtil.info(Name + "模拟二维码：NoCode");
} }
if (LastCode.Equals("")) if (LastCode.Equals(""))
{ {
StoreManager.Store.CodeOrInoutMsg = "未扫到二维码，需要将料盘送出"; StoreManager.Store.CodeOrInoutMsg = "未扫到二维码，需要将料盘送出";
LogUtil.error("未扫到二维码，需要将料盘送出"); LogUtil.error("未扫到二维码，需要将料盘送出");
} }
else else
{ {
...@@ -331,122 +331,132 @@ namespace OnlineStore.DeviceLibrary ...@@ -331,122 +331,132 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
message = ScanCodeManager.ReplaceCode(message); if (StoreManager.Store.IsDebug || StoreManager.Store.autoNext)
if (message.Equals("") || string.IsNullOrEmpty(message))
{
CodeMsg = "没有收到二维码信息，请重新放入料盘";
LogUtil.info(Name + "没有收到二维码信息，请重新放入料盘");
return;
}
if (StoreManager.Store.storeRunStatus.Equals(StoreRunStatus.Wait))
{
LogUtil.info(Name + "收到二维码【 " + message + "】，设备未启动，不需要发送服务器");
return;
}
if (StoreManager.Store.IsDebug)
{ {
string posId = ConfigAppSettings.GetValue(Setting_Init.DebugPosId); string posId = ConfigAppSettings.GetValue(Setting_Init.DebugPosId);
if (!posId.Equals("")) if (!posId.Equals(""))
{ {
LogUtil.info(Name + "调试模式，模拟库位号【" + posId + "】"); string type = StoreManager.Store.autoNext ? "自动出入库" : "入库模拟调试";
LogUtil.info(Name + type + " ，模拟库位号【" + posId + "】");
if (StoreManager.Store.CanStarInOut()) if (StoreManager.Store.CanStarInOut())
{ {
LastPosId = posId; LastPosId = posId;
InOutStoreParam param = new InOutStoreParam(message, posId, LastHeight, LastWidth); InOutStoreParam param = new InOutStoreParam(message, posId, LastHeight, LastWidth);
bool result = StoreManager.Store.StartInStoreMove(param, true); bool result = StoreManager.Store.StartInStoreMove(param, true);
//如果当前正在出入库中，需要记录下来，等待空闲时执行 //如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(Name + " 入库调试模拟：库位号【" + posId + "】二维码【" + message + "】 开始入库！"); LogUtil.info(Name + type + " ：库位号【" + posId + "】二维码【" + message + "】 开始入库！");
} }
else else
{ {
LogUtil.info(Name + " 入库调试模拟：库位号【" + posId + "】二维码【" + message + "】 正在忙碌中，无法入库！"); LogUtil.info(Name + type + " ：库位号【" + posId + "】二维码【" + message + "】 正在忙碌中，无法入库！");
}
//清理库位号，防止重复入库
if (StoreManager.Store.autoNext)
{
ConfigAppSettings.SaveValue(Setting_Init.DebugPosId, "");
} }
return; return;
} }
} }
//开启服务器日志 else
//HttpHelper.isLog = 1;
LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID");
//发送扫码内容到服务器进行入库操作
Operation operation = StoreManager.Store.getLineBoxStatus();
operation.op = 1;
if (operation.data == null)
{ {
operation.data = new Dictionary<string, string>(); message = ScanCodeManager.ReplaceCode(message);
} if (message.Equals("") || string.IsNullOrEmpty(message))
operation.data.Add("code", message); {
operation.data.Add("boxId", StoreManager.Store.StoreID.ToString()); CodeMsg = "没有收到二维码信息，请重新放入料盘";
LogUtil.info(Name + "没有收到二维码信息，请重新放入料盘");
return;
}
//{ { "code", message }, { "boxId", StoreManager.Store.StoreID.ToString() } }; if (StoreManager.Store.storeRunStatus.Equals(StoreRunStatus.Wait))
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); {
Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false); LogUtil.info(Name + "收到二维码【 " + message + "】，设备未启动，不需要发送服务器");
return;
}
//HttpHelper.isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
if (resultOperation == null) //开启服务器日志
{ //HttpHelper.isLog = 1;
// CodeMsg = "二维码【" + message + "】没有收到服务器反馈"; LogUtil.info(Name + "收到二维码【 " + message + "】，发送给服务器获取入库PosID");
LogUtil.info(Name + "二维码【" + message + "】没有收到服务器反馈！"); //发送扫码内容到服务器进行入库操作
return; Operation operation = StoreManager.Store.getLineBoxStatus();
} operation.op = 1;
else if (!string.IsNullOrEmpty(resultOperation.msg)) if (operation.data == null)
{
//如果有提示消息，直接显示提示
LogUtil.info(Name + "服务器反馈 二维码【" + message + "】 ：" + resultOperation.msg);
return;
}
Dictionary<string, string> data = resultOperation.data;
if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
{
//服务器返回时有：posId库位编号，plateW:料盘宽度,plateH：料盘高度，
//postId格式BoxId#位置
string posId = data[ParamDefine.posId];
try
{ {
operation.data = new Dictionary<string, string>();
}
operation.data.Add("code", message);
operation.data.Add("boxId", StoreManager.Store.StoreID.ToString());
int plateW = Convert.ToInt32(data[ParamDefine.plateW]); //{ { "code", message }, { "boxId", StoreManager.Store.StoreID.ToString() } };
int plateH = Convert.ToInt32(data[ParamDefine.plateH]); string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
string singleOut = data[ParamDefine.singleOut]; Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
//bool isSingleOut = singleOut.ToLower().Equals("true");
string[] posArray = posId.Split('#');
if (!(posArray.Length == 2))
{
WarnMsg = Name+ ResourceControl.GetString(ResourceControl.InStoreError, "入库库位格式错误：") + "【" + message + "】【" + posId + "】";
LogUtil.error("服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
LogUtil.info("服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
return;
}
int storeId = int.Parse(posArray[0]); //HttpHelper.isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
//根据发送的posId获取位置列表
AutoStorePosition position = CSVPositionReader<AutoStorePosition>.GetPositon(posId); if (resultOperation == null)
if (position == null) {
{ //出入库没有找到服务器发送的库位，需要打印日志方便查询原因 // CodeMsg = "二维码【" + message + "】没有收到服务器反馈";
WarnMsg = ResourceControl.GetString(ResourceControl.InStoreNoPosition, "入库未找到库位：") + "【" + message + "】【" + posId + "】 "; LogUtil.info(Name + "二维码【" + message + "】没有收到服务器反馈！");
LogUtil.error("收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】"); return;
return; }
} else if (!string.IsNullOrEmpty(resultOperation.msg))
//TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器； {
if (StoreManager.Store.CanStarInOut()) //如果有提示消息，直接显示提示
LogUtil.info(Name + "服务器反馈 二维码【" + message + "】 ：" + resultOperation.msg);
return;
}
Dictionary<string, string> data = resultOperation.data;
if (data != null && data.ContainsKey(ParamDefine.posId) && data.ContainsKey(ParamDefine.plateH) && data.ContainsKey(ParamDefine.plateW))
{
//服务器返回时有：posId库位编号，plateW:料盘宽度,plateH：料盘高度，
//postId格式BoxId#位置
string posId = data[ParamDefine.posId];
try
{ {
LastPosId = posId;
InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW);
bool result = StoreManager.Store.StartInStoreMove(param, true); int plateW = Convert.ToInt32(data[ParamDefine.plateW]);
//如果当前正在出入库中，需要记录下来，等待空闲时执行 int plateH = Convert.ToInt32(data[ParamDefine.plateH]);
LogUtil.info(Name + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 开始入库！"); string singleOut = data[ParamDefine.singleOut];
//bool isSingleOut = singleOut.ToLower().Equals("true");
string[] posArray = posId.Split('#');
if (!(posArray.Length == 2))
{
WarnMsg = Name + ResourceControl.GetString(ResourceControl.InStoreError, "入库库位格式错误：") + "【" + message + "】【" + posId + "】";
LogUtil.error("服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
LogUtil.info("服务器反馈 入库库位格式错误：二维码【" + message + "】库位【" + posId + "】");
return;
}
int storeId = int.Parse(posArray[0]);
//根据发送的posId获取位置列表
AutoStorePosition position = CSVPositionReader<AutoStorePosition>.GetPositon(posId);
if (position == null)
{ //出入库没有找到服务器发送的库位，需要打印日志方便查询原因
WarnMsg = ResourceControl.GetString(ResourceControl.InStoreNoPosition, "入库未找到库位：") + "【" + message + "】【" + posId + "】 ";
LogUtil.error("收到服务器入库命令：入库未找到库位：二维码【" + message + "】库位【" + posId + "】");
return;
}
//TODO:判断BOX是否处于可以入库状态，如果调试或急停中，需要返回给服务器；
if (StoreManager.Store.CanStarInOut())
{
LastPosId = posId;
InOutStoreParam param = new InOutStoreParam(message, posId, plateH, plateW);
bool result = StoreManager.Store.StartInStoreMove(param, true);
//如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(Name + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 开始入库！");
}
else
{
LogUtil.info(Name + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 正在忙碌中，无法入库！");
}
} }
else catch (Exception ex)
{ {
LogUtil.info(Name + " 收到服务器入库命令：库位号【" + posId + "】二维码【" + message + "】 正在忙碌中，无法入库！"); LogUtil.error(Name + "解析服务发送的入库【" + posId + "】出错" + ex.StackTrace);
} }
} }
catch (Exception ex)
{
LogUtil.error(Name + "解析服务发送的入库【" + posId + "】出错" + ex.StackTrace);
}
} }
} }
catch (Exception ex) catch (Exception ex)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!