Skip to content

刘韬 / SO815-AutoInOutStore

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

自动出入库时功能优化

1 个父辈 f364be36
内嵌 并排
正在显示 7 个修改的文件 包含 167 行增加 和 139 行删除
doc/MIMO调试点贴图-JP.pptx 0 → 100644
此文件类型无法预览
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -32,7 +32,6 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.groupAuto = new System.Windows.Forms.GroupBox();
this.btnCycleOut = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.btnSaveSinglePosId = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.btnSave = new System.Windows.Forms.Button();
......@@ -43,6 +42,7 @@
this.cmbPosition = new System.Windows.Forms.ComboBox();
this.label21 = new System.Windows.Forms.Label();
this.btnOutStore = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.btnClearBuzzer = new System.Windows.Forms.Button();
this.btnSingleTrayIn = new System.Windows.Forms.Button();
......@@ -301,17 +301,6 @@
this.btnCycleOut.UseVisualStyleBackColor = true;
this.btnCycleOut.Click += new System.EventHandler(this.btnCycleOut_Click);
//
// lblTemp
//
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(584, 638);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--，当前湿度--";
//
// btnSaveSinglePosId
//
this.btnSaveSinglePosId.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -441,6 +430,17 @@
this.btnOutStore.UseVisualStyleBackColor = true;
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
//
// lblTemp
//
this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(584, 638);
this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(136, 17);
this.lblTemp.TabIndex = 270;
this.lblTemp.Text = "当前温度--，当前湿度--";
//
// groupBox6
//
this.groupBox6.Controls.Add(this.btnClearBuzzer);
......@@ -731,21 +731,23 @@
//
// picAxis4
//
this.picAxis4.Location = new System.Drawing.Point(906, 450);
this.picAxis4.Location = new System.Drawing.Point(906, 626);
this.picAxis4.Name = "picAxis4";
this.picAxis4.Size = new System.Drawing.Size(334, 186);
this.picAxis4.Size = new System.Drawing.Size(334, 10);
this.picAxis4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picAxis4.TabIndex = 305;
this.picAxis4.TabStop = false;
this.picAxis4.Visible = false;
//
// picPPoint
//
this.picPPoint.Location = new System.Drawing.Point(587, 314);
this.picPPoint.Location = new System.Drawing.Point(587, 496);
this.picPPoint.Name = "picPPoint";
this.picPPoint.Size = new System.Drawing.Size(656, 248);
this.picPPoint.Size = new System.Drawing.Size(656, 66);
this.picPPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picPPoint.TabIndex = 304;
this.picPPoint.TabStop = false;
this.picPPoint.Visible = false;
//
// groupBox7
//
......@@ -759,16 +761,16 @@
this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox7.Location = new System.Drawing.Point(4, 563);
this.groupBox7.Location = new System.Drawing.Point(587, 331);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(575, 89);
this.groupBox7.Size = new System.Drawing.Size(653, 137);
this.groupBox7.TabIndex = 90;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温湿度控制器调试";
//
// btnSelTemp
//
this.btnSelTemp.Location = new System.Drawing.Point(419, 16);
this.btnSelTemp.Location = new System.Drawing.Point(261, 76);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(100, 33);
this.btnSelTemp.TabIndex = 248;
......@@ -779,7 +781,7 @@
// txtHum
//
this.txtHum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(280, 58);
this.txtHum.Location = new System.Drawing.Point(102, 92);
this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(87, 23);
......@@ -790,7 +792,7 @@
//
this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label29.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label29.Location = new System.Drawing.Point(195, 61);
this.label29.Location = new System.Drawing.Point(17, 95);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(85, 17);
this.label29.TabIndex = 246;
......@@ -908,7 +910,7 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(587, 6);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(653, 299);
this.groupAxis.Size = new System.Drawing.Size(653, 320);
this.groupAxis.TabIndex = 216;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服调试";
......
source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png

45.9 KB | 宽: | 高:

source/ACSingleStore/image/jp/axis.png

47.7 KB | 宽: | 高:

source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png
source/ACSingleStore/image/jp/axis.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png

45.9 KB | 宽: | 高:

source/ACSingleStore/image/us/axis.png

48.7 KB | 宽: | 高:

source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png
source/ACSingleStore/image/us/axis.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs
......@@ -30,7 +30,6 @@
{
this.components = new System.ComponentModel.Container();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.picAxis2 = new System.Windows.Forms.PictureBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.txtP4Offset = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
......@@ -41,20 +40,14 @@
this.txtP5Offset = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.btnOpenFolder = new System.Windows.Forms.Button();
this.btnGetActualPosition = new System.Windows.Forms.Button();
this.txtSpeed = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
this.txtFileName = new System.Windows.Forms.TextBox();
this.ioSingleControl = new UserFromControl.IOTextControl();
this.btnAbsMove = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.txtPosition = new System.Windows.Forms.TextBox();
this.txtActualPosition = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.btnSdStop = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.txtTargetPosition = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label12 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
......@@ -68,11 +61,20 @@
this.label2 = new System.Windows.Forms.Label();
this.txtIoIp = new System.Windows.Forms.TextBox();
this.btnExit = new System.Windows.Forms.Button();
this.picAxis2 = new System.Windows.Forms.PictureBox();
this.btnGetActualPosition = new System.Windows.Forms.Button();
this.ioSingleControl = new UserFromControl.IOTextControl();
this.label7 = new System.Windows.Forms.Label();
this.txtActualPosition = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.txtTargetPosition = new System.Windows.Forms.TextBox();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.groupBox6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picAxis2)).BeginInit();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picAxis2)).BeginInit();
this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// groupBox6
......@@ -80,30 +82,19 @@
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.picAxis2);
this.groupBox6.Controls.Add(this.groupBox2);
this.groupBox6.Controls.Add(this.groupBox1);
this.groupBox6.Controls.Add(this.btnExit);
this.groupBox6.Controls.Add(this.picAxis2);
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(6, 5);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1010, 707);
this.groupBox6.Size = new System.Drawing.Size(962, 464);
this.groupBox6.TabIndex = 250;
this.groupBox6.TabStop = false;
//
// picAxis2
//
this.picAxis2.Location = new System.Drawing.Point(468, 15);
this.picAxis2.Name = "picAxis2";
this.picAxis2.Size = new System.Drawing.Size(536, 558);
this.picAxis2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picAxis2.TabIndex = 284;
this.picAxis2.TabStop = false;
//
// groupBox2
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Controls.Add(this.txtP4Offset);
this.groupBox2.Controls.Add(this.label10);
this.groupBox2.Controls.Add(this.txtP3Offset);
......@@ -113,23 +104,17 @@
this.groupBox2.Controls.Add(this.txtP5Offset);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnOpenFolder);
this.groupBox2.Controls.Add(this.btnGetActualPosition);
this.groupBox2.Controls.Add(this.txtSpeed);
this.groupBox2.Controls.Add(this.label8);
this.groupBox2.Controls.Add(this.txtFileName);
this.groupBox2.Controls.Add(this.ioSingleControl);
this.groupBox2.Controls.Add(this.btnAbsMove);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label7);
this.groupBox2.Controls.Add(this.txtPosition);
this.groupBox2.Controls.Add(this.txtActualPosition);
this.groupBox2.Controls.Add(this.label13);
this.groupBox2.Controls.Add(this.btnSdStop);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.txtTargetPosition);
this.groupBox2.Location = new System.Drawing.Point(9, 200);
this.groupBox2.Location = new System.Drawing.Point(482, 20);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(450, 452);
this.groupBox2.Size = new System.Drawing.Size(463, 340);
this.groupBox2.TabIndex = 283;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "位置信息";
......@@ -137,7 +122,7 @@
// txtP4Offset
//
this.txtP4Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP4Offset.Location = new System.Drawing.Point(184, 174);
this.txtP4Offset.Location = new System.Drawing.Point(193, 174);
this.txtP4Offset.MaxLength = 30;
this.txtP4Offset.Name = "txtP4Offset";
this.txtP4Offset.Size = new System.Drawing.Size(121, 26);
......@@ -149,7 +134,7 @@
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.Location = new System.Drawing.Point(6, 174);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(175, 29);
this.label10.Size = new System.Drawing.Size(185, 29);
this.label10.TabIndex = 288;
this.label10.Text = "入料缓冲点P4偏移量：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -157,7 +142,7 @@
// txtP3Offset
//
this.txtP3Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3Offset.Location = new System.Drawing.Point(184, 142);
this.txtP3Offset.Location = new System.Drawing.Point(193, 142);
this.txtP3Offset.MaxLength = 30;
this.txtP3Offset.Name = "txtP3Offset";
this.txtP3Offset.Size = new System.Drawing.Size(121, 26);
......@@ -169,7 +154,7 @@
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(6, 142);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(175, 29);
this.label9.Size = new System.Drawing.Size(185, 29);
this.label9.TabIndex = 286;
this.label9.Text = "入料前点P3偏移量：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -177,7 +162,7 @@
// txtP6Offset
//
this.txtP6Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP6Offset.Location = new System.Drawing.Point(184, 110);
this.txtP6Offset.Location = new System.Drawing.Point(193, 110);
this.txtP6Offset.MaxLength = 30;
this.txtP6Offset.Name = "txtP6Offset";
this.txtP6Offset.Size = new System.Drawing.Size(121, 26);
......@@ -189,7 +174,7 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(6, 110);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(175, 29);
this.label5.Size = new System.Drawing.Size(185, 29);
this.label5.TabIndex = 284;
this.label5.Text = "出料缓冲点P6偏移量：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -197,7 +182,7 @@
// txtP5Offset
//
this.txtP5Offset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP5Offset.Location = new System.Drawing.Point(184, 78);
this.txtP5Offset.Location = new System.Drawing.Point(193, 78);
this.txtP5Offset.MaxLength = 30;
this.txtP5Offset.Name = "txtP5Offset";
this.txtP5Offset.Size = new System.Drawing.Size(121, 26);
......@@ -209,7 +194,7 @@
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(6, 78);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(175, 29);
this.label4.Size = new System.Drawing.Size(185, 29);
this.label4.TabIndex = 282;
this.label4.Text = "出料前点P5偏移值：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -217,7 +202,7 @@
// btnOpenFolder
//
this.btnOpenFolder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenFolder.Location = new System.Drawing.Point(312, 22);
this.btnOpenFolder.Location = new System.Drawing.Point(321, 22);
this.btnOpenFolder.Name = "btnOpenFolder";
this.btnOpenFolder.Size = new System.Drawing.Size(132, 36);
this.btnOpenFolder.TabIndex = 280;
......@@ -225,21 +210,10 @@
this.btnOpenFolder.UseVisualStyleBackColor = true;
this.btnOpenFolder.Click += new System.EventHandler(this.btnOpenFolder_Click);
//
// btnGetActualPosition
//
this.btnGetActualPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetActualPosition.Location = new System.Drawing.Point(312, 348);
this.btnGetActualPosition.Name = "btnGetActualPosition";
this.btnGetActualPosition.Size = new System.Drawing.Size(132, 36);
this.btnGetActualPosition.TabIndex = 269;
this.btnGetActualPosition.Text = "读取位置";
this.btnGetActualPosition.UseVisualStyleBackColor = true;
this.btnGetActualPosition.Click += new System.EventHandler(this.btnGetActualPosition_Click);
//
// txtSpeed
//
this.txtSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpeed.Location = new System.Drawing.Point(184, 227);
this.txtSpeed.Location = new System.Drawing.Point(193, 227);
this.txtSpeed.MaxLength = 30;
this.txtSpeed.Name = "txtSpeed";
this.txtSpeed.Size = new System.Drawing.Size(121, 26);
......@@ -251,7 +225,7 @@
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(6, 226);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(175, 29);
this.label8.Size = new System.Drawing.Size(185, 29);
this.label8.TabIndex = 84;
this.label8.Text = "速度(r/min)：";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -259,27 +233,17 @@
// txtFileName
//
this.txtFileName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtFileName.Location = new System.Drawing.Point(170, 27);
this.txtFileName.Location = new System.Drawing.Point(179, 27);
this.txtFileName.MaxLength = 30;
this.txtFileName.Name = "txtFileName";
this.txtFileName.Size = new System.Drawing.Size(135, 26);
this.txtFileName.TabIndex = 278;
this.txtFileName.Text = "position.csv";
//
// ioSingleControl
//
this.ioSingleControl.IOName = "检测信号";
this.ioSingleControl.IOValue = 0;
this.ioSingleControl.isCanClick = false;
this.ioSingleControl.Location = new System.Drawing.Point(11, 401);
this.ioSingleControl.Name = "ioSingleControl";
this.ioSingleControl.Size = new System.Drawing.Size(294, 30);
this.ioSingleControl.TabIndex = 279;
//
// btnAbsMove
//
this.btnAbsMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAbsMove.Location = new System.Drawing.Point(312, 222);
this.btnAbsMove.Location = new System.Drawing.Point(321, 222);
this.btnAbsMove.Name = "btnAbsMove";
this.btnAbsMove.Size = new System.Drawing.Size(132, 36);
this.btnAbsMove.TabIndex = 88;
......@@ -292,47 +256,27 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(6, 23);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(161, 33);
this.label3.Size = new System.Drawing.Size(171, 33);
this.label3.TabIndex = 277;
this.label3.Text = "保存文件名称：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(6, 352);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(175, 29);
this.label7.TabIndex = 271;
this.label7.Text = "实际位置：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtPosition
//
this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosition.Location = new System.Drawing.Point(184, 265);
this.txtPosition.Location = new System.Drawing.Point(193, 265);
this.txtPosition.MaxLength = 30;
this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(121, 26);
this.txtPosition.TabIndex = 89;
this.txtPosition.Text = "5000";
//
// txtActualPosition
//
this.txtActualPosition.Enabled = false;
this.txtActualPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtActualPosition.Location = new System.Drawing.Point(184, 353);
this.txtActualPosition.MaxLength = 30;
this.txtActualPosition.Name = "txtActualPosition";
this.txtActualPosition.Size = new System.Drawing.Size(121, 26);
this.txtActualPosition.TabIndex = 270;
//
// label13
//
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.Location = new System.Drawing.Point(6, 264);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(175, 29);
this.label13.Size = new System.Drawing.Size(185, 29);
this.label13.TabIndex = 90;
this.label13.Text = "位置：";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -340,7 +284,7 @@
// btnSdStop
//
this.btnSdStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSdStop.Location = new System.Drawing.Point(312, 260);
this.btnSdStop.Location = new System.Drawing.Point(321, 260);
this.btnSdStop.Name = "btnSdStop";
this.btnSdStop.Size = new System.Drawing.Size(132, 36);
this.btnSdStop.TabIndex = 257;
......@@ -348,26 +292,6 @@
this.btnSdStop.UseVisualStyleBackColor = true;
this.btnSdStop.Click += new System.EventHandler(this.btnSdStop_Click);
//
// label6
//
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(6, 318);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(175, 29);
this.label6.TabIndex = 268;
this.label6.Text = "目标位置：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTargetPosition
//
this.txtTargetPosition.Enabled = false;
this.txtTargetPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTargetPosition.Location = new System.Drawing.Point(184, 318);
this.txtTargetPosition.MaxLength = 30;
this.txtTargetPosition.Name = "txtTargetPosition";
this.txtTargetPosition.Size = new System.Drawing.Size(121, 26);
this.txtTargetPosition.TabIndex = 267;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label12);
......@@ -381,9 +305,9 @@
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtIoIp);
this.groupBox1.Location = new System.Drawing.Point(9, 21);
this.groupBox1.Location = new System.Drawing.Point(15, 20);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(450, 173);
this.groupBox1.Size = new System.Drawing.Size(459, 181);
this.groupBox1.TabIndex = 282;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "设备信息";
......@@ -506,8 +430,7 @@
//
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(851, 616);
this.btnExit.Location = new System.Drawing.Point(794, 388);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36);
this.btnExit.TabIndex = 281;
......@@ -515,30 +438,117 @@
this.btnExit.UseVisualStyleBackColor = true;
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
// picAxis2
//
this.picAxis2.Location = new System.Drawing.Point(615, 126);
this.picAxis2.Name = "picAxis2";
this.picAxis2.Size = new System.Drawing.Size(158, 243);
this.picAxis2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picAxis2.TabIndex = 284;
this.picAxis2.TabStop = false;
this.picAxis2.Visible = false;
//
// btnGetActualPosition
//
this.btnGetActualPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetActualPosition.Location = new System.Drawing.Point(312, 49);
this.btnGetActualPosition.Name = "btnGetActualPosition";
this.btnGetActualPosition.Size = new System.Drawing.Size(132, 36);
this.btnGetActualPosition.TabIndex = 269;
this.btnGetActualPosition.Text = "读取位置";
this.btnGetActualPosition.UseVisualStyleBackColor = true;
this.btnGetActualPosition.Click += new System.EventHandler(this.btnGetActualPosition_Click);
//
// ioSingleControl
//
this.ioSingleControl.IOName = "检测信号";
this.ioSingleControl.IOValue = 0;
this.ioSingleControl.isCanClick = false;
this.ioSingleControl.Location = new System.Drawing.Point(11, 102);
this.ioSingleControl.Name = "ioSingleControl";
this.ioSingleControl.Size = new System.Drawing.Size(294, 30);
this.ioSingleControl.TabIndex = 279;
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(6, 53);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(175, 29);
this.label7.TabIndex = 271;
this.label7.Text = "实际位置：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtActualPosition
//
this.txtActualPosition.Enabled = false;
this.txtActualPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtActualPosition.Location = new System.Drawing.Point(184, 54);
this.txtActualPosition.MaxLength = 30;
this.txtActualPosition.Name = "txtActualPosition";
this.txtActualPosition.Size = new System.Drawing.Size(121, 26);
this.txtActualPosition.TabIndex = 270;
//
// label6
//
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(6, 19);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(175, 29);
this.label6.TabIndex = 268;
this.label6.Text = "目标位置：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtTargetPosition
//
this.txtTargetPosition.Enabled = false;
this.txtTargetPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTargetPosition.Location = new System.Drawing.Point(184, 19);
this.txtTargetPosition.MaxLength = 30;
this.txtTargetPosition.Name = "txtTargetPosition";
this.txtTargetPosition.Size = new System.Drawing.Size(121, 26);
this.txtTargetPosition.TabIndex = 267;
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.label6);
this.groupBox3.Controls.Add(this.label7);
this.groupBox3.Controls.Add(this.ioSingleControl);
this.groupBox3.Controls.Add(this.txtTargetPosition);
this.groupBox3.Controls.Add(this.txtActualPosition);
this.groupBox3.Controls.Add(this.btnGetActualPosition);
this.groupBox3.Location = new System.Drawing.Point(21, 215);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(459, 150);
this.groupBox3.TabIndex = 289;
this.groupBox3.TabStop = false;
//
// FrmPositionTool
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1020, 719);
this.ClientSize = new System.Drawing.Size(972, 476);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox6);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "FrmPositionTool";
this.Text = "升降轴位置测试";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPositionTool_FormClosing);
this.Load += new System.EventHandler(this.Form1_Load);
this.Shown += new System.EventHandler(this.FrmPositionTool_Shown);
this.groupBox6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picAxis2)).EndInit();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.picAxis2)).EndInit();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.ResumeLayout(false);
}
......@@ -585,6 +595,7 @@
private System.Windows.Forms.TextBox txtP5Offset;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.PictureBox picAxis2;
private System.Windows.Forms.GroupBox groupBox3;
}
}
source/ACSingleStore/记录.txt
......@@ -275,3 +275,8 @@ PRO,(轴五)上料轴出料时检测到料盘需要下降的高度,BatchAxis_Dow
20200919
特殊条码可配置： 特殊条码里面，类似这样的 T;PartNum;1=7x32
扫到条码是T0001,以T开头，则替换为：T0001;T0001;1
20201126
中英文修改，翻译内容修改。增加日文。
自动出入库时，若没有出库的料盘，不再继续入库，直接停止自动出入库。
\ No newline at end of file
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -1361,9 +1361,19 @@ namespace OnlineStore.DeviceLibrary
}
if (readId.Equals(""))
{
//开始自动入库
string msg = AutomaticBaiting.doStartBatchIn();
LogUtil.info("自动出入库：库位号【" + GetAutoPosid(false) + "】，开始入库" + msg);
//如果有出库的料，继续自动入库，否则停止自动出入库
if (AutomaticBaiting.BatchOutStoreCount > 0 || AutomaticBaiting.BatchOutStoreHeight > 0)
{
//开始自动入库
string msg = AutomaticBaiting.doStartBatchIn();
LogUtil.info("自动出入库：已有出库[" + AutomaticBaiting.BatchOutStoreCount+"]盘料共["+ AutomaticBaiting.BatchOutStoreHeight +
"]mm，开始自动入库：库位号【" + GetAutoPosid(false) + "】，开始入库" + msg);
}
else
{
LogUtil.info("自动出入库：已有出库[" + AutomaticBaiting.BatchOutStoreCount + "]盘料共[" + AutomaticBaiting.BatchOutStoreHeight + "]mm，无料盘可入库，停止自动出入库");
autoNext = false;
}
}
else
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!