Skip to content

孙克 / RC30-AutoInOutStore

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

增加单盘入库部分代码

1 个父辈 ba7860dd
内嵌 并排
正在显示 10 个修改的文件 包含 367 行增加 和 168 行删除
source/ACSingleStore/App.config
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<add key ="UseAIOBOX" value ="1"/> <add key ="UseAIOBOX" value ="1"/>
<add key ="DIMS" value ="40"/> <add key ="DIMS" value ="40"/>
<add key="DOMS" value="200"/> <add key="DOMS" value="200"/>
<add key="SinglePosId" value="1#AC2_2_1_1" />
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -30,12 +30,15 @@ ...@@ -30,12 +30,15 @@
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.groupAuto = new System.Windows.Forms.GroupBox(); this.groupAuto = new System.Windows.Forms.GroupBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.cmbJianGe = new System.Windows.Forms.ComboBox(); this.cmbJianGe = new System.Windows.Forms.ComboBox();
this.label30 = new System.Windows.Forms.Label(); this.label30 = new System.Windows.Forms.Label();
this.btnBatchOutTest = new System.Windows.Forms.Button();
this.btnStart = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.cmbPosition = new System.Windows.Forms.ComboBox(); this.cmbPosition = new System.Windows.Forms.ComboBox();
this.label21 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label();
this.btnOutStore = new System.Windows.Forms.Button();
this.groupBox6 = new System.Windows.Forms.GroupBox(); this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblBatchMsg = new System.Windows.Forms.Label(); this.lblBatchMsg = new System.Windows.Forms.Label();
this.btnOpenDoor = new System.Windows.Forms.Button(); this.btnOpenDoor = new System.Windows.Forms.Button();
...@@ -131,10 +134,14 @@ ...@@ -131,10 +134,14 @@
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblAxisStatus = new System.Windows.Forms.Label(); this.lblAxisStatus = new System.Windows.Forms.Label();
this.button3 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button();
this.axis_5_Alarm = new UserFromControl.IOStatusControl();
this.txtBatchTarget = new System.Windows.Forms.TextBox(); this.txtBatchTarget = new System.Windows.Forms.TextBox();
this.lblCountPulse5 = new System.Windows.Forms.TextBox(); this.lblCountPulse5 = new System.Windows.Forms.TextBox();
this.lblOutPulse5 = new System.Windows.Forms.TextBox(); this.lblOutPulse5 = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.label38 = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox(); this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox(); this.txtInoutTarget = new System.Windows.Forms.TextBox();
...@@ -173,7 +180,6 @@ ...@@ -173,7 +180,6 @@
this.txtInoutP4 = new System.Windows.Forms.TextBox(); this.txtInoutP4 = new System.Windows.Forms.TextBox();
this.btnInOutP4 = new System.Windows.Forms.Button(); this.btnInOutP4 = new System.Windows.Forms.Button();
this.txtUpdownP8 = new System.Windows.Forms.TextBox(); this.txtUpdownP8 = new System.Windows.Forms.TextBox();
this.btnBatchOutTest = new System.Windows.Forms.Button();
this.btnUpdownP8 = new System.Windows.Forms.Button(); this.btnUpdownP8 = new System.Windows.Forms.Button();
this.txtUpdownP2 = new System.Windows.Forms.TextBox(); this.txtUpdownP2 = new System.Windows.Forms.TextBox();
this.btnUpdownP2 = new System.Windows.Forms.Button(); this.btnUpdownP2 = new System.Windows.Forms.Button();
...@@ -192,7 +198,6 @@ ...@@ -192,7 +198,6 @@
this.txtUpDownP5 = new System.Windows.Forms.TextBox(); this.txtUpDownP5 = new System.Windows.Forms.TextBox();
this.txtUpDownP6 = new System.Windows.Forms.TextBox(); this.txtUpDownP6 = new System.Windows.Forms.TextBox();
this.txtUpDownP3 = new System.Windows.Forms.TextBox(); this.txtUpDownP3 = new System.Windows.Forms.TextBox();
this.btnOutStore = new System.Windows.Forms.Button();
this.txtUpDownP4 = new System.Windows.Forms.TextBox(); this.txtUpDownP4 = new System.Windows.Forms.TextBox();
this.btnComP1 = new System.Windows.Forms.Button(); this.btnComP1 = new System.Windows.Forms.Button();
this.btnInOutP2 = new System.Windows.Forms.Button(); this.btnInOutP2 = new System.Windows.Forms.Button();
...@@ -254,11 +259,9 @@ ...@@ -254,11 +259,9 @@
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.axis_5_Alarm = new UserFromControl.IOStatusControl(); this.btnTrayIn = new System.Windows.Forms.Button();
this.axis_1_Alarm = new UserFromControl.IOStatusControl(); this.btnTrayOk = new System.Windows.Forms.Button();
this.axis_3_Alarm = new UserFromControl.IOStatusControl(); this.lblTray = new System.Windows.Forms.Label();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.groupAuto.SuspendLayout(); this.groupAuto.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
...@@ -328,6 +331,17 @@ ...@@ -328,6 +331,17 @@
this.groupAuto.TabStop = false; this.groupAuto.TabStop = false;
this.groupAuto.Text = "自动出入库"; this.groupAuto.Text = "自动出入库";
// //
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(18, 129);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(98, 24);
this.checkBox1.TabIndex = 283;
this.checkBox1.Text = "手动出入库";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// btnSave // btnSave
// //
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -374,6 +388,17 @@ ...@@ -374,6 +388,17 @@
this.label30.Text = "自动出入口间隔:"; this.label30.Text = "自动出入口间隔:";
this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnBatchOutTest
//
this.btnBatchOutTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchOutTest.Location = new System.Drawing.Point(387, 68);
this.btnBatchOutTest.Name = "btnBatchOutTest";
this.btnBatchOutTest.Size = new System.Drawing.Size(157, 38);
this.btnBatchOutTest.TabIndex = 228;
this.btnBatchOutTest.Text = "批量出库测试";
this.btnBatchOutTest.UseVisualStyleBackColor = true;
this.btnBatchOutTest.Click += new System.EventHandler(this.btnBatchOutTest_Click);
//
// btnStart // btnStart
// //
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -412,10 +437,24 @@ ...@@ -412,10 +437,24 @@
this.label21.Text = "选择仓位:"; this.label21.Text = "选择仓位:";
this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnOutStore
//
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(387, 115);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(157, 38);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "单盘出库测试";
this.btnOutStore.UseVisualStyleBackColor = true;
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
//
// groupBox6 // groupBox6
// //
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.lblTray);
this.groupBox6.Controls.Add(this.btnTrayIn);
this.groupBox6.Controls.Add(this.btnTrayOk);
this.groupBox6.Controls.Add(this.lblBatchMsg); this.groupBox6.Controls.Add(this.lblBatchMsg);
this.groupBox6.Controls.Add(this.btnOpenDoor); this.groupBox6.Controls.Add(this.btnOpenDoor);
this.groupBox6.Controls.Add(this.lblWaitTragGo); this.groupBox6.Controls.Add(this.lblWaitTragGo);
...@@ -429,7 +468,7 @@ ...@@ -429,7 +468,7 @@
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(589, 32); this.groupBox6.Location = new System.Drawing.Point(589, 32);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(663, 190); this.groupBox6.Size = new System.Drawing.Size(663, 219);
this.groupBox6.TabIndex = 302; this.groupBox6.TabIndex = 302;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "批量上下料操作"; this.groupBox6.Text = "批量上下料操作";
...@@ -447,7 +486,7 @@ ...@@ -447,7 +486,7 @@
// btnOpenDoor // btnOpenDoor
// //
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(11, 140); this.btnOpenDoor.Location = new System.Drawing.Point(11, 134);
this.btnOpenDoor.Name = "btnOpenDoor"; this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(155, 38); this.btnOpenDoor.Size = new System.Drawing.Size(155, 38);
this.btnOpenDoor.TabIndex = 232; this.btnOpenDoor.TabIndex = 232;
...@@ -460,7 +499,7 @@ ...@@ -460,7 +499,7 @@
this.lblWaitTragGo.AutoSize = true; this.lblWaitTragGo.AutoSize = true;
this.lblWaitTragGo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWaitTragGo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWaitTragGo.ForeColor = System.Drawing.Color.Red; this.lblWaitTragGo.ForeColor = System.Drawing.Color.Red;
this.lblWaitTragGo.Location = new System.Drawing.Point(192, 102); this.lblWaitTragGo.Location = new System.Drawing.Point(193, 99);
this.lblWaitTragGo.Name = "lblWaitTragGo"; this.lblWaitTragGo.Name = "lblWaitTragGo";
this.lblWaitTragGo.Size = new System.Drawing.Size(250, 22); this.lblWaitTragGo.Size = new System.Drawing.Size(250, 22);
this.lblWaitTragGo.TabIndex = 231; this.lblWaitTragGo.TabIndex = 231;
...@@ -469,7 +508,7 @@ ...@@ -469,7 +508,7 @@
// btnWaitTrgGo // btnWaitTrgGo
// //
this.btnWaitTrgGo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnWaitTrgGo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWaitTrgGo.Location = new System.Drawing.Point(11, 95); this.btnWaitTrgGo.Location = new System.Drawing.Point(11, 92);
this.btnWaitTrgGo.Name = "btnWaitTrgGo"; this.btnWaitTrgGo.Name = "btnWaitTrgGo";
this.btnWaitTrgGo.Size = new System.Drawing.Size(155, 38); this.btnWaitTrgGo.Size = new System.Drawing.Size(155, 38);
this.btnWaitTrgGo.TabIndex = 230; this.btnWaitTrgGo.TabIndex = 230;
...@@ -491,7 +530,7 @@ ...@@ -491,7 +530,7 @@
// btnCloseDoor // btnCloseDoor
// //
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(487, 140); this.btnCloseDoor.Location = new System.Drawing.Point(487, 134);
this.btnCloseDoor.Name = "btnCloseDoor"; this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(155, 38); this.btnCloseDoor.Size = new System.Drawing.Size(155, 38);
this.btnCloseDoor.TabIndex = 226; this.btnCloseDoor.TabIndex = 226;
...@@ -502,7 +541,7 @@ ...@@ -502,7 +541,7 @@
// btnGetOutTray // btnGetOutTray
// //
this.btnGetOutTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnGetOutTray.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGetOutTray.Location = new System.Drawing.Point(328, 140); this.btnGetOutTray.Location = new System.Drawing.Point(328, 134);
this.btnGetOutTray.Name = "btnGetOutTray"; this.btnGetOutTray.Name = "btnGetOutTray";
this.btnGetOutTray.Size = new System.Drawing.Size(155, 38); this.btnGetOutTray.Size = new System.Drawing.Size(155, 38);
this.btnGetOutTray.TabIndex = 225; this.btnGetOutTray.TabIndex = 225;
...@@ -524,7 +563,7 @@ ...@@ -524,7 +563,7 @@
// btnBatchInStore // btnBatchInStore
// //
this.btnBatchInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBatchInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchInStore.Location = new System.Drawing.Point(170, 140); this.btnBatchInStore.Location = new System.Drawing.Point(170, 134);
this.btnBatchInStore.Name = "btnBatchInStore"; this.btnBatchInStore.Name = "btnBatchInStore";
this.btnBatchInStore.Size = new System.Drawing.Size(155, 38); this.btnBatchInStore.Size = new System.Drawing.Size(155, 38);
this.btnBatchInStore.TabIndex = 103; this.btnBatchInStore.TabIndex = 103;
...@@ -536,7 +575,7 @@ ...@@ -536,7 +575,7 @@
// //
this.lblOutInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblOutInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOutInfo.ForeColor = System.Drawing.Color.Green; this.lblOutInfo.ForeColor = System.Drawing.Color.Green;
this.lblOutInfo.Location = new System.Drawing.Point(22, 102); this.lblOutInfo.Location = new System.Drawing.Point(22, 99);
this.lblOutInfo.Name = "lblOutInfo"; this.lblOutInfo.Name = "lblOutInfo";
this.lblOutInfo.Size = new System.Drawing.Size(584, 22); this.lblOutInfo.Size = new System.Drawing.Size(584, 22);
this.lblOutInfo.TabIndex = 234; this.lblOutInfo.TabIndex = 234;
...@@ -553,10 +592,10 @@ ...@@ -553,10 +592,10 @@
this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.Location = new System.Drawing.Point(589, 256);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(663, 489); this.tabControl1.Size = new System.Drawing.Size(663, 461);
this.tabControl1.TabIndex = 301; this.tabControl1.TabIndex = 301;
// //
// tabPage4 // tabPage4
...@@ -566,7 +605,7 @@ ...@@ -566,7 +605,7 @@
this.tabPage4.Controls.Add(this.btnClearLog); this.tabPage4.Controls.Add(this.btnClearLog);
this.tabPage4.Location = new System.Drawing.Point(4, 26); this.tabPage4.Location = new System.Drawing.Point(4, 26);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(655, 459); this.tabPage4.Size = new System.Drawing.Size(655, 431);
this.tabPage4.TabIndex = 4; this.tabPage4.TabIndex = 4;
this.tabPage4.Text = "日志"; this.tabPage4.Text = "日志";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
...@@ -575,7 +614,7 @@ ...@@ -575,7 +614,7 @@
// //
this.btnClearBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnClearBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClearBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearBuzzer.Location = new System.Drawing.Point(11, 418); this.btnClearBuzzer.Location = new System.Drawing.Point(11, 390);
this.btnClearBuzzer.Name = "btnClearBuzzer"; this.btnClearBuzzer.Name = "btnClearBuzzer";
this.btnClearBuzzer.Size = new System.Drawing.Size(151, 38); this.btnClearBuzzer.Size = new System.Drawing.Size(151, 38);
this.btnClearBuzzer.TabIndex = 257; this.btnClearBuzzer.TabIndex = 257;
...@@ -591,7 +630,7 @@ ...@@ -591,7 +630,7 @@
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.Location = new System.Drawing.Point(11, 5);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(634, 409); this.richTextBox1.Size = new System.Drawing.Size(634, 381);
this.richTextBox1.TabIndex = 256; this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
// //
...@@ -599,7 +638,7 @@ ...@@ -599,7 +638,7 @@
// //
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(494, 418); this.btnClearLog.Location = new System.Drawing.Point(494, 390);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(151, 38); this.btnClearLog.Size = new System.Drawing.Size(151, 38);
this.btnClearLog.TabIndex = 224; this.btnClearLog.TabIndex = 224;
...@@ -613,7 +652,7 @@ ...@@ -613,7 +652,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3); this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(655, 459); this.tabPage2.Size = new System.Drawing.Size(655, 431);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "伺服调试"; this.tabPage2.Text = "伺服调试";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -1243,7 +1282,7 @@ ...@@ -1243,7 +1282,7 @@
this.tabPage3.Controls.Add(this.groupBox1); this.tabPage3.Controls.Add(this.groupBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 26); this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(655, 459); this.tabPage3.Size = new System.Drawing.Size(655, 431);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "压紧轴调试"; this.tabPage3.Text = "压紧轴调试";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -1277,7 +1316,7 @@ ...@@ -1277,7 +1316,7 @@
this.groupComAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.Location = new System.Drawing.Point(8, 4);
this.groupComAxis.Name = "groupComAxis"; this.groupComAxis.Name = "groupComAxis";
this.groupComAxis.Size = new System.Drawing.Size(640, 194); this.groupComAxis.Size = new System.Drawing.Size(640, 184);
this.groupComAxis.TabIndex = 271; this.groupComAxis.TabIndex = 271;
this.groupComAxis.TabStop = false; this.groupComAxis.TabStop = false;
this.groupComAxis.Text = "压紧轴"; this.groupComAxis.Text = "压紧轴";
...@@ -1287,7 +1326,7 @@ ...@@ -1287,7 +1326,7 @@
this.lblComMsg.AutoSize = true; this.lblComMsg.AutoSize = true;
this.lblComMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblComMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComMsg.ForeColor = System.Drawing.Color.Green; this.lblComMsg.ForeColor = System.Drawing.Color.Green;
this.lblComMsg.Location = new System.Drawing.Point(29, 165); this.lblComMsg.Location = new System.Drawing.Point(29, 156);
this.lblComMsg.Name = "lblComMsg"; this.lblComMsg.Name = "lblComMsg";
this.lblComMsg.Size = new System.Drawing.Size(80, 17); this.lblComMsg.Size = new System.Drawing.Size(80, 17);
this.lblComMsg.TabIndex = 281; this.lblComMsg.TabIndex = 281;
...@@ -1517,9 +1556,9 @@ ...@@ -1517,9 +1556,9 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(8, 199); this.groupBox1.Location = new System.Drawing.Point(8, 189);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(640, 261); this.groupBox1.Size = new System.Drawing.Size(640, 235);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态"; this.groupBox1.Text = "伺服状态";
...@@ -1550,6 +1589,16 @@ ...@@ -1550,6 +1589,16 @@
this.button3.UseVisualStyleBackColor = true; this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click); this.button3.Click += new System.EventHandler(this.button3_Click);
// //
// axis_5_Alarm
//
this.axis_5_Alarm.IOName = "";
this.axis_5_Alarm.IOValue = 0;
this.axis_5_Alarm.isCanClick = false;
this.axis_5_Alarm.Location = new System.Drawing.Point(457, 54);
this.axis_5_Alarm.Name = "axis_5_Alarm";
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_5_Alarm.TabIndex = 271;
//
// txtBatchTarget // txtBatchTarget
// //
this.txtBatchTarget.Location = new System.Drawing.Point(434, 156); this.txtBatchTarget.Location = new System.Drawing.Point(434, 156);
...@@ -1584,6 +1633,36 @@ ...@@ -1584,6 +1633,36 @@
this.label20.Text = "批量出入料轴"; this.label20.Text = "批量出入料轴";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(155, 54);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(357, 54);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(252, 54);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// label38 // label38
// //
this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label38.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1734,7 +1813,7 @@ ...@@ -1734,7 +1813,7 @@
this.tabPage1.Controls.Add(this.btnBatchReset); this.tabPage1.Controls.Add(this.btnBatchReset);
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(655, 459); this.tabPage1.Size = new System.Drawing.Size(655, 431);
this.tabPage1.TabIndex = 3; this.tabPage1.TabIndex = 3;
this.tabPage1.Text = "温湿度调试"; this.tabPage1.Text = "温湿度调试";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -2024,17 +2103,6 @@ ...@@ -2024,17 +2103,6 @@
this.txtUpdownP8.TabIndex = 276; this.txtUpdownP8.TabIndex = 276;
this.txtUpdownP8.Text = "1000"; this.txtUpdownP8.Text = "1000";
// //
// btnBatchOutTest
//
this.btnBatchOutTest.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchOutTest.Location = new System.Drawing.Point(387, 68);
this.btnBatchOutTest.Name = "btnBatchOutTest";
this.btnBatchOutTest.Size = new System.Drawing.Size(157, 38);
this.btnBatchOutTest.TabIndex = 228;
this.btnBatchOutTest.Text = "批量出库测试";
this.btnBatchOutTest.UseVisualStyleBackColor = true;
this.btnBatchOutTest.Click += new System.EventHandler(this.btnBatchOutTest_Click);
//
// btnUpdownP8 // btnUpdownP8
// //
this.btnUpdownP8.AutoSize = true; this.btnUpdownP8.AutoSize = true;
...@@ -2307,17 +2375,6 @@ ...@@ -2307,17 +2375,6 @@
this.txtUpDownP3.TabIndex = 162; this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "1000"; this.txtUpDownP3.Text = "1000";
// //
// btnOutStore
//
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(387, 115);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(157, 38);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "单盘出库测试";
this.btnOutStore.UseVisualStyleBackColor = true;
this.btnOutStore.Click += new System.EventHandler(this.btnOutStore_Click);
//
// txtUpDownP4 // txtUpDownP4
// //
this.txtUpDownP4.AcceptsReturn = true; this.txtUpDownP4.AcceptsReturn = true;
...@@ -2886,56 +2943,40 @@ ...@@ -2886,56 +2943,40 @@
this.英文ToolStripMenuItem.Text = "英文"; this.英文ToolStripMenuItem.Text = "英文";
this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click); this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
// //
// axis_5_Alarm // btnTrayIn
// //
this.axis_5_Alarm.IOName = ""; this.btnTrayIn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.axis_5_Alarm.IOValue = 0; this.btnTrayIn.Location = new System.Drawing.Point(487, 177);
this.axis_5_Alarm.isCanClick = false; this.btnTrayIn.Name = "btnTrayIn";
this.axis_5_Alarm.Location = new System.Drawing.Point(457, 54); this.btnTrayIn.Size = new System.Drawing.Size(155, 38);
this.axis_5_Alarm.Name = "axis_5_Alarm"; this.btnTrayIn.TabIndex = 236;
this.axis_5_Alarm.Size = new System.Drawing.Size(43, 39); this.btnTrayIn.Text = "启动单盘入库";
this.axis_5_Alarm.TabIndex = 271; this.btnTrayIn.UseVisualStyleBackColor = true;
// this.btnTrayIn.Visible = false;
// axis_1_Alarm this.btnTrayIn.Click += new System.EventHandler(this.btnTrayIn_Click);
// //
this.axis_1_Alarm.IOName = ""; // btnTrayOk
this.axis_1_Alarm.IOValue = 0; //
this.axis_1_Alarm.isCanClick = false; this.btnTrayOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.axis_1_Alarm.Location = new System.Drawing.Point(155, 54); this.btnTrayOk.Location = new System.Drawing.Point(11, 176);
this.axis_1_Alarm.Name = "axis_1_Alarm"; this.btnTrayOk.Name = "btnTrayOk";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39); this.btnTrayOk.Size = new System.Drawing.Size(155, 38);
this.axis_1_Alarm.TabIndex = 264; this.btnTrayOk.TabIndex = 235;
// this.btnTrayOk.Text = "料盘已放入";
// axis_3_Alarm this.btnTrayOk.UseVisualStyleBackColor = true;
// this.btnTrayOk.Visible = false;
this.axis_3_Alarm.IOName = ""; //
this.axis_3_Alarm.IOValue = 0; // lblTray
this.axis_3_Alarm.isCanClick = false; //
this.axis_3_Alarm.Location = new System.Drawing.Point(357, 54); this.lblTray.AutoSize = true;
this.axis_3_Alarm.Name = "axis_3_Alarm"; this.lblTray.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39); this.lblTray.ForeColor = System.Drawing.Color.Red;
this.axis_3_Alarm.TabIndex = 266; this.lblTray.Location = new System.Drawing.Point(193, 183);
// this.lblTray.Name = "lblTray";
// axis_2_Alarm this.lblTray.Size = new System.Drawing.Size(250, 22);
// this.lblTray.TabIndex = 237;
this.axis_2_Alarm.IOName = ""; this.lblTray.Text = "请放入料盘，并点击左侧按钮确认";
this.axis_2_Alarm.IOValue = 0; this.lblTray.Visible = false;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(252, 54);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(18, 129);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(98, 24);
this.checkBox1.TabIndex = 283;
this.checkBox1.Text = "手动出入库";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
// //
// FrmStoreBox // FrmStoreBox
// //
...@@ -3227,6 +3268,9 @@ ...@@ -3227,6 +3268,9 @@
public System.Windows.Forms.Label label30; public System.Windows.Forms.Label label30;
private System.Windows.Forms.GroupBox groupAuto; private System.Windows.Forms.GroupBox groupAuto;
private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.Button btnTrayIn;
private System.Windows.Forms.Button btnTrayOk;
private System.Windows.Forms.Label lblTray;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -532,16 +532,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -532,16 +532,7 @@ namespace OnlineStore.AutoInOutStore
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotSingleInStore,"此设备不支持单个入库"), MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotSingleInStore,"此设备不支持单个入库"),
ResourceCulture.GetString(ResourceCulture.MsgTitle,ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示")), MessageBoxButtons.OK, MessageBoxIcon.Error); ResourceCulture.GetString(ResourceCulture.MsgTitle,ResourceCulture.GetString(ResourceCulture.MsgTitle,"提示")), MessageBoxButtons.OK, MessageBoxIcon.Error);
return; return;
if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
{
string selectPositionNum = cmbPosition.Text;
LineMoveP ktk = LoadPostion();
store.StartInStoreMove(new InOutStoreParam("", selectPositionNum, ktk), false);
}
else
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PleaseStartStore, "请先启动料仓！"));
}
} }
private LineMoveP LoadPostion() private LineMoveP LoadPostion()
...@@ -1741,21 +1732,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -1741,21 +1732,7 @@ namespace OnlineStore.AutoInOutStore
store.autoMsg = "自动出入库：" + poText; store.autoMsg = "自动出入库：" + poText;
store.autoNext = true; store.autoNext = true;
LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + ""); LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "");
btnStart.Text = StopAuto; btnStart.Text = StopAuto;
//string msg = AutomaticBaiting.doStartBatchIn();
//if (msg.Equals(""))
//{
// store.autoNext = true;
// btnStart.Text = StopAuto;
// LogUtil.info(LOGGER, store.StoreName + "开启自动出入库模式，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
//}
//else
//{
// MessageBox.Show(msg);
// store.autoNext = false;
// btnStart.Text = StartAuto;
// LogUtil.info(LOGGER, store.StoreName + "自动出入库失败【"+msg+"】，开始位置【" + poText + "】（索引=" + currIndex + "）,间隔=" + jiange + "，入库开始！");
//}
DebugStatus(false); DebugStatus(false);
} }
} }
...@@ -1774,5 +1751,22 @@ namespace OnlineStore.AutoInOutStore ...@@ -1774,5 +1751,22 @@ namespace OnlineStore.AutoInOutStore
groupInout.Enabled = checkBox1.Checked; groupInout.Enabled = checkBox1.Checked;
} }
} }
private void btnTrayIn_Click(object sender, EventArgs e)
{
string defaultPosId = ConfigAppSettings.GetValue(Setting_Init.SinglePosId).Trim();
if (store.PositionNumList.Contains(defaultPosId))
{
bool result = store.StartInStoreMove(new InOutStoreParam("", defaultPosId), false, true);
if (!result)
{
MessageBox.Show("启动单盘出库失败：" + store.CodeOrInoutMsg);
}
}
else
{
MessageBox.Show("请先正确配置 " + Setting_Init.SinglePosId);
}
}
} }
} }
source/ACSingleStore/记录.txt
...@@ -177,7 +177,17 @@ IO模块读取时间改为可配置。 ...@@ -177,7 +177,17 @@ IO模块读取时间改为可配置。
20190522
1.需要增加单盘入库功能
appconfig增加配置：
<add key="SinglePosId" value="1#AC2_2_1_1" />
StoreConfig.csv增加配置：
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
修改入库流程。
界面上增加按钮。
2.需要修改：出库时不使用极限信号，增加一个最高点配置。
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1600000,,,,,,,
......
source/Common/Setting_Init.cs
...@@ -89,5 +89,9 @@ namespace OnlineStore.Common ...@@ -89,5 +89,9 @@ namespace OnlineStore.Common
public static string Default_Language = "Default_Language"; public static string Default_Language = "Default_Language";
public static string UseAIOBOX = "UseAIOBOX"; public static string UseAIOBOX = "UseAIOBOX";
/// <summary>
/// 单盘入库默认PosID
/// </summary>
public static string SinglePosId = "SinglePosId";
} }
} }
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -152,6 +152,8 @@ PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,10000 ...@@ -152,6 +152,8 @@ PRO,(轴五)上料轴出料时距离检测信号需要下降的高度,BatchAxis_OutDownPosition,10000
PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,, PRO,(轴五)上料轴最最大料盘高度，到达后无法批量出库,BatchAxis_MaxHeight,250,,,,,,,
PRO,最后一盘料需要补充的高度,LastTrayAddHeight,4,,,,,,, PRO,最后一盘料需要补充的高度,LastTrayAddHeight,4,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,(轴二)升降轴单盘入库抬升料盘的高度,UpdownAxis_UpPosition,3000,,,,,,,
PRO,(轴五)上料轴出库上升最大高度,BatchAxis_OutMaxValue,1600000,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
PRO,IO模块对应的DI数量,IO_DILength,192.168.200.21#16;192.168.200.22#4,,,,,, , PRO,IO模块对应的DI数量,IO_DILength,192.168.200.21#16;192.168.200.22#4,,,,,, ,
PRO,模块对应的DO数量,IO_DOLength,192.168.200.21#16;192.168.200.22#4,,,,,,, PRO,模块对应的DO数量,IO_DOLength,192.168.200.21#16;192.168.200.22#4,,,,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -288,10 +288,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -288,10 +288,7 @@ namespace OnlineStore.DeviceLibrary
#region 入库 #region 入库
private Stopwatch InOutWatch = new Stopwatch(); private Stopwatch InOutWatch = new Stopwatch();
public bool StartInStoreMove(InOutStoreParam param, bool IsBatchWork)
{
return StartInStoreMove(param, IsBatchWork, true);
}
/// <summary> /// <summary>
/// 开始入库移动移动 /// 开始入库移动移动
/// </summary> /// </summary>
...@@ -299,29 +296,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -299,29 +296,26 @@ namespace OnlineStore.DeviceLibrary
/// <param name="IsBatchWork">是否批量出库</param> /// <param name="IsBatchWork">是否批量出库</param>
/// <param name="isNeedInStore">是否需要入库，不需要入库时直接等待拿走料盘</param> /// <param name="isNeedInStore">是否需要入库，不需要入库时直接等待拿走料盘</param>
/// <returns></returns> /// <returns></returns>
public bool StartInStoreMove(InOutStoreParam param, bool IsBatchWork, bool isNeedInStore) public bool StartInStoreMove(InOutStoreParam param, bool IsBatchWork=true, bool isNeedInStore=true)
{ {
InOutWatch.Restart(); InOutWatch.Restart();
string posId = param != null ? param.PositionNum : ""; string posId = param != null ? param.PositionNum : "";
string logMsg = IsBatchWork ? " 启动批量入库【" + posId + "】" : " 启动入库【" + posId + "】"; string logMsg = IsBatchWork ? " 启动批量入库【" + posId + "】" : " 启动入库【" + posId + "】";
if (!AutomaticBaiting.DoorCloseOK()) if (!AutomaticBaiting.DoorCloseOK())
{ {
UpdateInOutMsg(logMsg + "失败，门锁未关闭"); UpdateInOutMsg(logMsg + "失败，门锁未关闭");
//LogUtil.error(LOGGER, StoreName + logMsg + " 出错，门锁未关闭");
return false; return false;
} }
if (storeRunStatus == StoreRunStatus.Runing) if (storeRunStatus == StoreRunStatus.Runing)
{ {
if (!LoadParamPosition(param, false)) if (!LoadParamPosition(param, false))
{ {
UpdateInOutMsg(logMsg + "失败，找不到库位信息"); UpdateInOutMsg(logMsg + "失败，找不到库位信息");
//LogUtil.error(LOGGER, StoreName + logMsg + " 出错，找不到库位信息");
return false; return false;
} }
if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{ {
UpdateInOutMsg(logMsg + "失败，叉子料盘检测有料"); UpdateInOutMsg(logMsg + "失败，叉子料盘检测有料");
//LogUtil.error(LOGGER, StoreName + logMsg + " 出错，叉子料盘检测有料");
return false; return false;
} }
LogUtil.info(LOGGER, StoreName + logMsg); LogUtil.info(LOGGER, StoreName + logMsg);
...@@ -332,8 +326,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -332,8 +326,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.IsBatchInOutStore = IsBatchWork; StoreMove.IsBatchInOutStore = IsBatchWork;
StoreMove.IsNeedInStore = isNeedInStore; StoreMove.IsNeedInStore = isNeedInStore;
if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0)) if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
{ {
//SI_02_Move(param.MoveP);
StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown); StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown);
} }
else else
...@@ -346,8 +339,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -346,8 +339,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
UpdateInOutMsg(logMsg + "失败，当前状态：" + storeRunStatus); UpdateInOutMsg(logMsg + "失败，当前状态：" + storeRunStatus);
//LogUtil.error(LOGGER, StoreName + " 启动【" + posId + "】入库出错，当前 storeStatus=" + storeRunStatus);
return false; return false;
} }
} }
...@@ -384,7 +376,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -384,7 +376,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog("入库：SI_02_ 进出轴至P1"); InStoreLog("入库：SI_02_ 进出轴至P1");
StoreMove.NextMoveStep(StoreMoveStep.SI_02_InOutAxisHome); StoreMove.NextMoveStep(StoreMoveStep.SI_02_InOutAxisHome);
bool result = InOutBackToP1(moveP.InOut_P1); bool result = InOutBackToP1(moveP.InOut_P1);
if (!result) if (!result && StoreMove.IsBatchInOutStore.Equals(true))
{ {
SI_03_AxisToP1(moveP); SI_03_AxisToP1(moveP);
} }
...@@ -406,14 +398,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -406,14 +398,26 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
LineMoveP moveP = StoreMove.MoveParam.MoveP; LineMoveP moveP = StoreMove.MoveParam.MoveP;
if (StoreMove.MoveStep >= StoreMoveStep.SIS_31_ToDoor)
if (StoreMove.MoveStep == StoreMoveStep.SI_01_LocationCylinderDown) {
SingleInStoreProcess();
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_01_LocationCylinderDown)
{ {
SI_02_Move(moveP); SI_02_Move(moveP);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_02_InOutAxisHome) else if (StoreMove.MoveStep == StoreMoveStep.SI_02_InOutAxisHome)
{ {
SI_03_AxisToP1(moveP); if (StoreMove.IsBatchInOutStore)
{
SI_03_AxisToP1(moveP);
}else
{
InStoreLog("入库：SIS_31 单盘入库：旋转轴待机点P1，升降轴走到仓门位置P7 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_31_ToDoor);
ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door_P7, Config.UpDownAxis_P7_Speed);
}
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_03_ReturnHome) else if (StoreMove.MoveStep == StoreMoveStep.SI_03_ReturnHome)
{ {
...@@ -454,13 +458,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -454,13 +458,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_06_CompressWork) else if (StoreMove.MoveStep == StoreMoveStep.SI_06_CompressWork)
//{
// int targetPosition = moveP.UpDown_P1 - Config.UpDownAxis_DownValue;
// InStoreLog("入库：SI_061 升降轴稍微下降【"+Config.UpDownAxis_DownValue+"】，目标位置【"+targetPosition+"】 ");
// StoreMove.NextMoveStep(StoreMoveStep.SI_061_UpdownAxisDown);
// ACAxisMove(Config.UpDown_Axis, targetPosition, Config.UpDownAxis_P1_Speed);
//}
//else if (StoreMove.MoveStep == StoreMoveStep.SI_061_UpdownAxisDown)
{ {
InStoreLog("入库：SI_07 叉子返回，进出轴至P1 "); InStoreLog("入库：SI_07 叉子返回，进出轴至P1 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_07_DeviceBackFromDoor); StoreMove.NextMoveStep(StoreMoveStep.SI_07_DeviceBackFromDoor);
...@@ -604,6 +602,102 @@ namespace OnlineStore.DeviceLibrary ...@@ -604,6 +602,102 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + " 入库，moveStatus=" + StoreMove.MoveStep + "，没有对应的处理！"); LogUtil.info(LOGGER, StoreName + " 入库，moveStatus=" + StoreMove.MoveStep + "，没有对应的处理！");
} }
} }
protected void SingleInStoreProcess()
{
LineMoveP moveP = StoreMove.MoveParam.MoveP;
if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_31_ToDoor))
{
InStoreLog("入库：SIS_32 单盘入库：叉子走到门口位置P4， 打开仓门 ,压紧轴到P3");
StoreMove.NextMoveStep(StoreMoveStep.SIS_32_InoutToDoor);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P2_Speed);
ComMoveToPosition(moveP.ComPress_P3);
OpenDoorAndWait();
}else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_32_InoutToDoor))
{
InStoreLog("入库：SIS_33 等待操作人员放入料盘 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_33_WaitTray);
StoreMove.TimeOutSeconds = 120;
AutomaticBaiting.IsGetTrayGo = false;
AutomaticBaiting.IsWaitTragGo = true;
StoreMove.WaitList.Add(WaitResultInfo.WaitTakeTray());
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_33_WaitTray))
{
InStoreLog("入库：SIS_34 确认放入料盘，关闭仓门，升降轴稍微上升，压紧轴压紧 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_34_GetTray);
CloseDoorAndWait();
int updownPosition = moveP.UpDown_Door_P7 + Config.UpdownAxis_UpPosition;
ACAxisMove(Config.UpDown_Axis, updownPosition, Config.UpDownAxis_P4_Speed);
ComMoveToPosition(moveP.ComPress_P2);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_34_GetTray))
{
InStoreLog("入库：SIS_35 确认放入料盘，关闭仓门，进出轴后退到P1 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_35_InoutBack);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_35_InoutBack))
{
InStoreLog("入库：SIS_36 升降轴下降到扫码位置P2 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_36_UpdownDown);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_OutHigh_P2, Config.UpDownAxis_P2_Speed);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_36_UpdownDown))
{
InStoreLog("入库：SIS_37 轴3（ 叉子） 至P2（ 进料口取料点） ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_37_InoutToP2);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_37_InoutToP2))
{
InStoreLog("入库：SIS_38 扫码,最多等待6000 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_38_ScanCode);
StoreMove.OneWaitCanEndStep = true;
StoreMove.WaitList.Add(WaitResultInfo.WaitCodeOK());
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(6000));
GetCameraCode();
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_38_ScanCode))
{
InStoreLog("入库：SIS_39 获取入库库位号 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_39_GetPosId);
SingleInStorePosId = GetAutoPosid();
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_39_GetPosId))
{
InStoreLog("入库：SIS_40 启动新的入库 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_40_StartInStore);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_40_StartInStore))
{
InStoreLog("入库：SIS_32 开始送出料盘 ,叉子后退 ");
StoreMove.NextMoveStep(StoreMoveStep.SIS_41_StartSendTrayOut);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Position);
}
else if (StoreMove.MoveStep.Equals(StoreMoveStep.SIS_41_StartSendTrayOut))
{
StoreMove.IsNeedInStore = false;
InStoreLog("送出料盘：SI_21 ，升降轴到门口位置P7 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_21_DeviceToDoor);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_Door_P7, Config.UpDownAxis_P7_Speed);
}
}
private void GetCameraCode()
{
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
Thread.Sleep(1000);
IOManager.IOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
}
private string GetAutoPosid()
{
return ConfigAppSettings.GetValue(Setting_Init.SinglePosId);
}
string SingleInStorePosId = "";
#endregion #endregion
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -657,8 +657,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -657,8 +657,8 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
StoreMove.NextMoveStep(StoreMoveStep.AUTO_O03_SpeedMove); StoreMove.NextMoveStep(StoreMoveStep.AUTO_O03_SpeedMove);
LogUtil.info(Name + " 出料 ，轴上升到检测到出料信号，速度【" + StoreManager.Config.BatchAxis_SlowSpeed + "】"); LogUtil.info(Name + " 出料 ，轴上升到检测到出料信号，速度【" + StoreManager.Config.BatchAxis_SlowSpeed + "】,最大上升高度【"+StoreManager.Config.BatchAxis_OutMaxValue + "】");
ACAxisSpeedMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_SlowSpeed, IO_Type.OutCheck); ACAxisSpeedMove(StoreManager.Config.Batch_Axis, StoreManager.Config.BatchAxis_SlowSpeed, IO_Type.OutCheck);
} }
} }
else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O02_WaitOutSingleLow)) else if (StoreMove.MoveStep.Equals(StoreMoveStep.AUTO_O02_WaitOutSingleLow))
......
source/DeviceLibrary/store/StoreMoveStep.cs
...@@ -334,10 +334,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -334,10 +334,7 @@ namespace OnlineStore.DeviceLibrary
/// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3 /// 入库。。所有轴先回到待机点，轴2、轴1 动作到P1,，轴4动作至P3
/// </summary> /// </summary>
SI_03_ReturnHome = 203, SI_03_ReturnHome = 203,
///// <summary>
///// 入库。。压紧物品（有压紧轴的才需要此步骤），轴4（ 压紧） 至P3(压紧前点)
///// </summary>
//SI_04_CompressWare = 204,
/// <summary> /// <summary>
/// 入库。。叉子进入入料口，轴3（ 叉子） 至P2（ 进料口取料点） /// 入库。。叉子进入入料口，轴3（ 叉子） 至P2（ 进料口取料点）
/// </summary> /// </summary>
...@@ -408,15 +405,58 @@ namespace OnlineStore.DeviceLibrary ...@@ -408,15 +405,58 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
SI_24_WaitTrayGo = 224, SI_24_WaitTrayGo = 224,
///// <summary>
///// 料仓出库，，升降轴返回，， 轴2至P1（ 待机点）
///// </summary>
//SI_23_GoBack = 233,
///// <summary>
///// 等待拿走物品
///// </summary>
//SI_24_WaitTake = 234,
/// <summary>
/// 单盘入库：旋转轴待机点P1，升降轴走到仓门位置P7
/// </summary>
SIS_31_ToDoor = 301,
/// <summary>
/// 单盘入库：叉子走到门口位置P4， 打开仓门
/// </summary>
SIS_32_InoutToDoor = 302,
/// <summary>
/// 单盘入库：等待操作人员放入料盘
/// </summary>
SIS_33_WaitTray= 303,
/// <summary>
/// 单盘入库：确认放入料盘，关闭仓门，升降轴稍微上升，压紧轴压紧
/// </summary>
SIS_34_GetTray= 304,
/// <summary>
/// 单盘入库：确认放入料盘，关闭仓门，进出轴后退到P1
/// </summary>
SIS_35_InoutBack = 305,
/// <summary>
/// 单盘入库：升降轴下降到扫码位置P2
/// </summary>
SIS_36_UpdownDown = 306,
/// <summary>
/// 单盘入库：轴3（ 叉子） 至P2（ 进料口取料点）
/// </summary>
SIS_37_InoutToP2 = 307,
/// <summary>
/// 单盘入库：扫码
/// </summary>
SIS_38_ScanCode =308,
/// <summary>
/// 单盘入库：获取入库库位号
/// </summary>
SIS_39_GetPosId = 309,
/// <summary>
/// 单盘入库：启动新的入库
/// </summary>
SIS_40_StartInStore= 340,
/// <summary>
/// 单盘入库：开始送出料盘
/// </summary>
SIS_41_StartSendTrayOut= 341,
#endregion #endregion
...@@ -425,7 +465,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -425,7 +465,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 开始复位 /// 开始复位
/// </summary> /// </summary>
AUTO_R00_Start=1100, AUTO_R00_Start =1100,
/// <summary> /// <summary>
/// 关闭门锁 /// 关闭门锁
/// </summary> /// </summary>
......
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
...@@ -17,7 +17,17 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -17,7 +17,17 @@ namespace OnlineStore.LoadCSVLibrary
: base(id, cid, type, filepath) : base(id, cid, type, filepath)
{ {
} }
/// <summary>
/// PRO,(轴五) 上料轴出库上升最大高度, BatchAxis_OutMaxValue,1600000,,,,,,,
/// </summary>
[ConfigProAttribute("BatchAxis_OutMaxValue")]
public int BatchAxis_OutMaxValue { get; set; }
/// <summary>
/// PRO,(轴二) 升降轴单盘入库抬升料盘的高度, UpdownAxis_UpPosition,3000
/// </summary>
[ConfigProAttribute("UpdownAxis_UpPosition")]
public int UpdownAxis_UpPosition { get; set; }
/// <summary> /// <summary>
/// 预警温度 /// 预警温度
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!