Skip to content

孙克 / RC30-AutoInOutStore

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

界面增加启用调试的处理

1 个父辈 502503f2
内嵌 并排
正在显示 4 个修改的文件 包含 260 行增加 和 207 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -26,7 +26,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmStoreBox));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.lblWarnMsg = new System.Windows.Forms.Label();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.groupAxis = new System.Windows.Forms.GroupBox();
this.btnUpdateSpeed = new System.Windows.Forms.Button();
this.btnUpdateStatus = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
......@@ -106,9 +106,8 @@
this.label1 = new System.Windows.Forms.Label();
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupInout = new System.Windows.Forms.GroupBox();
this.btnSave = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.txtInoutP4 = new System.Windows.Forms.TextBox();
this.btnInOutP4 = new System.Windows.Forms.Button();
this.txtUpdownP8 = new System.Windows.Forms.TextBox();
......@@ -148,6 +147,7 @@
this.btnUpDownP6 = new System.Windows.Forms.Button();
this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.btnClearLog = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
this.btnStartAuTo = new System.Windows.Forms.Button();
......@@ -196,6 +196,7 @@
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.摄像机调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.出入库调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.语言 = new System.Windows.Forms.ToolStripMenuItem();
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
......@@ -207,7 +208,7 @@
this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.groupComAxis = new System.Windows.Forms.GroupBox();
this.lblComMsg = new System.Windows.Forms.Label();
this.btnRelMove = new System.Windows.Forms.Button();
this.txtAddr = new System.Windows.Forms.TextBox();
......@@ -230,6 +231,7 @@
this.label25 = new System.Windows.Forms.Label();
this.comboBoxPortName = new System.Windows.Forms.ComboBox();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabPage1 = new System.Windows.Forms.TabPage();
......@@ -244,7 +246,6 @@
this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button();
this.btnBatchReset = new System.Windows.Forms.Button();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblBatchMsg = new System.Windows.Forms.Label();
this.btnOpenDoor = new System.Windows.Forms.Button();
......@@ -256,19 +257,19 @@
this.lblDoorStatus = new System.Windows.Forms.Label();
this.btnBatchInStore = new System.Windows.Forms.Button();
this.lblOutInfo = new System.Windows.Forms.Label();
this.groupBox5.SuspendLayout();
this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupInout.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupComAxis.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage4.SuspendLayout();
this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox7.SuspendLayout();
this.tabPage4.SuspendLayout();
this.groupBox6.SuspendLayout();
this.SuspendLayout();
//
......@@ -287,68 +288,69 @@
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// groupBox5
// groupAxis
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.groupAxis.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.btnUpdateSpeed);
this.groupBox5.Controls.Add(this.btnUpdateStatus);
this.groupBox5.Controls.Add(this.label24);
this.groupBox5.Controls.Add(this.label26);
this.groupBox5.Controls.Add(this.btnReadLimit2);
this.groupBox5.Controls.Add(this.txtLimit2);
this.groupBox5.Controls.Add(this.label22);
this.groupBox5.Controls.Add(this.label23);
this.groupBox5.Controls.Add(this.btnReadLimit1);
this.groupBox5.Controls.Add(this.txtLimit1);
this.groupBox5.Controls.Add(this.label6);
this.groupBox5.Controls.Add(this.label5);
this.groupBox5.Controls.Add(this.btnReadHomeSingle);
this.groupBox5.Controls.Add(this.txtHomeSingle);
this.groupBox5.Controls.Add(this.chbAutoRead);
this.groupBox5.Controls.Add(this.label16);
this.groupBox5.Controls.Add(this.label15);
this.groupBox5.Controls.Add(this.label14);
this.groupBox5.Controls.Add(this.label11);
this.groupBox5.Controls.Add(this.txtHomeStatus);
this.groupBox5.Controls.Add(this.button2);
this.groupBox5.Controls.Add(this.label10);
this.groupBox5.Controls.Add(this.txtBusyStatus);
this.groupBox5.Controls.Add(this.btnReadBusy);
this.groupBox5.Controls.Add(this.label2);
this.groupBox5.Controls.Add(this.txtAlarmStatus);
this.groupBox5.Controls.Add(this.btnGetAlarm);
this.groupBox5.Controls.Add(this.lblServerOn);
this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.label8);
this.groupBox5.Controls.Add(this.btnOpenAxis);
this.groupBox5.Controls.Add(this.btnCloseAxis);
this.groupBox5.Controls.Add(this.lblCountPulse);
this.groupBox5.Controls.Add(this.txtASpeed);
this.groupBox5.Controls.Add(this.lblOutPulse);
this.groupBox5.Controls.Add(this.label47);
this.groupBox5.Controls.Add(this.btnAxisVMove);
this.groupBox5.Controls.Add(this.btnAxisRMove);
this.groupBox5.Controls.Add(this.btnAxisReturnHome);
this.groupBox5.Controls.Add(this.btnAxisAMove);
this.groupBox5.Controls.Add(this.Bt_ClearCounter);
this.groupBox5.Controls.Add(this.btnComAlarmClear);
this.groupBox5.Controls.Add(this.txtAPosition);
this.groupBox5.Controls.Add(this.label48);
this.groupBox5.Controls.Add(this.btnAxisStop);
this.groupBox5.Controls.Add(this.txtAxisValue);
this.groupBox5.Controls.Add(this.txtAxisDeviceName);
this.groupBox5.Controls.Add(this.label45);
this.groupBox5.Controls.Add(this.label46);
this.groupBox5.Controls.Add(this.cmbAxisList);
this.groupBox5.Controls.Add(this.label49);
this.groupBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox5.Location = new System.Drawing.Point(6, 2);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(641, 455);
this.groupBox5.TabIndex = 216;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "伺服运动";
this.groupAxis.Controls.Add(this.btnUpdateSpeed);
this.groupAxis.Controls.Add(this.btnUpdateStatus);
this.groupAxis.Controls.Add(this.label24);
this.groupAxis.Controls.Add(this.label26);
this.groupAxis.Controls.Add(this.btnReadLimit2);
this.groupAxis.Controls.Add(this.txtLimit2);
this.groupAxis.Controls.Add(this.label22);
this.groupAxis.Controls.Add(this.label23);
this.groupAxis.Controls.Add(this.btnReadLimit1);
this.groupAxis.Controls.Add(this.txtLimit1);
this.groupAxis.Controls.Add(this.label6);
this.groupAxis.Controls.Add(this.label5);
this.groupAxis.Controls.Add(this.btnReadHomeSingle);
this.groupAxis.Controls.Add(this.txtHomeSingle);
this.groupAxis.Controls.Add(this.chbAutoRead);
this.groupAxis.Controls.Add(this.label16);
this.groupAxis.Controls.Add(this.label15);
this.groupAxis.Controls.Add(this.label14);
this.groupAxis.Controls.Add(this.label11);
this.groupAxis.Controls.Add(this.txtHomeStatus);
this.groupAxis.Controls.Add(this.button2);
this.groupAxis.Controls.Add(this.label10);
this.groupAxis.Controls.Add(this.txtBusyStatus);
this.groupAxis.Controls.Add(this.btnReadBusy);
this.groupAxis.Controls.Add(this.label2);
this.groupAxis.Controls.Add(this.txtAlarmStatus);
this.groupAxis.Controls.Add(this.btnGetAlarm);
this.groupAxis.Controls.Add(this.lblServerOn);
this.groupAxis.Controls.Add(this.label7);
this.groupAxis.Controls.Add(this.label8);
this.groupAxis.Controls.Add(this.btnOpenAxis);
this.groupAxis.Controls.Add(this.btnCloseAxis);
this.groupAxis.Controls.Add(this.lblCountPulse);
this.groupAxis.Controls.Add(this.txtASpeed);
this.groupAxis.Controls.Add(this.lblOutPulse);
this.groupAxis.Controls.Add(this.label47);
this.groupAxis.Controls.Add(this.btnAxisVMove);
this.groupAxis.Controls.Add(this.btnAxisRMove);
this.groupAxis.Controls.Add(this.btnAxisReturnHome);
this.groupAxis.Controls.Add(this.btnAxisAMove);
this.groupAxis.Controls.Add(this.Bt_ClearCounter);
this.groupAxis.Controls.Add(this.btnComAlarmClear);
this.groupAxis.Controls.Add(this.txtAPosition);
this.groupAxis.Controls.Add(this.label48);
this.groupAxis.Controls.Add(this.btnAxisStop);
this.groupAxis.Controls.Add(this.txtAxisValue);
this.groupAxis.Controls.Add(this.txtAxisDeviceName);
this.groupAxis.Controls.Add(this.label45);
this.groupAxis.Controls.Add(this.label46);
this.groupAxis.Controls.Add(this.cmbAxisList);
this.groupAxis.Controls.Add(this.label49);
this.groupAxis.Enabled = false;
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(6, 2);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(641, 455);
this.groupAxis.TabIndex = 216;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
//
// btnUpdateSpeed
//
......@@ -913,7 +915,7 @@
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(11, 5);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(634, 444);
this.richTextBox1.Size = new System.Drawing.Size(634, 409);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
//
......@@ -1197,57 +1199,57 @@
this.label42.Text = "编码器计数:";
this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// groupBox2
// groupInout
//
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox2.Controls.Add(this.btnSave);
this.groupBox2.Controls.Add(this.btnClearLog);
this.groupBox2.Controls.Add(this.txtInoutP4);
this.groupBox2.Controls.Add(this.btnInOutP4);
this.groupBox2.Controls.Add(this.txtUpdownP8);
this.groupBox2.Controls.Add(this.btnBatchOutTest);
this.groupBox2.Controls.Add(this.btnUpdownP8);
this.groupBox2.Controls.Add(this.txtUpdownP2);
this.groupBox2.Controls.Add(this.btnUpdownP2);
this.groupBox2.Controls.Add(this.txtUpDownDoor);
this.groupBox2.Controls.Add(this.btnUpDownDoor);
this.groupBox2.Controls.Add(this.btnSavePosition);
this.groupBox2.Controls.Add(this.txtComP1);
this.groupBox2.Controls.Add(this.txtInOutP2);
this.groupBox2.Controls.Add(this.txtInOutP1);
this.groupBox2.Controls.Add(this.txtMiddleP1);
this.groupBox2.Controls.Add(this.txtUpDownP1);
this.groupBox2.Controls.Add(this.txtComP3);
this.groupBox2.Controls.Add(this.txtComP2);
this.groupBox2.Controls.Add(this.txtInOutP3);
this.groupBox2.Controls.Add(this.txtMiddleP2);
this.groupBox2.Controls.Add(this.txtUpDownP5);
this.groupBox2.Controls.Add(this.txtUpDownP6);
this.groupBox2.Controls.Add(this.cmbPosition);
this.groupBox2.Controls.Add(this.label21);
this.groupBox2.Controls.Add(this.txtUpDownP3);
this.groupBox2.Controls.Add(this.btnOutStore);
this.groupBox2.Controls.Add(this.txtUpDownP4);
this.groupBox2.Controls.Add(this.btnComP1);
this.groupBox2.Controls.Add(this.btnInOutP2);
this.groupBox2.Controls.Add(this.btnInOutP1);
this.groupBox2.Controls.Add(this.btnMiddleP1);
this.groupBox2.Controls.Add(this.btnUpDownP1);
this.groupBox2.Controls.Add(this.btnComP3);
this.groupBox2.Controls.Add(this.btnComP2);
this.groupBox2.Controls.Add(this.btnInOutP3);
this.groupBox2.Controls.Add(this.btnMiddleP2);
this.groupBox2.Controls.Add(this.btnUpDownP5);
this.groupBox2.Controls.Add(this.btnUpDownP6);
this.groupBox2.Controls.Add(this.btnUpDownP3);
this.groupBox2.Controls.Add(this.btnUpDownP4);
this.groupBox2.Location = new System.Drawing.Point(7, 146);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(573, 571);
this.groupBox2.TabIndex = 100;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "出入库操作";
this.groupInout.Controls.Add(this.btnSave);
this.groupInout.Controls.Add(this.txtInoutP4);
this.groupInout.Controls.Add(this.btnInOutP4);
this.groupInout.Controls.Add(this.txtUpdownP8);
this.groupInout.Controls.Add(this.btnBatchOutTest);
this.groupInout.Controls.Add(this.btnUpdownP8);
this.groupInout.Controls.Add(this.txtUpdownP2);
this.groupInout.Controls.Add(this.btnUpdownP2);
this.groupInout.Controls.Add(this.txtUpDownDoor);
this.groupInout.Controls.Add(this.btnUpDownDoor);
this.groupInout.Controls.Add(this.btnSavePosition);
this.groupInout.Controls.Add(this.txtComP1);
this.groupInout.Controls.Add(this.txtInOutP2);
this.groupInout.Controls.Add(this.txtInOutP1);
this.groupInout.Controls.Add(this.txtMiddleP1);
this.groupInout.Controls.Add(this.txtUpDownP1);
this.groupInout.Controls.Add(this.txtComP3);
this.groupInout.Controls.Add(this.txtComP2);
this.groupInout.Controls.Add(this.txtInOutP3);
this.groupInout.Controls.Add(this.txtMiddleP2);
this.groupInout.Controls.Add(this.txtUpDownP5);
this.groupInout.Controls.Add(this.txtUpDownP6);
this.groupInout.Controls.Add(this.cmbPosition);
this.groupInout.Controls.Add(this.label21);
this.groupInout.Controls.Add(this.txtUpDownP3);
this.groupInout.Controls.Add(this.btnOutStore);
this.groupInout.Controls.Add(this.txtUpDownP4);
this.groupInout.Controls.Add(this.btnComP1);
this.groupInout.Controls.Add(this.btnInOutP2);
this.groupInout.Controls.Add(this.btnInOutP1);
this.groupInout.Controls.Add(this.btnMiddleP1);
this.groupInout.Controls.Add(this.btnUpDownP1);
this.groupInout.Controls.Add(this.btnComP3);
this.groupInout.Controls.Add(this.btnComP2);
this.groupInout.Controls.Add(this.btnInOutP3);
this.groupInout.Controls.Add(this.btnMiddleP2);
this.groupInout.Controls.Add(this.btnUpDownP5);
this.groupInout.Controls.Add(this.btnUpDownP6);
this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(7, 146);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(573, 571);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "出入库操作";
//
// btnSave
//
......@@ -1260,17 +1262,6 @@
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// btnClearLog
//
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(364, 500);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(151, 38);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = true;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// txtInoutP4
//
this.txtInoutP4.AcceptsReturn = true;
......@@ -1413,7 +1404,7 @@
// btnSavePosition
//
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(364, 456);
this.btnSavePosition.Location = new System.Drawing.Point(368, 484);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(151, 38);
this.btnSavePosition.TabIndex = 217;
......@@ -1867,6 +1858,18 @@
this.btnUpDownP4.UseVisualStyleBackColor = true;
this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
//
// btnClearLog
//
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(15, 418);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(151, 38);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = true;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// lblTemp
//
this.lblTemp.AutoSize = true;
......@@ -2198,7 +2201,8 @@
this.扫码测试ToolStripMenuItem,
this.toolStripSeparator10,
this.摄像机调试ToolStripMenuItem,
this.toolStripSeparator11});
this.toolStripSeparator11,
this.出入库调试ToolStripMenuItem});
this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem";
this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.设备调试ToolStripMenuItem.Text = "设备调试";
......@@ -2206,39 +2210,45 @@
// 轴卡点动ToolStripMenuItem
//
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
//
// 摄像机调试ToolStripMenuItem
//
this.摄像机调试ToolStripMenuItem.Name = "摄像机调试ToolStripMenuItem";
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.摄像机调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.摄像机调试ToolStripMenuItem.Text = "二维码学习";
this.摄像机调试ToolStripMenuItem.Click += new System.EventHandler(this.摄像机调试ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(157, 6);
this.toolStripSeparator11.Visible = false;
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6);
//
// 出入库调试ToolStripMenuItem
//
this.出入库调试ToolStripMenuItem.Name = "出入库调试ToolStripMenuItem";
this.出入库调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.出入库调试ToolStripMenuItem.Text = "启用调试";
this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click);
//
// 语言
//
......@@ -2332,38 +2342,39 @@
this.notifyIcon1.Text = "料仓客户端";
this.notifyIcon1.Visible = true;
//
// groupBox4
// groupComAxis
//
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.groupComAxis.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox4.Controls.Add(this.lblComMsg);
this.groupBox4.Controls.Add(this.btnRelMove);
this.groupBox4.Controls.Add(this.txtAddr);
this.groupBox4.Controls.Add(this.label18);
this.groupBox4.Controls.Add(this.btnGetPosition);
this.groupBox4.Controls.Add(this.cmbHomeType);
this.groupBox4.Controls.Add(this.label13);
this.groupBox4.Controls.Add(this.label17);
this.groupBox4.Controls.Add(this.txtSpeed);
this.groupBox4.Controls.Add(this.btnVolMove);
this.groupBox4.Controls.Add(this.btnClose);
this.groupBox4.Controls.Add(this.btnOpen);
this.groupBox4.Controls.Add(this.btnStatusSearch);
this.groupBox4.Controls.Add(this.label19);
this.groupBox4.Controls.Add(this.txtLinePosition);
this.groupBox4.Controls.Add(this.btnHomeMove);
this.groupBox4.Controls.Add(this.btnClearPosition);
this.groupBox4.Controls.Add(this.btnStop);
this.groupBox4.Controls.Add(this.btnLineAbsMove);
this.groupBox4.Controls.Add(this.label25);
this.groupBox4.Controls.Add(this.comboBoxPortName);
this.groupBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox4.Location = new System.Drawing.Point(8, 4);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(640, 194);
this.groupBox4.TabIndex = 271;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "压紧轴";
this.groupComAxis.Controls.Add(this.lblComMsg);
this.groupComAxis.Controls.Add(this.btnRelMove);
this.groupComAxis.Controls.Add(this.txtAddr);
this.groupComAxis.Controls.Add(this.label18);
this.groupComAxis.Controls.Add(this.btnGetPosition);
this.groupComAxis.Controls.Add(this.cmbHomeType);
this.groupComAxis.Controls.Add(this.label13);
this.groupComAxis.Controls.Add(this.label17);
this.groupComAxis.Controls.Add(this.txtSpeed);
this.groupComAxis.Controls.Add(this.btnVolMove);
this.groupComAxis.Controls.Add(this.btnClose);
this.groupComAxis.Controls.Add(this.btnOpen);
this.groupComAxis.Controls.Add(this.btnStatusSearch);
this.groupComAxis.Controls.Add(this.label19);
this.groupComAxis.Controls.Add(this.txtLinePosition);
this.groupComAxis.Controls.Add(this.btnHomeMove);
this.groupComAxis.Controls.Add(this.btnClearPosition);
this.groupComAxis.Controls.Add(this.btnStop);
this.groupComAxis.Controls.Add(this.btnLineAbsMove);
this.groupComAxis.Controls.Add(this.label25);
this.groupComAxis.Controls.Add(this.comboBoxPortName);
this.groupComAxis.Enabled = false;
this.groupComAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupComAxis.Location = new System.Drawing.Point(8, 4);
this.groupComAxis.Name = "groupComAxis";
this.groupComAxis.Size = new System.Drawing.Size(640, 194);
this.groupComAxis.TabIndex = 271;
this.groupComAxis.TabStop = false;
this.groupComAxis.Text = "压紧轴";
//
// lblComMsg
//
......@@ -2574,10 +2585,10 @@
this.tabControl1.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.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(589, 228);
this.tabControl1.Name = "tabControl1";
......@@ -2585,9 +2596,20 @@
this.tabControl1.Size = new System.Drawing.Size(663, 489);
this.tabControl1.TabIndex = 301;
//
// tabPage4
//
this.tabPage4.Controls.Add(this.richTextBox1);
this.tabPage4.Controls.Add(this.btnClearLog);
this.tabPage4.Location = new System.Drawing.Point(4, 26);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(655, 459);
this.tabPage4.TabIndex = 4;
this.tabPage4.Text = "日志";
this.tabPage4.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.groupBox5);
this.tabPage2.Controls.Add(this.groupAxis);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
......@@ -2598,7 +2620,7 @@
//
// tabPage3
//
this.tabPage3.Controls.Add(this.groupBox4);
this.tabPage3.Controls.Add(this.groupComAxis);
this.tabPage3.Controls.Add(this.groupBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
......@@ -2747,16 +2769,6 @@
this.btnBatchReset.Visible = false;
this.btnBatchReset.Click += new System.EventHandler(this.btnBatchOutEnd_Click);
//
// tabPage4
//
this.tabPage4.Controls.Add(this.richTextBox1);
this.tabPage4.Location = new System.Drawing.Point(4, 26);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(655, 459);
this.tabPage4.TabIndex = 4;
this.tabPage4.Text = "日志";
this.tabPage4.UseVisualStyleBackColor = true;
//
// groupBox6
//
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
......@@ -2896,7 +2908,7 @@
this.Controls.Add(this.groupBox6);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupInout);
this.Controls.Add(this.menuStrip1);
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")));
......@@ -2908,27 +2920,27 @@
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmStoreBox_FormClosed);
this.Load += new System.EventHandler(this.FrmTest_Load);
this.Shown += new System.EventHandler(this.FrmStoreBox_Shown);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
this.groupComAxis.ResumeLayout(false);
this.groupComAxis.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.tabPage4.ResumeLayout(false);
this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout();
this.ResumeLayout(false);
......@@ -2939,7 +2951,7 @@
#endregion
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox groupInout;
private System.Windows.Forms.Button btnOutStore;
private System.Windows.Forms.Button btnInStore;
public System.Windows.Forms.TextBox txtUpDownP3;
......@@ -2954,7 +2966,7 @@
private System.Windows.Forms.TextBox lblOutPulse;
private System.Windows.Forms.TextBox lblCountPulse;
private System.Windows.Forms.Button btnComAlarmClear;
private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.GroupBox groupAxis;
public System.Windows.Forms.Button btnComP1;
public System.Windows.Forms.TextBox txtComP1;
public System.Windows.Forms.Button btnInOutP2;
......@@ -3080,7 +3092,7 @@
private System.Windows.Forms.TextBox txtHomeSingle;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupComAxis;
private System.Windows.Forms.Button btnRelMove;
private System.Windows.Forms.TextBox txtAddr;
private System.Windows.Forms.Label label18;
......@@ -3170,6 +3182,7 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.ToolStripMenuItem 出入库调试ToolStripMenuItem;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -234,7 +234,14 @@ namespace OnlineStore.AutoInOutStore
LoadOk = true;
cmbHomeType.SelectedIndex = 1;
timer1.Start();
store.ResetEvent += Store_ResetEvent;
}
private void Store_ResetEvent()
{
DebugStatus(false);
}
private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e)
{
......@@ -1265,17 +1272,6 @@ namespace OnlineStore.AutoInOutStore
int value = ACServerManager.GetHomeEndStatus(GetPortName(), GetSlaveAddr());
this.txtHomeStatus.Text = value.ToString();
}
private void btnOpenWCF_Click(object sender, EventArgs e)
{
//WCFControl.OpenWCF();
}
private void btnCloseWCF_Click(object sender, EventArgs e)
{
//WCFControl.CloseWCF();
}
private void chbAuto_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
......@@ -1303,6 +1299,7 @@ namespace OnlineStore.AutoInOutStore
LogUtil.info("切换界面显示时，没有正确输入密码");
return;
}
DebugStatus(false);
this.Visible = true;
this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false;
......@@ -1320,7 +1317,7 @@ namespace OnlineStore.AutoInOutStore
{
stop_button_Click(null, null);
}
store.Exit();
KNDManager.CloseAllDO();
StoreOpenStatus(false);
KNDManager.CloseAllConnection();
......@@ -1351,6 +1348,7 @@ namespace OnlineStore.AutoInOutStore
this.ShowInTaskbar = false;
this.notifyIcon1.Visible = true;
this.Hide();
DebugStatus(false);
}
private void FrmStoreBox_FormClosed(object sender, FormClosedEventArgs e)
{
......@@ -1674,5 +1672,32 @@ namespace OnlineStore.AutoInOutStore
{
KND.IOMove(IO_Type.DisableDoorControl, IO_VALUE.LOW);
}
private void 出入库调试ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (出入库调试ToolStripMenuItem.Text.Equals("启用调试"))
{
DebugStatus(true);
}
else
{
DebugStatus(false);
}
}
private void DebugStatus(bool status)
{
if (status)
{
出入库调试ToolStripMenuItem.Text = "禁用调试";
}
else
{
出入库调试ToolStripMenuItem.Text = "启用调试";
}
groupAxis.Enabled = status;
groupComAxis.Enabled = status;
groupInout.Enabled = status;
}
}
}
source/Common/util/HumitureController.cs
......@@ -64,7 +64,10 @@ namespace OnlineStore.Common
/// </summary>
public static void Release()
{
if (sb != null)
{
sb.closePort();
}
IsRun = false;
}
public static ASTemperateParam LastData = new ASTemperateParam(0, 0);
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -16,6 +16,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public partial class AC_SA_BoxBean : AC_Store
{
public delegate void ResetDelegate();
public event ResetDelegate ResetEvent;
private bool IsIntSlvBlock = false;
//public bool UseBatchInout = true;
public string CID = "";
......@@ -268,6 +270,7 @@ namespace OnlineStore.DeviceLibrary
#region 原点返回和复位处理
private void ReturnHome()
{
ResetEvent?.Invoke();
WarnMsg = "";
CurrInOutACount = 0;
CurrInOutCount = 0;
......@@ -305,6 +308,7 @@ namespace OnlineStore.DeviceLibrary
/// <param name="isNeedClearAuto">是否需要清理自动出入库</param>
public void Reset(bool isNeedClearAuto)
{
ResetEvent?.Invoke();
CurrInOutCount = 0;
CurrInOutACount = 0;
......@@ -753,7 +757,7 @@ namespace OnlineStore.DeviceLibrary
StopMove(true);
storeRunStatus = StoreRunStatus.Wait;
mainTimer.Enabled = false;
//mainTimer.Enabled = false;
AutomaticBaiting.StopRun();
KNDManager.CloseAllDO();
if (IsHasCompress_Axis)
......@@ -764,7 +768,14 @@ namespace OnlineStore.DeviceLibrary
StoreManager.CurrInOutType = 0;
LogUtil.info(LOGGER, StoreName + ",停止运行，总运行时间：" + runTimeWatch.Elapsed.ToString());
}
public void Exit()
{
if (!storeRunStatus.Equals(StoreRunStatus.Wait))
{
StopRun();
}
mainTimer.Enabled = false;
}
public override void Alarm(StoreAlarmType alarmType, string alarmDetial, string alarmMsg, StoreMoveType storeMoveType)
{
SaveAlarmInfo(alarmType, alarmDetial, alarmMsg, storeMoveType);
......@@ -1338,6 +1349,7 @@ namespace OnlineStore.DeviceLibrary
temp = param.Temperate;
currTempStr = ("当前湿度：" + humidity.ToString() + "，当前温度：" + temp);
}
//LogUtil.info(currTempStr);
//double currMaxHumidity = HumitureServer.GetMaxHumidity(Config.GetTempAddrList());
double currMaxHumidity = param.Humidity;
float startBlowHumidity = Max_Humidity - StartBlowValue;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!