Skip to content

孙克 / RC1250-ACPackingStore

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

两盘料库位调试

1 个父辈 fc6eba39
内嵌 并排
正在显示 13 个修改的文件 包含 822 行增加 和 215 行删除
source/ACPackingStore/FrmBox.Designer.cs
......@@ -174,9 +174,9 @@
this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(922, 16);
this.groupShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupShelf.Margin = new System.Windows.Forms.Padding(4);
this.groupShelf.Name = "groupShelf";
this.groupShelf.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupShelf.Padding = new System.Windows.Forms.Padding(4);
this.groupShelf.Size = new System.Drawing.Size(296, 352);
this.groupShelf.TabIndex = 274;
this.groupShelf.TabStop = false;
......@@ -188,7 +188,7 @@
this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveShelf.Location = new System.Drawing.Point(148, 286);
this.btnSaveShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSaveShelf.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveShelf.Name = "btnSaveShelf";
this.btnSaveShelf.Size = new System.Drawing.Size(131, 48);
this.btnSaveShelf.TabIndex = 282;
......@@ -219,7 +219,7 @@
this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP101.Location = new System.Drawing.Point(168, 240);
this.txtInoutP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInoutP101.Margin = new System.Windows.Forms.Padding(4);
this.txtInoutP101.MaxLength = 0;
this.txtInoutP101.Name = "txtInoutP101";
this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -236,7 +236,7 @@
this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP101.ForeColor = System.Drawing.Color.Green;
this.btnInoutP101.Location = new System.Drawing.Point(14, 234);
this.btnInoutP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInoutP101.Margin = new System.Windows.Forms.Padding(4);
this.btnInoutP101.Name = "btnInoutP101";
this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP101.Size = new System.Drawing.Size(170, 41);
......@@ -254,7 +254,7 @@
this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMP101.Location = new System.Drawing.Point(168, 194);
this.txtMP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtMP101.Margin = new System.Windows.Forms.Padding(4);
this.txtMP101.MaxLength = 0;
this.txtMP101.Name = "txtMP101";
this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -272,7 +272,7 @@
this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.Location = new System.Drawing.Point(14, 188);
this.button5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.button5.Margin = new System.Windows.Forms.Padding(4);
this.button5.Name = "button5";
this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button5.Size = new System.Drawing.Size(170, 41);
......@@ -290,7 +290,7 @@
this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP101.Location = new System.Drawing.Point(168, 99);
this.txtUpdownP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpdownP101.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP101.MaxLength = 0;
this.txtUpdownP101.Name = "txtUpdownP101";
this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -306,7 +306,7 @@
this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP102.Location = new System.Drawing.Point(168, 146);
this.txtUpdownP102.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpdownP102.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP102.MaxLength = 0;
this.txtUpdownP102.Name = "txtUpdownP102";
this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -323,7 +323,7 @@
this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP101.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP101.Location = new System.Drawing.Point(14, 92);
this.btnUpdownP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdownP101.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP101.Name = "btnUpdownP101";
this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP101.Size = new System.Drawing.Size(170, 41);
......@@ -342,7 +342,7 @@
this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP102.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP102.Location = new System.Drawing.Point(14, 140);
this.btnUpdownP102.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdownP102.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP102.Name = "btnUpdownP102";
this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP102.Size = new System.Drawing.Size(170, 41);
......@@ -358,7 +358,7 @@
this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbShelfPosition.FormattingEnabled = true;
this.cmbShelfPosition.Location = new System.Drawing.Point(96, 34);
this.cmbShelfPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbShelfPosition.Margin = new System.Windows.Forms.Padding(4);
this.cmbShelfPosition.Name = "cmbShelfPosition";
this.cmbShelfPosition.Size = new System.Drawing.Size(182, 31);
this.cmbShelfPosition.TabIndex = 272;
......@@ -379,7 +379,7 @@
this.panel1.Controls.Add(this.btnStoreStop);
this.panel1.Controls.Add(this.btnSotreReset);
this.panel1.Location = new System.Drawing.Point(4, 2);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1648, 59);
this.panel1.TabIndex = 273;
......@@ -388,7 +388,7 @@
//
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Location = new System.Drawing.Point(1466, 5);
this.btnUpdown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdown.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(160, 49);
this.btnUpdown.TabIndex = 273;
......@@ -400,7 +400,7 @@
//
this.btnScanTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScanTest.Location = new System.Drawing.Point(1304, 5);
this.btnScanTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnScanTest.Margin = new System.Windows.Forms.Padding(4);
this.btnScanTest.Name = "btnScanTest";
this.btnScanTest.Size = new System.Drawing.Size(160, 49);
this.btnScanTest.TabIndex = 272;
......@@ -412,7 +412,7 @@
//
this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreHome.Location = new System.Drawing.Point(491, 5);
this.btnStoreHome.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStoreHome.Margin = new System.Windows.Forms.Padding(4);
this.btnStoreHome.Name = "btnStoreHome";
this.btnStoreHome.Size = new System.Drawing.Size(160, 49);
this.btnStoreHome.TabIndex = 3;
......@@ -424,7 +424,7 @@
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(1141, 5);
this.btnAxisOff.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnAxisOff.Margin = new System.Windows.Forms.Padding(4);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(160, 49);
this.btnAxisOff.TabIndex = 11;
......@@ -436,7 +436,7 @@
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(979, 5);
this.btnAxisOn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnAxisOn.Margin = new System.Windows.Forms.Padding(4);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(160, 49);
this.btnAxisOn.TabIndex = 10;
......@@ -448,7 +448,7 @@
//
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(816, 5);
this.btnAxisP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnAxisP.Margin = new System.Windows.Forms.Padding(4);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(160, 49);
this.btnAxisP.TabIndex = 8;
......@@ -460,7 +460,7 @@
//
this.btnIO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIO.Location = new System.Drawing.Point(654, 5);
this.btnIO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnIO.Margin = new System.Windows.Forms.Padding(4);
this.btnIO.Name = "btnIO";
this.btnIO.Size = new System.Drawing.Size(160, 49);
this.btnIO.TabIndex = 5;
......@@ -472,7 +472,7 @@
//
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStart.Location = new System.Drawing.Point(4, 5);
this.btnStoreStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStoreStart.Margin = new System.Windows.Forms.Padding(4);
this.btnStoreStart.Name = "btnStoreStart";
this.btnStoreStart.Size = new System.Drawing.Size(160, 49);
this.btnStoreStart.TabIndex = 0;
......@@ -484,7 +484,7 @@
//
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStop.Location = new System.Drawing.Point(166, 5);
this.btnStoreStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStoreStop.Margin = new System.Windows.Forms.Padding(4);
this.btnStoreStop.Name = "btnStoreStop";
this.btnStoreStop.Size = new System.Drawing.Size(160, 49);
this.btnStoreStop.TabIndex = 1;
......@@ -496,7 +496,7 @@
//
this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSotreReset.Location = new System.Drawing.Point(329, 5);
this.btnSotreReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSotreReset.Margin = new System.Windows.Forms.Padding(4);
this.btnSotreReset.Name = "btnSotreReset";
this.btnSotreReset.Size = new System.Drawing.Size(160, 49);
this.btnSotreReset.TabIndex = 2;
......@@ -512,7 +512,7 @@
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Location = new System.Drawing.Point(8, 65);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1649, 714);
......@@ -523,7 +523,7 @@
this.tabPage4.Controls.Add(this.groupInout);
this.tabPage4.Controls.Add(this.groupBox3);
this.tabPage4.Location = new System.Drawing.Point(4, 32);
this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage4.Margin = new System.Windows.Forms.Padding(4);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(1641, 678);
this.tabPage4.TabIndex = 3;
......@@ -581,9 +581,9 @@
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(4, 199);
this.groupInout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupInout.Margin = new System.Windows.Forms.Padding(4);
this.groupInout.Name = "groupInout";
this.groupInout.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupInout.Padding = new System.Windows.Forms.Padding(4);
this.groupInout.Size = new System.Drawing.Size(1630, 469);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
......@@ -608,7 +608,7 @@
this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP11.Location = new System.Drawing.Point(801, 391);
this.txtUpdownP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpdownP11.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP11.MaxLength = 0;
this.txtUpdownP11.Name = "txtUpdownP11";
this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -637,9 +637,9 @@
this.groupBox1.Enabled = false;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(1232, 16);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
this.groupBox1.Size = new System.Drawing.Size(374, 419);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
......@@ -668,7 +668,7 @@
this.txtCom7_P3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCom7_P3_P2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtCom7_P3_P2.Location = new System.Drawing.Point(251, 172);
this.txtCom7_P3_P2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtCom7_P3_P2.Margin = new System.Windows.Forms.Padding(4);
this.txtCom7_P3_P2.MaxLength = 0;
this.txtCom7_P3_P2.Name = "txtCom7_P3_P2";
this.txtCom7_P3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -699,7 +699,7 @@
this.txtComP3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3_P2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3_P2.Location = new System.Drawing.Point(251, 130);
this.txtComP3_P2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP3_P2.Margin = new System.Windows.Forms.Padding(4);
this.txtComP3_P2.MaxLength = 0;
this.txtComP3_P2.Name = "txtComP3_P2";
this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -716,7 +716,7 @@
this.btnComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP4.ForeColor = System.Drawing.Color.Purple;
this.btnComP4.Location = new System.Drawing.Point(21, 28);
this.btnComP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP4.Margin = new System.Windows.Forms.Padding(4);
this.btnComP4.Name = "btnComP4";
this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP4.Size = new System.Drawing.Size(204, 40);
......@@ -735,7 +735,7 @@
this.btnMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMaxP3.ForeColor = System.Drawing.Color.Purple;
this.btnMaxP3.Location = new System.Drawing.Point(21, 79);
this.btnMaxP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMaxP3.Margin = new System.Windows.Forms.Padding(4);
this.btnMaxP3.Name = "btnMaxP3";
this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMaxP3.Size = new System.Drawing.Size(222, 40);
......@@ -753,7 +753,7 @@
this.txtComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP4.Location = new System.Drawing.Point(229, 34);
this.txtComP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP4.Margin = new System.Windows.Forms.Padding(4);
this.txtComP4.MaxLength = 0;
this.txtComP4.Name = "txtComP4";
this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -769,7 +769,7 @@
this.txtComMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMaxP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMaxP3.Location = new System.Drawing.Point(229, 81);
this.txtComMaxP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComMaxP3.Margin = new System.Windows.Forms.Padding(4);
this.txtComMaxP3.MaxLength = 0;
this.txtComMaxP3.Name = "txtComMaxP3";
this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -783,7 +783,7 @@
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(99, 361);
this.btnSaveCom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSaveCom.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(131, 48);
this.btnSaveCom.TabIndex = 256;
......@@ -799,7 +799,7 @@
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(242, 274);
this.txtComMax.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComMax.Margin = new System.Windows.Forms.Padding(4);
this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -829,7 +829,7 @@
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(119, 274);
this.txtComMin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComMin.Margin = new System.Windows.Forms.Padding(4);
this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -862,7 +862,7 @@
this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(99, 312);
this.btnCMove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCMove.Margin = new System.Windows.Forms.Padding(4);
this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(246, 41);
......@@ -878,7 +878,7 @@
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(100, 225);
this.cmbPlateH.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbPlateH.Margin = new System.Windows.Forms.Padding(4);
this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(245, 31);
this.cmbPlateH.TabIndex = 176;
......@@ -907,7 +907,7 @@
this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP12.Location = new System.Drawing.Point(1108, 391);
this.txtUpdownP12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpdownP12.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP12.MaxLength = 0;
this.txtUpdownP12.Name = "txtUpdownP12";
this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -923,7 +923,7 @@
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(494, 390);
this.txtInoutP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInoutP11.Margin = new System.Windows.Forms.Padding(4);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -941,7 +941,7 @@
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(315, 384);
this.btnInoutP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInoutP11.Margin = new System.Windows.Forms.Padding(4);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(175, 41);
......@@ -960,7 +960,7 @@
this.btnUpdownP12.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.Location = new System.Drawing.Point(922, 385);
this.btnUpdownP12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdownP12.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP12.Name = "btnUpdownP12";
this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP12.Size = new System.Drawing.Size(225, 41);
......@@ -978,7 +978,7 @@
this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP11.Location = new System.Drawing.Point(191, 391);
this.txtMiddleP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtMiddleP11.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -995,7 +995,7 @@
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.Location = new System.Drawing.Point(615, 286);
this.btnComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP2.Margin = new System.Windows.Forms.Padding(4);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(175, 41);
......@@ -1014,7 +1014,7 @@
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.Location = new System.Drawing.Point(615, 335);
this.btnComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP3.Margin = new System.Windows.Forms.Padding(4);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(175, 41);
......@@ -1034,7 +1034,7 @@
this.btnUpdownP11.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.Location = new System.Drawing.Point(615, 385);
this.btnUpdownP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpdownP11.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP11.Name = "btnUpdownP11";
this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP11.Size = new System.Drawing.Size(225, 41);
......@@ -1053,7 +1053,7 @@
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.Location = new System.Drawing.Point(795, 292);
this.txtComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP2.Margin = new System.Windows.Forms.Padding(4);
this.txtComP2.MaxLength = 0;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1071,7 +1071,7 @@
this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.Location = new System.Drawing.Point(12, 385);
this.btnMiddleP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMiddleP11.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP11.Name = "btnMiddleP11";
this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP11.Size = new System.Drawing.Size(206, 41);
......@@ -1089,7 +1089,7 @@
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.Location = new System.Drawing.Point(795, 341);
this.txtComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP3.Margin = new System.Windows.Forms.Padding(4);
this.txtComP3.MaxLength = 0;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1115,7 +1115,7 @@
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(771, 26);
this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(131, 48);
this.btnSavePosition.TabIndex = 217;
......@@ -1129,11 +1129,11 @@
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(588, 26);
this.btnStartAuTo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStartAuTo.Margin = new System.Windows.Forms.Padding(4);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(176, 48);
this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "开始自动出入库";
this.btnStartAuTo.Text = "开始自动库位调试";
this.btnStartAuTo.UseVisualStyleBackColor = false;
this.btnStartAuTo.Click += new System.EventHandler(this.btnStartAuTo_Click);
//
......@@ -1151,7 +1151,7 @@
// txtJiange
//
this.txtJiange.Location = new System.Drawing.Point(238, 85);
this.txtJiange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtJiange.Margin = new System.Windows.Forms.Padding(4);
this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(64, 31);
this.txtJiange.TabIndex = 221;
......@@ -1165,7 +1165,7 @@
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.Location = new System.Drawing.Point(795, 241);
this.txtComP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP1.Margin = new System.Windows.Forms.Padding(4);
this.txtComP1.MaxLength = 0;
this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1181,7 +1181,7 @@
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.Location = new System.Drawing.Point(494, 292);
this.txtInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP2.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP2.MaxLength = 0;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1197,7 +1197,7 @@
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.Location = new System.Drawing.Point(494, 241);
this.txtInOutP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP1.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP1.MaxLength = 0;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1213,7 +1213,7 @@
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.Location = new System.Drawing.Point(191, 241);
this.txtMiddleP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtMiddleP1.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP1.MaxLength = 0;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1229,7 +1229,7 @@
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.Location = new System.Drawing.Point(191, 138);
this.txtUpDownP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP1.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP1.MaxLength = 0;
this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1245,7 +1245,7 @@
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.Location = new System.Drawing.Point(191, 188);
this.txtUpDownP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP2.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP2.MaxLength = 0;
this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1261,7 +1261,7 @@
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.Location = new System.Drawing.Point(494, 341);
this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1277,7 +1277,7 @@
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.Location = new System.Drawing.Point(191, 292);
this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP2.MaxLength = 0;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1293,7 +1293,7 @@
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.Location = new System.Drawing.Point(795, 138);
this.txtUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP5.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP5.MaxLength = 0;
this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1309,7 +1309,7 @@
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.Location = new System.Drawing.Point(795, 188);
this.txtUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP6.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP6.MaxLength = 0;
this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1323,7 +1323,7 @@
this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPosition.FormattingEnabled = true;
this.cmbPosition.Location = new System.Drawing.Point(12, 32);
this.cmbPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbPosition.Margin = new System.Windows.Forms.Padding(4);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(289, 31);
this.cmbPosition.TabIndex = 174;
......@@ -1337,7 +1337,7 @@
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.Location = new System.Drawing.Point(494, 138);
this.txtUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP3.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP3.MaxLength = 0;
this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1351,7 +1351,7 @@
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(310, 26);
this.btnInStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInStore.Margin = new System.Windows.Forms.Padding(4);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(131, 48);
this.btnInStore.TabIndex = 102;
......@@ -1365,7 +1365,7 @@
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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(449, 26);
this.btnOutStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutStore.Margin = new System.Windows.Forms.Padding(4);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(131, 48);
this.btnOutStore.TabIndex = 101;
......@@ -1381,7 +1381,7 @@
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.Location = new System.Drawing.Point(494, 188);
this.txtUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP4.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP4.MaxLength = 0;
this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -1399,7 +1399,7 @@
this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(615, 235);
this.btnComP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP1.Margin = new System.Windows.Forms.Padding(4);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(175, 41);
......@@ -1419,7 +1419,7 @@
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(315, 286);
this.btnInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP2.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(204, 41);
......@@ -1439,7 +1439,7 @@
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(315, 235);
this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(175, 41);
......@@ -1459,7 +1459,7 @@
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.Location = new System.Drawing.Point(12, 235);
this.btnMiddleP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMiddleP1.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(204, 41);
......@@ -1479,7 +1479,7 @@
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(12, 131);
this.btnUpDownP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP1.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(185, 41);
......@@ -1499,7 +1499,7 @@
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(12, 181);
this.btnUpDownP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP2.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(185, 41);
......@@ -1518,7 +1518,7 @@
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.Location = new System.Drawing.Point(315, 335);
this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(175, 41);
......@@ -1537,7 +1537,7 @@
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.Location = new System.Drawing.Point(12, 286);
this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(169, 41);
......@@ -1556,7 +1556,7 @@
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(615, 131);
this.btnUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP5.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(185, 41);
......@@ -1575,7 +1575,7 @@
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(615, 181);
this.btnUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP6.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(204, 41);
......@@ -1594,7 +1594,7 @@
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(315, 131);
this.btnUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP3.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(185, 41);
......@@ -1613,7 +1613,7 @@
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(315, 181);
this.btnUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP4.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(204, 41);
......@@ -1634,9 +1634,9 @@
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Location = new System.Drawing.Point(4, 4);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
this.groupBox3.Size = new System.Drawing.Size(1630, 192);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
......@@ -1650,7 +1650,7 @@
this.chbLockedShelf.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbLockedShelf.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbLockedShelf.Location = new System.Drawing.Point(1047, 28);
this.chbLockedShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbLockedShelf.Margin = new System.Windows.Forms.Padding(4);
this.chbLockedShelf.Name = "chbLockedShelf";
this.chbLockedShelf.Size = new System.Drawing.Size(154, 31);
this.chbLockedShelf.TabIndex = 274;
......@@ -1737,7 +1737,7 @@
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(896, 28);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(114, 31);
this.chbDebug.TabIndex = 271;
......@@ -1751,9 +1751,9 @@
this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
this.tabPage1.Size = new System.Drawing.Size(1641, 678);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服/温湿度 ";
......@@ -1768,9 +1768,9 @@
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnSaveCID);
this.groupBox2.Location = new System.Drawing.Point(700, 221);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
this.groupBox2.Size = new System.Drawing.Size(665, 121);
this.groupBox2.TabIndex = 273;
this.groupBox2.TabStop = false;
......@@ -1779,7 +1779,7 @@
// btnUPosId
//
this.btnUPosId.Location = new System.Drawing.Point(402, 74);
this.btnUPosId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUPosId.Margin = new System.Windows.Forms.Padding(4);
this.btnUPosId.Name = "btnUPosId";
this.btnUPosId.Size = new System.Drawing.Size(196, 41);
this.btnUPosId.TabIndex = 246;
......@@ -1790,7 +1790,7 @@
// numericUpDown1
//
this.numericUpDown1.Location = new System.Drawing.Point(162, 79);
this.numericUpDown1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.numericUpDown1.Margin = new System.Windows.Forms.Padding(4);
this.numericUpDown1.Maximum = new decimal(new int[] {
24,
0,
......@@ -1827,7 +1827,7 @@
//
this.txtCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCID.Location = new System.Drawing.Point(160, 34);
this.txtCID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtCID.Margin = new System.Windows.Forms.Padding(4);
this.txtCID.MaxLength = 30;
this.txtCID.Name = "txtCID";
this.txtCID.Size = new System.Drawing.Size(229, 31);
......@@ -1850,7 +1850,7 @@
// btnSaveCID
//
this.btnSaveCID.Location = new System.Drawing.Point(402, 30);
this.btnSaveCID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSaveCID.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveCID.Name = "btnSaveCID";
this.btnSaveCID.Size = new System.Drawing.Size(196, 41);
this.btnSaveCID.TabIndex = 88;
......@@ -1870,9 +1870,9 @@
this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Location = new System.Drawing.Point(700, 21);
this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Margin = new System.Windows.Forms.Padding(4);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox7.Padding = new System.Windows.Forms.Padding(4);
this.groupBox7.Size = new System.Drawing.Size(665, 192);
this.groupBox7.TabIndex = 272;
this.groupBox7.TabStop = false;
......@@ -1881,7 +1881,7 @@
// btnSelTemp
//
this.btnSelTemp.Location = new System.Drawing.Point(265, 102);
this.btnSelTemp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSelTemp.Margin = new System.Windows.Forms.Padding(4);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(196, 41);
this.btnSelTemp.TabIndex = 248;
......@@ -1893,7 +1893,7 @@
//
this.txtHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(119, 122);
this.txtHum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHum.Margin = new System.Windows.Forms.Padding(4);
this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(108, 31);
......@@ -1917,7 +1917,7 @@
//
this.txtTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTemp.Location = new System.Drawing.Point(119, 79);
this.txtTemp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtTemp.Margin = new System.Windows.Forms.Padding(4);
this.txtTemp.MaxLength = 10;
this.txtTemp.Name = "txtTemp";
this.txtTemp.Size = new System.Drawing.Size(108, 31);
......@@ -1941,7 +1941,7 @@
//
this.txtTempPort.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTempPort.Location = new System.Drawing.Point(119, 35);
this.txtTempPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtTempPort.Margin = new System.Windows.Forms.Padding(4);
this.txtTempPort.MaxLength = 10;
this.txtTempPort.Name = "txtTempPort";
this.txtTempPort.Size = new System.Drawing.Size(108, 31);
......@@ -1964,7 +1964,7 @@
// btnTempClose
//
this.btnTempClose.Location = new System.Drawing.Point(402, 38);
this.btnTempClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTempClose.Margin = new System.Windows.Forms.Padding(4);
this.btnTempClose.Name = "btnTempClose";
this.btnTempClose.Size = new System.Drawing.Size(125, 41);
this.btnTempClose.TabIndex = 89;
......@@ -1975,7 +1975,7 @@
// btnTempInit
//
this.btnTempInit.Location = new System.Drawing.Point(265, 38);
this.btnTempInit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnTempInit.Margin = new System.Windows.Forms.Padding(4);
this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(125, 41);
this.btnTempInit.TabIndex = 88;
......@@ -1987,7 +1987,7 @@
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(9, 5);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(684, 561);
this.axisMoveControl1.TabIndex = 0;
......@@ -2001,7 +2001,7 @@
this.Controls.Add(this.tabControl1);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Margin = new System.Windows.Forms.Padding(5);
this.Name = "FrmBox";
this.Opacity = 0D;
this.Text = "AC_SA_料仓";
......
source/ACPackingStore/FrmBox.cs
......@@ -164,6 +164,10 @@ namespace OnlineStore.ACPackingStore
{
lblMoveEquipInfo.Text = "出库：" + BoxBean.MoveInfo.MoveParam.ToShortStr();
}
else if (BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.CheckPos))
{
lblMoveEquipInfo.Text = "库位调试：" + BoxBean.MoveInfo.MoveParam.ToShortStr();
}
else
{
lblMoveEquipInfo.Text = "";
......@@ -206,43 +210,50 @@ namespace OnlineStore.ACPackingStore
}
}
}
if (BoxBean.AutoInout.autoNext)
if (!BoxBean.PosDebugInfo.AutoInOutPosTest)
{
string msg = BoxBean.AutoInout.autoMsg;
lblMsg.Text = msg;
if (btnStartAuTo.Text.Equals("开始自动出入库"))
{
btnStartAuTo.Text = "停止自动出入库";
}
try
{
msg = msg.Replace("自动出库：", "");
msg = msg.Replace("自动入库：", "");
int index = BoxBean.PositionNumList.IndexOf(msg);
if (index >= 0 && (!msg.Equals("")))
{
cmbPosition.SelectedIndex = index;
}
}
catch (Exception ex) { }
btnStartAuTo.Text = "开始自动库位调试";
}
else
{
// lblMsg.Text = "没有开启自动出入库";
if (btnStartAuTo.Text.Equals("停止自动出入库"))
{
btnStartAuTo.Text = "开始自动出入库";
}
btnStartAuTo.Text = "停止自动库位调试";
}
//if (BoxBean.AutoInout.autoNext)
//{
// string msg = BoxBean.AutoInout.autoMsg;
// lblMsg.Text = msg;
// if (btnStartAuTo.Text.Equals("开始自动出入库"))
// {
// btnStartAuTo.Text = "停止自动出入库";
// }
// try
// {
// msg = msg.Replace("自动出库：", "");
// msg = msg.Replace("自动入库：", "");
// int index = BoxBean.PositionNumList.IndexOf(msg);
// if (index >= 0 && (!msg.Equals("")))
// {
// cmbPosition.SelectedIndex = index;
// }
// }
// catch (Exception ex) { }
//}
//else
//{
// // lblMsg.Text = "没有开启自动出入库";
// if (btnStartAuTo.Text.Equals("停止自动出入库"))
// {
// btnStartAuTo.Text = "开始自动出入库";
// }
//}
}
else
{
lblThisSta.Text = "等待启动";
// lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动出入库";
//btnStartAuTo.Text = "开始自动出入库";
}
if(BoxBean.CompressSigTimeOut)
if (BoxBean.CompressSigTimeOut)
{
btnClearcurState.Visible = true;
}
......@@ -607,27 +618,24 @@ namespace OnlineStore.ACPackingStore
{
if (BoxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
{
if (BoxBean.AutoInout.autoNext)
if (BoxBean.PosDebugInfo.AutoInOutPosTest)
{
BoxBean.AutoInout.StopAuto();
btnStartAuTo.Text = "开始自动出入库";
BoxBean.PosDebugInfo.StopAutoInOutTest();
btnStartAuTo.Text = "开始自动库位调试";
}
else
{
DialogResult res = MessageBox.Show("确定开始自动出入库？", "提示", MessageBoxButtons.YesNo);
DialogResult res = MessageBox.Show("确定开始自动库位调试？", "提示", MessageBoxButtons.YesNo);
if (res.Equals(DialogResult.Yes) && cmbPosition.SelectedIndex >= 0)
{
int jiange = FormUtil.GetIntValue(txtJiange);
int currIndex = cmbPosition.SelectedIndex;
BoxBean.AutoInout.StartAuto(jiange, currIndex, cmbShelfPosition.Text);
string poText = cmbPosition.Text;
BoxBean.AutoInout.autoMsg = "自动出库：" + poText;
LogUtil.info(BoxBean.Name + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
//BoxBean.StartOutStoreMove(new InOutStoreParam("", poText));
BoxBean.StartInStoreMove(new InOutParam("", poText, cmbShelfPosition.Text));
btnStartAuTo.Text = "停止自动出入库";
LogUtil.info(BoxBean.Name + "开启自动库位调试，开始位置【" + poText + "】");
if (BoxBean.PosDebugInfo.StartAutoInOutTest(poText, out string msg))
btnStartAuTo.Text = "停止自动库位调试";
else
{
MessageBox.Show("启动自动库位调试失败:" + msg, "提示");
}
}
}
}
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -72,6 +72,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="PackingStore\AC_BOX_Bean_AutoInOutTest.cs" />
<Compile Include="PackingStore\AC_BOX_Bean_server_connect.cs" />
<Compile Include="PackingStore\AC_BOX_Bean.cs" />
<Compile Include="PackingStore\AC_BOX_Bean_OutStore.cs" />
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean.cs
......@@ -89,6 +89,7 @@ namespace OnlineStore.DeviceLibrary
}
List<ShelfPosition> sPlist = CSVPositionReader<ShelfPosition>.getPositionList();
ShelfPosList = new List<string>();
PosDebugInfo = new PosDebugInfo(this);
foreach (ShelfPosition p in sPlist)
{
if (p.StoreId.Equals(DeviceID))
......@@ -252,7 +253,6 @@ namespace OnlineStore.DeviceLibrary
return;
}
InoutStartReset();
isInPro = false;
}
private void InoutStartReset()
{
......@@ -852,7 +852,6 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.SuddenStop(Config.Comp_Axis.DeviceName, Config.Comp_Axis.GetAxisValue());
CloseAllAxis();
LogInfo("StopMove");
isInPro = false;
}
private void MoveEndToRuningStatus()
......
source/DeviceLibrary/PackingStore/AC_BOX_Bean_AutoInOutTest.cs 0 → 100644
using Asa;
using CodeLibrary;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
partial class AC_BOX_Bean
{
public PosDebugInfo PosDebugInfo;
protected override void InOuTestProcess()
{
LineMoveP moveP = MoveInfo.MoveParam.MoveP;
if (MoveInfo.IsInWait)
{
CheckWait();
}
if (MoveInfo.IsInWait)
{
return;
}
#region 放入料盘
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_01_StartGetTray))
{
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_02_InOutToP1);
InOutStoreLog("库位测试，料架取料，叉子后退到待机点P1, 重置盘信息");
ACAxisMove(Config.InOut_Axis, Config.InOutAxis_P1_Position, Config.InOutAxis_P1_Speed);
}
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_02_InOutToP1))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_03_MoveToShelf);
InOutStoreLog("库位测试，料架取料，升降轴到P101低点[" + moveP.UpDown_LP101 + "]，旋转轴到P101点[" + moveP.Middle_P101 + "]，压紧轴到压紧前点p3[" + Config.CompAxis_Max_P3 + "]");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P102_Speed);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed);
ACAxisMove(Config.Comp_Axis, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_03_MoveToShelf))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_04_InoutToP101);
InOutStoreLog("库位测试，料架取料，叉子前进到P101点[" + moveP.InOut_P101 + "]");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_04_InoutToP101))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_05_UpdownToP102);
InOutStoreLog("库位测试，料架取料，升降轴上升到P102点[" + moveP.UpDown_HP102 + "]");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P101_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_05_UpdownToP102))
{
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_06_ComDownMove);
InOutStoreLog("库位测试，料架取料，压紧轴走到压紧点P2： " + MoveInfo.MoveParam.MoveP.ComPress_P2);
ACAxisMove(Config.Comp_Axis, MoveInfo.MoveParam.MoveP.ComPress_P2, Config.CompAxis_P2_Speed);
}
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_06_StartCompress))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_06_ComDownMove);
int currPosition = ACServerManager.GetActualtPosition(Config.Comp_Axis);
ComTargetPosition = currPosition;
int targetP = currPosition + Config.CompAxis_Down_Position;
LastHeight = Config.GetComP2PlateH(targetP);
MoveInfo.MoveParam.MoveP.ComPress_P2 = targetP;
MoveInfo.MoveParam.MoveP.ComPress_P3 = targetP + Config.CompAxis_P3_P2_Value;
InOutStoreLog("库位测试，料架取料，检测到Compress_Check，盘高【" + LastHeight + "】，向下压紧 [" + Config.CompAxis_Down_Position + "] 目标 [" + targetP +
"]记录ComP2[" + targetP + "]ComP3[" + MoveInfo.MoveParam.MoveP.ComPress_P3 + "]");
ACAxisMove(Config.Comp_Axis, targetP, Config.CompAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_06_ComDownMove))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_07_InoutBack);
InOutStoreLog("库位测试，料架取料，叉子后退到扫码点");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.CompAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_07_InoutBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_09_MoveToBag);
InOutStoreLog("库位测试，到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_09_MoveToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_10_DeviceToBag);
InOutStoreLog("库位测试，叉子进入库位中，进出轴到库位P3");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_10_DeviceToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_11_PutWareToBag);
InOutStoreLog("库位测试，放下物品，升降轴到库位缓冲点P4，压紧轴到P3");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_11_PutWareToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_12_DeviceBackFromBag);
InOutStoreLog("库位测试，叉子从库位中返回，进出轴到P1");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_12_DeviceBackFromBag))
{
if (PosDebugInfo.IsReady())
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_14_StartInOutTest);
PosDebugInfo.MoveToNext();
InOutStoreLog($"库位测试，变换位置:{PosDebugInfo.FrmPoId}-->{PosDebugInfo.ToPosId}");
MoveInfo.MoveParam.PosID = PosDebugInfo.FrmPoId;
if (!StoreManager.LoadInoutParam(MoveInfo.MoveParam, true, this))
{
InOutStoreLog("库位测试，加载库位位置失败");
MoveInfo.EndMove();
}
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_01_StartGetTray);
PosDebugInfo.AddTestReel(out string posId);
MoveInfo.MoveParam.PosID = posId;
if (!StoreManager.LoadInoutParam(MoveInfo.MoveParam, true, this))
{
InOutStoreLog("库位测试，加载库位位置失败");
MoveInfo.EndMove();
}
MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[1]);
}
}
#endregion
#region 跑库位
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_14_StartInOutTest))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_15_ToPosition);
InOutStoreLog("库位测试，到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_15_ToPosition))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_16_ToPos);
InOutStoreLog("叉子进入库位中， 进出轴至P3[" + moveP.InOut_P3 + "] ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_16_ToPos))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_17_GetReel);
InOutStoreLog("拿起物品，升降轴至P6[" + moveP.UpDown_P6 + "]，压紧轴到压紧点P2 ：" + moveP.ComPress_P2);
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_17_GetReel))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_18_InoutBack);
InOutStoreLog("进出轴至待机点P1[" + moveP.InOut_P1 + "] ");
InOutBackToP1(moveP.InOut_P1);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_18_InoutBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_20_SetInstoreParam);
MoveInfo.MoveParam.PosID = PosDebugInfo.ToPosId;
if (!StoreManager.LoadInoutParam(MoveInfo.MoveParam, true, this))
{
InOutStoreLog("库位测试，加载库位位置失败");
MoveInfo.EndMove();
}
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_20_SetInstoreParam))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_21_MoveToBag);
InOutStoreLog("到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_21_MoveToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_22_DeviceToBag);
InOutStoreLog("叉子进入库位中，进出轴到库位P3");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_22_DeviceToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_23_PutWareToBag);
InOutStoreLog("放下物品，升降轴到库位缓冲点P4，压紧轴到P3");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_23_PutWareToBag))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_24_DeviceBackFromBag);
InOutStoreLog("叉子从库位中返回，进出轴到P1");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_24_DeviceBackFromBag))
{
if (PosDebugInfo.HasNext())
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_14_StartInOutTest);
PosDebugInfo.MoveToNext();
InOutStoreLog($"库位测试，变换位置:{PosDebugInfo.FrmPoId}-->{PosDebugInfo.ToPosId}");
MoveInfo.MoveParam.PosID = PosDebugInfo.FrmPoId;
if (!StoreManager.LoadInoutParam(MoveInfo.MoveParam, true, this))
{
InOutStoreLog("库位测试，加载库位位置失败");
MoveInfo.EndMove();
}
}
else
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_25_StartPutTray);
InOutStoreLog("库位测试，无剩余库位，将料盘送出");
PosDebugInfo.RemoveTestReel(out string posId);
MoveInfo.MoveParam.PosID = posId;
MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[0]);
if (!StoreManager.LoadInoutParam(MoveInfo.MoveParam, true, this))
{
InOutStoreLog("库位测试，加载库位位置失败");
MoveInfo.EndMove();
}
}
}
#endregion
#region 把料盘送回料架逻辑
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_25_StartPutTray))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_26_ToPosition);
InOutStoreLog("库位测试，到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）");
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_26_ToPosition))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_27_ToPos);
InOutStoreLog("叉子进入库位中， 进出轴至P3[" + moveP.InOut_P3 + "] ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_27_ToPos))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_28_GetReel);
InOutStoreLog("拿起物品，升降轴至P6[" + moveP.UpDown_P6 + "]，压紧轴到压紧点P2 ：" + moveP.ComPress_P2);
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_28_GetReel))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_29_InoutBack);
InOutStoreLog("进出轴至待机点P1[" + moveP.InOut_P1 + "] ");
InOutBackToP1(moveP.InOut_P1);
}
else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BT_29_InoutBack))
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_30_ToShelfPosition);
}
else if (MoveInfo.MoveStep == StoreMoveStep.BT_30_ToShelfPosition)
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_31_ToShelf);
InOutStoreLog("库位测试，送出料盘，叉子进出料口，进出轴至P101");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed);
}
else if (MoveInfo.MoveStep == StoreMoveStep.BT_31_ToShelf)
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_32_PutReel);
InOutStoreLog("库位测试，送出料盘，放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
}
else if (MoveInfo.MoveStep == StoreMoveStep.BT_32_PutReel)
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_33_InoutBack);
InOutStoreLog("库位测试，送出料盘，叉子从出料口返回， 进出轴到P1 ");
InOutBackToP1(moveP.InOut_P1);
}
else if (MoveInfo.MoveStep == StoreMoveStep.BT_33_InoutBack)
{
MoveInfo.NextMoveStep(StoreMoveStep.BT_25_StartPutTray);
if (PosDebugInfo.RemoveTestReel(out string posId))
{
MoveInfo.MoveParam.PosID = posId;
MoveInfo.MoveParam.UpdateShelfPosId(ShelfPosList[1]);
if (!StoreManager.LoadInoutParam(MoveInfo.MoveParam, true, this))
{
InOutStoreLog("库位测试，加载库位位置失败");
MoveInfo.EndMove();
}
InOutStoreLog("库位测试，送出料盘结束");
}
else
{
PosDebugInfo.StopAutoInOutTest();
MoveInfo.EndMove();
}
}
#endregion
}
}
/// <summary>
/// 位置调试信息
/// </summary>
public class PosDebugInfo
{
/// <summary>
/// 同尺寸所有位置
/// </summary>
public List<ACBoxPosition> BoxPositions;
public int CurPosIdx = 0;
public bool AutoInOutPosTest = false;
public bool StopAutoInOut = false;
public string FrmPoId = "";
public string ToPosId = "";
AC_BOX_Bean box = null;
Queue<int> curPosIdxs = new Queue<int>();
public PosDebugInfo(AC_BOX_Bean bean)
{
box = bean;
}
/// <summary>
/// 料盘是否已送入仓内
/// </summary>
/// <returns></returns>
public bool IsReady()
{
return curPosIdxs.Count == 2;
}
public void StopAutoInOutTest()
{
StopAutoInOut = true;
AutoInOutPosTest=false;
}
public void AddTestReel(out string posId)
{
posId = BoxPositions[CurPosIdx].PositionNum;
curPosIdxs.Enqueue(CurPosIdx);
CurPosIdx++;
}
public bool RemoveTestReel(out string posId)
{
posId = "";
if (curPosIdxs.Count > 0)
{
int idx = curPosIdxs.Dequeue();
posId = BoxPositions[idx].PositionNum;
return true;
}
return false;
}
public void MoveToNext()
{
int fromIdx = curPosIdxs.Dequeue();
FrmPoId = BoxPositions[fromIdx].PositionNum;
curPosIdxs.Enqueue(CurPosIdx);
ToPosId = BoxPositions[CurPosIdx].PositionNum;
CurPosIdx++;
}
public bool StartAutoInOutTest(string posId, out string errmsg)
{
errmsg = "";
if (!box.MoveInfo.MoveType.Equals(StoreMoveType.None))
{
errmsg = "料仓忙碌中,无法启动";
return false;
}
if (!box.IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW))
{
errmsg = "未检测到料架,无法启动";
return false;
}
if (!StoreManager.LoadSameSizePos(posId, out BoxPositions))
{
errmsg = "未找到调试库位,或调试库位小于3个";
return false;
}
AutoInOutPosTest = true;
StopAutoInOut = false;
CurPosIdx = 0;
AddTestReel(out posId);
InOutParam param = new InOutParam();
param.PosID = posId;
param.UpdateShelfPosId(box.ShelfPosList[0]);
if (!StoreManager.LoadInoutParam(param, true, box))
{
errmsg = "加载位置信息失败";
return false;
}
box.MoveInfo.NewMove(StoreMoveType.CheckPos, param);
box.MoveInfo.NextMoveStep(StoreMoveStep.BT_01_StartGetTray);
LogUtil.info($"调试的所有位置[{BoxPositions.Count}]：");
BoxPositions.ForEach(pos => { LogUtil.info($"{pos.PositionNum},{pos.BagWidth}*{pos.BagHigh}"); });
return true;
}
public bool HasNext()
{
if (StopAutoInOut || CurPosIdx > BoxPositions.Count - 2)
{
return false;
}
return true;
}
}
}
source/DeviceLibrary/PackingStore/PackingStoreBean.cs
......@@ -518,6 +518,11 @@ namespace OnlineStore.DeviceLibrary
}
}
protected override void InOuTestProcess()
{
throw new NotImplementedException();
}
#endregion
}
......
source/DeviceLibrary/PackingStore/StoreManager.cs
......@@ -246,6 +246,12 @@ namespace OnlineStore.DeviceLibrary
return true;
}
public static bool LoadSameSizePos(string posId, out List<ACBoxPosition> boxPositions)
{
boxPositions = CSVPositionReader<ACBoxPosition>.GetSameSizePositons(posId);
if (boxPositions == null || boxPositions.Count < 3) return false;
return true;
}
#endregion
......
source/DeviceLibrary/device/IO/AIOBOX/AIOBOXManager.cs
......@@ -18,7 +18,7 @@ namespace OnlineStore.DeviceLibrary
//public static uint DefaultDICount = 16;
//public static uint DefaultDOCount = 16;
// public readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// public readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public Dictionary<string, AIOBOX> AIOMap = new Dictionary<string, AIOBOX>();
public Dictionary<string, List<Box_Sta>> DIValueMap = new Dictionary<string, List<Box_Sta>>();
......@@ -122,7 +122,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error("关闭Io模块【" + ioIp + "】出错："+ ex.ToString());
LogUtil.error("关闭Io模块【" + ioIp + "】出错：" + ex.ToString());
}
AIOMap.Remove(ioIp);
}
......@@ -134,12 +134,12 @@ namespace OnlineStore.DeviceLibrary
{
DOValueMap.Remove(ioIp);
}
int DIMS = ConfigAppSettings.GetIntValue("DIMS",60);
int DIMS = ConfigAppSettings.GetIntValue("DIMS", 60);
if (DIMS < 20)
{
DIMS = 20;
}
int DOMS = ConfigAppSettings.GetIntValue("DOMS",300);
int DOMS = ConfigAppSettings.GetIntValue("DOMS", 300);
if (DOMS < 200)
{
DOMS = 200;
......@@ -201,7 +201,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception error)
{
LogUtil.error( "连接IO模块 " + logName + " 出错：" + error.ToString());
LogUtil.error("连接IO模块 " + logName + " 出错：" + error.ToString());
}
}
......@@ -390,7 +390,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error( "WriteSingleDO出错 没有连接IO模块：" + ioIp);
LogUtil.error("WriteSingleDO出错 没有连接IO模块：" + ioIp);
}
}
catch (Exception ex)
......@@ -415,11 +415,11 @@ namespace OnlineStore.DeviceLibrary
try
{
aioBox.WriteDO(StartAddress, aioBox.ReverseStatus(currBox_Sta));
LogUtil.debug( "**********定时回写入 IO [" + ioIp + "] [" + StartAddress + "]值" + aioBox.ReverseStatus(currBox_Sta) + "】：");
LogUtil.debug("**********定时回写入 IO [" + ioIp + "] [" + StartAddress + "]值" + aioBox.ReverseStatus(currBox_Sta) + "】：");
}
catch (Exception ex)
{
LogUtil.error( "**********定时回写入 出错：" + ex.StackTrace);
LogUtil.error("**********定时回写入 出错：" + ex.StackTrace);
}
};
mytimer.AutoReset = false;//设置是否自动重启，即自动执行多次；
......@@ -428,7 +428,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error( "AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 出错 没有连接IO模块：" + ioIp);
LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 出错 没有连接IO模块：" + ioIp);
}
}
catch (Exception ex)
......@@ -508,9 +508,16 @@ namespace OnlineStore.DeviceLibrary
Box_Sta sta = Box_Sta.Off;
// Box_Addr addr = GetAddr(StartAddress);
int index = StartAddress;
if (DIValueMap.ContainsKey(ioIP) && DIValueMap[ioIP].Count > index)
if (Monitor.IsEntered(DILock))
{
sta = DIValueMap[ioIP][index];
if (DIValueMap.ContainsKey(ioIP) && DIValueMap[ioIP].Count > index)
{
sta = DIValueMap[ioIP][index];
}
else
{
sta = aioBox.ReadDI(StartAddress);
}
}
else
{
......@@ -544,7 +551,7 @@ namespace OnlineStore.DeviceLibrary
}
catch (Exception ex)
{
LogUtil.error( " GetIOValue [" + configIO.IO_IP + "] [" + configIO.GetIOAddr() + "] 获取数据出错：" + ex.ToString());
LogUtil.error(" GetIOValue [" + configIO.IO_IP + "] [" + configIO.GetIOAddr() + "] 获取数据出错：" + ex.ToString());
}
return value;
}
......
source/DeviceLibrary/store/InOutParam.cs
......@@ -167,7 +167,7 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error( "GetPositon[" + CurShelfPosID + "]=null,没有库位不能执行出入库");
}
if (MoveP == null) MoveP = new LineMoveP();
MoveP.InOut_P101 = sp.InoutAxis_P101;
MoveP.UpDown_LP101 = sp.UpDownAxis_LP101;
MoveP.UpDown_HP102 = sp.UpDownAxis_HP102;
......
source/DeviceLibrary/store/KTK_Store.cs
......@@ -121,42 +121,45 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 运动处理
/// </summary>
protected bool isInPro = false;
protected object isInPro = new object();
protected virtual void BusyMoveProcess()
{
//if (isInPro)
//{
// return;
//}
isInPro = true;
try
if(Monitor.TryEnter(isInPro))
{
switch (MoveInfo.MoveType)
try
{
case StoreMoveType.InStore:
InStoreProcess();
isInPro = false;
break;
case StoreMoveType.OutStore:
OutStoreProcess();
isInPro = false;
break;
case StoreMoveType.ReturnHome:
ResetProcess();
isInPro = false;
break;
case StoreMoveType.StoreReset:
ResetProcess();
isInPro = false;
break;
default: break;
switch (MoveInfo.MoveType)
{
case StoreMoveType.InStore:
InStoreProcess();
break;
case StoreMoveType.OutStore:
OutStoreProcess();
break;
case StoreMoveType.ReturnHome:
ResetProcess();
break;
case StoreMoveType.StoreReset:
ResetProcess();
break;
case StoreMoveType.CheckPos:
InOuTestProcess();
break;
default: break;
}
}
catch (Exception ex)
{
LogUtil.error("BusyMoveProcess出错：" + ex.ToString());
}finally
{
Monitor.Exit(isInPro);
}
}
catch (Exception ex)
{
LogUtil.error("BusyMoveProcess出错：" + ex.ToString());
}
isInPro = false;
}
protected void SaveAlarmInfo(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
{
......@@ -227,7 +230,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
protected abstract void ResetProcess();
protected abstract void InOuTestProcess();
/// <summary>
/// 松下伺服轴原点返回运动，等待收到反馈后才会返回
/// </summary>
......
source/DeviceLibrary/store/StoreStep.cs
......@@ -590,6 +590,140 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
SO_21_UrgentLineRun,
#endregion
BT_01_StartGetTray,
BT_02_InOutToP1,
/// <summary>
/// 料架取料：升降轴移动到P101低点，旋转轴移动到P101点，压紧轴到压紧前点
/// </summary>
BT_03_MoveToShelf,
/// <summary>
/// 料架取料：叉子前进到P101点
/// </summary>
BT_04_InoutToP101,
/// <summary>
/// 料架取料：升降轴上升到P102点
/// </summary>
BT_05_UpdownToP102,
/// <summary>
/// 料架取料：压紧轴开始缓慢压紧
/// </summary>
BT_06_StartCompress,
/// <summary>
/// 料架取料：检测到料叉压紧确认信号，再次向下压紧指定的值
/// </summary>
BT_06_ComDownMove,
/// <summary>
/// 料架取料：记录压紧高度，叉子后退到P1
/// </summary>
BT_07_InoutBack,
/// <summary>
/// 料架取料: 获取库位号完成，设置位置参数， 准备入库
/// </summary>
//BT_08_SetInstoreParam,
/// <summary>
/// 入库。。移动到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）
/// </summary>
BT_09_MoveToBag,
/// <summary>
/// 入库。。叉子进入库位中，进出轴到库位P3
/// </summary>
BT_10_DeviceToBag,
/// <summary>
/// 入库。。放下物品，升降轴到库位缓冲点P4，压紧轴到P3
/// </summary>
BT_11_PutWareToBag,
/// <summary>
/// 入库。。叉子从库位中返回，进出轴到P1
/// </summary>
BT_12_DeviceBackFromBag,
BT_14_StartInOutTest,
/// <summary>
/// 料仓出库，，所有轴运行到库位,压紧轴到压紧前点P3 ，旋转轴到库位点P2,轴2(上下） 至P5(库位出库前点）
/// </summary>
BT_15_ToPosition,
/// <summary>
/// 料仓出库，，叉子进入库位中， 进出轴到库位P3
/// </summary>
BT_16_ToPos,
/// <summary>
///料仓出库，， 库位的物品放入叉子上，轴2（ 上下） 至P6（ 库位出料缓冲点），轴4（ 压紧） 至P2(压紧点)
/// </summary>
BT_17_GetReel,
/// <summary>
///料仓出库，，叉子从 库位返回，轴3（ 叉子） 至P1（ 待机点）
/// </summary>
BT_18_InoutBack,
/// <summary>
/// 料仓出库,等待压紧信号确认
/// </summary>
BT_19_CheckComSig,
/// <summary>
/// 料架取料: 获取库位号完成，设置位置参数， 准备入库
/// </summary>
BT_20_SetInstoreParam,
/// <summary>
/// 入库。。移动到库位点，旋转轴至P2（ 库位点）轴2(上下） 至P3(库位入库前点）
/// </summary>
BT_21_MoveToBag,
/// <summary>
/// 入库。。叉子进入库位中，进出轴到库位P3
/// </summary>
BT_22_DeviceToBag,
/// <summary>
/// 入库。。放下物品，升降轴到库位缓冲点P4，压紧轴到P3
/// </summary>
BT_23_PutWareToBag,
/// <summary>
/// 入库。。叉子从库位中返回，进出轴到P1
/// </summary>
BT_24_DeviceBackFromBag,
BT_25_StartPutTray,
/// <summary>
/// 料仓出库，，所有轴运行到库位,压紧轴到压紧前点P3 ，旋转轴到库位点P2,轴2(上下） 至P5(库位出库前点）
/// </summary>
BT_26_ToPosition,
/// <summary>
/// 料仓出库，，叉子进入库位中， 进出轴到库位P3
/// </summary>
BT_27_ToPos,
/// <summary>
///料仓出库，， 库位的物品放入叉子上，轴2（ 上下） 至P6（ 库位出料缓冲点），轴4（ 压紧） 至P2(压紧点)
/// </summary>
BT_28_GetReel,
/// <summary>
///料仓出库，，叉子从 库位返回，轴3（ 叉子） 至P1（ 待机点）
/// </summary>
BT_29_InoutBack,
/// <summary>
/// 料仓出库，走到料架位置，旋转轴至P20，升降轴至P102,
/// </summary>
BT_30_ToShelfPosition,
/// <summary>
/// 料仓出库，叉子到料架，进出轴至P20
/// /// </summary>
BT_31_ToShelf,
/// <summary>
/// 料仓出库，，把物品放下，压紧轴到P1，升降轴至P20
/// </summary>
BT_32_PutReel,
/// <summary>
/// 料仓出库，，叉子从出料口返回，，进出轴到P1
/// </summary>
BT_33_InoutBack,
/// <summary>
///返回待机点，轴2/轴1/轴4动作至P1（ 待机点）)开始
/// </summary>
BT_30_GoBack,
}
public enum StoreAlarmType
......
source/DeviceLibrary/store/model/DeviceMoveInfo.cs
......@@ -493,9 +493,9 @@ namespace OnlineStore.DeviceLibrary
///// 移栽装置的停止，需要先远点返回，然后停止
///// </summary>
//StopMove=5,
///// <summary>
///// 移栽检测托盘
///// </summary>
//CheckFixture=6,
/// <summary>
/// 移栽检测托盘
/// </summary>
CheckPos = 6,
}
}
source/LoadCVSLibrary/position/CSVPositionReader.cs
......@@ -8,17 +8,17 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
namespace OnlineStore.LoadCSVLibrary
{
public class CSVPositionReader<T> : CSVReaderBase where T : PostionBase
public class CSVPositionReader<T> : CSVReaderBase where T : PostionBase
{
/// <summary>
/// 所有的位置集合，key=位置
/// </summary>
public static Dictionary<string, Dictionary<string, T>> AllPositionMap = new Dictionary<string, Dictionary<string, T>>();
private static List<string> hasReadFileList = new List<string>();
......@@ -33,7 +33,7 @@ namespace OnlineStore.LoadCSVLibrary
AllPositionMap = new Dictionary<string, Dictionary<string, T>>();
hasReadFileList = new List<string>();
return AddCSVFile(filePath);
return AddCSVFile(filePath);
}
private static string GetTName()
{
......@@ -41,7 +41,7 @@ namespace OnlineStore.LoadCSVLibrary
return type.Name;
}
public static List<T> getPositionList()
{
{
string name = GetTName();
if (AllPositionMap.ContainsKey(name))
{
......@@ -55,7 +55,7 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
/// <param name="filePath">cvs文件路径+文件名</param>
/// <returns></returns>
public static Dictionary<String, T> AddCSVFile(string filePath,int storeId=0)
public static Dictionary<String, T> AddCSVFile(string filePath, int storeId = 0)
{
if (hasReadFileList.Contains(filePath))
{
......@@ -74,7 +74,7 @@ namespace OnlineStore.LoadCSVLibrary
Dictionary<String, T> result = new Dictionary<String, T>();
string[] lines =ReadCSVFile(filePath);
string[] lines = ReadCSVFile(filePath);
int index = 0;
Dictionary<string, int> titleIndex = new Dictionary<string, int>();
foreach (var line in lines)
......@@ -82,7 +82,7 @@ namespace OnlineStore.LoadCSVLibrary
var array = line.Split(Spilt_Char);
if (index == 0)
{
titleIndex = GetTitleIndex(filePath, line, cvsTitleList);
titleIndex = GetTitleIndex(filePath, line, cvsTitleList);
}
else
{
......@@ -129,17 +129,17 @@ namespace OnlineStore.LoadCSVLibrary
{
throw new PositionAlreadyExistingExection("仓位：" + PositionNum + "已存在！");
}
AllPositionMap[tname].Add(PositionNum, (T)bllIns);
}
else
{
LogUtil.error("读取"+ filePath + "，index=" + index + ",数据格式不匹配！，line=" + line);
LogUtil.error("读取" + filePath + "，index=" + index + ",数据格式不匹配！，line=" + line);
}
}
catch (Exception ex)
{
LogUtil.debug ( "CSV 读取行【" + line + "】行转换失败");
LogUtil.debug("CSV 读取行【" + line + "】行转换失败");
}
}
index++;
......@@ -169,7 +169,31 @@ namespace OnlineStore.LoadCSVLibrary
return null;
}
/// <summary>
/// 获取同尺寸库位的所有位置信息
/// </summary>
/// <param name="positionNum"></param>
/// <returns></returns>
public static List<T> GetSameSizePositons(string positionNum)
{
if (positionNum == null)
{
return null;
}
string tname = GetTName();
if (AllPositionMap.ContainsKey(tname))
{
if (AllPositionMap[tname].ContainsKey(positionNum))
{
var result = AllPositionMap[tname][positionNum];
if (result == null) return null;
var allPos = AllPositionMap[tname].Values.ToList().FindAll(s => s.BagWidth == result.BagWidth && s.BagHigh == result.BagHigh);
return allPos;
}
}
return null;
}
public static bool SavePostion(string filePath, T position)
{
Type type = typeof(T);
......@@ -205,7 +229,7 @@ namespace OnlineStore.LoadCSVLibrary
string value = array[csvIndex];
if (value.Equals(position.PositionNum))
{
if (AllPositionMap.ContainsKey(tName))
{
//更新缓存
......@@ -221,7 +245,7 @@ namespace OnlineStore.LoadCSVLibrary
index++;
}
return true;
}
}
private static string PostionToString(PostionBase position, Dictionary<string, int> titleIndex, Dictionary<string, string> proTitleMap)
{
......@@ -243,14 +267,14 @@ namespace OnlineStore.LoadCSVLibrary
string newStr = "";
foreach (string str in array)
{
{
if (newStr.Equals(""))
{
newStr = str;
}
else
{
newStr = newStr+Spilt_Char + str;
newStr = newStr + Spilt_Char + str;
}
}
return newStr;
......@@ -321,7 +345,7 @@ namespace OnlineStore.LoadCSVLibrary
lie = Convert.ToInt32(hengStr[1]);
hang = Convert.ToInt32(hengStr[2]);
p = Convert.ToInt32(hengStr[3]);
}
}
string hangStr = "AA";
if (hang.Equals(1))
{
......@@ -353,9 +377,9 @@ namespace OnlineStore.LoadCSVLibrary
else
{
newPosId = louceng + storeId + oldPosId.Substring(4, oldPosId.Length - 4);
}
}
position.PositionNum = newPosId;
// position.StoreId = storeIndex;
// position.StoreId = storeIndex;
string newValue = PostionToString(position, titleIndex, proTitleMap);
lines[index] = newValue;
}
......@@ -363,7 +387,7 @@ namespace OnlineStore.LoadCSVLibrary
{
LogUtil.error("更新【" + filePath + "】位置出错【" + line + "】" + ex.ToString());
}
}
}
}
}
index++;
......@@ -373,5 +397,5 @@ namespace OnlineStore.LoadCSVLibrary
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!