Skip to content

李娜 / SO664-HCSingleStore

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

自动跑位功能添加，未测试

1 个父辈 561a9965
内嵌 并排
正在显示 4 个修改的文件 包含 72 行增加 和 63 行删除
_system~.ini 0 → 100644
文件属性发生变化
source/DeviceLibrary/acSingleStore/BoxBean_Partial.cs
...@@ -567,7 +567,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -567,7 +567,7 @@ namespace OnlineStore.DeviceLibrary
{ {
startOutStoreTime = DateTime.Now; startOutStoreTime = DateTime.Now;
string posId = param != null ? param.PosInfo.PosId : ""; string posId = param != null ? param.PosInfo.PosId : "";
if (storeRunStatus == StoreRunStatus.Runing) if (storeRunStatus == StoreRunStatus.Runing)
{ {
if (!LoadParamPosition(param)) if (!LoadParamPosition(param))
{ {
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(299, 20); this.chbDebug.Location = new System.Drawing.Point(299, 20);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(114, 31); this.chbDebug.Size = new System.Drawing.Size(93, 25);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -261,9 +261,9 @@ ...@@ -261,9 +261,9 @@
this.tabPage2.Controls.Add(this.btnStoreStop); this.tabPage2.Controls.Add(this.btnStoreStop);
this.tabPage2.Controls.Add(this.chbDebug); this.tabPage2.Controls.Add(this.chbDebug);
this.tabPage2.Controls.Add(this.lblWarnMsg); this.tabPage2.Controls.Add(this.lblWarnMsg);
this.tabPage2.Location = new System.Drawing.Point(4, 32); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1091, 604); this.tabPage2.Size = new System.Drawing.Size(1091, 607);
this.tabPage2.TabIndex = 3; this.tabPage2.TabIndex = 3;
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
this.lblMoveStr.ForeColor = System.Drawing.Color.Black; this.lblMoveStr.ForeColor = System.Drawing.Color.Black;
this.lblMoveStr.Location = new System.Drawing.Point(834, 76); this.lblMoveStr.Location = new System.Drawing.Point(834, 76);
this.lblMoveStr.Name = "lblMoveStr"; this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(69, 20); this.lblMoveStr.Size = new System.Drawing.Size(56, 17);
this.lblMoveStr.TabIndex = 277; this.lblMoveStr.TabIndex = 277;
this.lblMoveStr.Text = "等待启动"; this.lblMoveStr.Text = "等待启动";
this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
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(11, 431); this.groupBox1.Location = new System.Drawing.Point(11, 428);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
this.txt4Target.Location = new System.Drawing.Point(377, 103); this.txt4Target.Location = new System.Drawing.Point(377, 103);
this.txt4Target.Name = "txt4Target"; this.txt4Target.Name = "txt4Target";
this.txt4Target.ReadOnly = true; this.txt4Target.ReadOnly = true;
this.txt4Target.Size = new System.Drawing.Size(84, 27); this.txt4Target.Size = new System.Drawing.Size(84, 23);
this.txt4Target.TabIndex = 270; this.txt4Target.TabIndex = 270;
// //
// lblTargetP4 // lblTargetP4
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
this.lblTargetP4.Location = new System.Drawing.Point(377, 75); this.lblTargetP4.Location = new System.Drawing.Point(377, 75);
this.lblTargetP4.Name = "lblTargetP4"; this.lblTargetP4.Name = "lblTargetP4";
this.lblTargetP4.ReadOnly = true; this.lblTargetP4.ReadOnly = true;
this.lblTargetP4.Size = new System.Drawing.Size(84, 27); this.lblTargetP4.Size = new System.Drawing.Size(84, 23);
this.lblTargetP4.TabIndex = 269; this.lblTargetP4.TabIndex = 269;
// //
// lblActual4 // lblActual4
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
this.lblActual4.Location = new System.Drawing.Point(377, 47); this.lblActual4.Location = new System.Drawing.Point(377, 47);
this.lblActual4.Name = "lblActual4"; this.lblActual4.Name = "lblActual4";
this.lblActual4.ReadOnly = true; this.lblActual4.ReadOnly = true;
this.lblActual4.Size = new System.Drawing.Size(84, 27); this.lblActual4.Size = new System.Drawing.Size(84, 23);
this.lblActual4.TabIndex = 268; this.lblActual4.TabIndex = 268;
// //
// label7 // label7
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label7.Location = new System.Drawing.Point(384, 20); this.label7.Location = new System.Drawing.Point(384, 20);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(88, 20); this.label7.Size = new System.Drawing.Size(71, 17);
this.label7.TabIndex = 267; this.label7.TabIndex = 267;
this.label7.Text = "轴四:压紧轴"; this.label7.Text = "轴四:压紧轴";
// //
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
this.txtMiddleTarget.Location = new System.Drawing.Point(105, 104); this.txtMiddleTarget.Location = new System.Drawing.Point(105, 104);
this.txtMiddleTarget.Name = "txtMiddleTarget"; this.txtMiddleTarget.Name = "txtMiddleTarget";
this.txtMiddleTarget.ReadOnly = true; this.txtMiddleTarget.ReadOnly = true;
this.txtMiddleTarget.Size = new System.Drawing.Size(84, 27); this.txtMiddleTarget.Size = new System.Drawing.Size(84, 23);
this.txtMiddleTarget.TabIndex = 262; this.txtMiddleTarget.TabIndex = 262;
// //
// txtInoutTarget // txtInoutTarget
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
this.txtInoutTarget.Location = new System.Drawing.Point(287, 104); this.txtInoutTarget.Location = new System.Drawing.Point(287, 104);
this.txtInoutTarget.Name = "txtInoutTarget"; this.txtInoutTarget.Name = "txtInoutTarget";
this.txtInoutTarget.ReadOnly = true; this.txtInoutTarget.ReadOnly = true;
this.txtInoutTarget.Size = new System.Drawing.Size(84, 27); this.txtInoutTarget.Size = new System.Drawing.Size(84, 23);
this.txtInoutTarget.TabIndex = 260; this.txtInoutTarget.TabIndex = 260;
// //
// txtUpdownTarget // txtUpdownTarget
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
this.txtUpdownTarget.Location = new System.Drawing.Point(195, 104); this.txtUpdownTarget.Location = new System.Drawing.Point(195, 104);
this.txtUpdownTarget.Name = "txtUpdownTarget"; this.txtUpdownTarget.Name = "txtUpdownTarget";
this.txtUpdownTarget.ReadOnly = true; this.txtUpdownTarget.ReadOnly = true;
this.txtUpdownTarget.Size = new System.Drawing.Size(84, 27); this.txtUpdownTarget.Size = new System.Drawing.Size(84, 23);
this.txtUpdownTarget.TabIndex = 259; this.txtUpdownTarget.TabIndex = 259;
// //
// label12 // label12
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(17, 106); this.label12.Location = new System.Drawing.Point(17, 106);
this.label12.Name = "label12"; this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(103, 20); this.label12.Size = new System.Drawing.Size(83, 17);
this.label12.TabIndex = 258; this.label12.TabIndex = 258;
this.label12.Text = "出入库目标值:"; this.label12.Text = "出入库目标值:";
// //
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
this.lblTargetP1.Location = new System.Drawing.Point(105, 76); this.lblTargetP1.Location = new System.Drawing.Point(105, 76);
this.lblTargetP1.Name = "lblTargetP1"; this.lblTargetP1.Name = "lblTargetP1";
this.lblTargetP1.ReadOnly = true; this.lblTargetP1.ReadOnly = true;
this.lblTargetP1.Size = new System.Drawing.Size(84, 27); this.lblTargetP1.Size = new System.Drawing.Size(84, 23);
this.lblTargetP1.TabIndex = 257; this.lblTargetP1.TabIndex = 257;
// //
// lblActual1 // lblActual1
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
this.lblActual1.Location = new System.Drawing.Point(105, 48); this.lblActual1.Location = new System.Drawing.Point(105, 48);
this.lblActual1.Name = "lblActual1"; this.lblActual1.Name = "lblActual1";
this.lblActual1.ReadOnly = true; this.lblActual1.ReadOnly = true;
this.lblActual1.Size = new System.Drawing.Size(84, 27); this.lblActual1.Size = new System.Drawing.Size(84, 23);
this.lblActual1.TabIndex = 256; this.lblActual1.TabIndex = 256;
// //
// lblTargetP3 // lblTargetP3
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
this.lblTargetP3.Location = new System.Drawing.Point(287, 76); this.lblTargetP3.Location = new System.Drawing.Point(287, 76);
this.lblTargetP3.Name = "lblTargetP3"; this.lblTargetP3.Name = "lblTargetP3";
this.lblTargetP3.ReadOnly = true; this.lblTargetP3.ReadOnly = true;
this.lblTargetP3.Size = new System.Drawing.Size(84, 27); this.lblTargetP3.Size = new System.Drawing.Size(84, 23);
this.lblTargetP3.TabIndex = 178; this.lblTargetP3.TabIndex = 178;
// //
// lblActual3 // lblActual3
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
this.lblActual3.Location = new System.Drawing.Point(287, 48); this.lblActual3.Location = new System.Drawing.Point(287, 48);
this.lblActual3.Name = "lblActual3"; this.lblActual3.Name = "lblActual3";
this.lblActual3.ReadOnly = true; this.lblActual3.ReadOnly = true;
this.lblActual3.Size = new System.Drawing.Size(84, 27); this.lblActual3.Size = new System.Drawing.Size(84, 23);
this.lblActual3.TabIndex = 177; this.lblActual3.TabIndex = 177;
// //
// lblTargetP2 // lblTargetP2
...@@ -415,7 +415,7 @@ ...@@ -415,7 +415,7 @@
this.lblTargetP2.Location = new System.Drawing.Point(195, 76); this.lblTargetP2.Location = new System.Drawing.Point(195, 76);
this.lblTargetP2.Name = "lblTargetP2"; this.lblTargetP2.Name = "lblTargetP2";
this.lblTargetP2.ReadOnly = true; this.lblTargetP2.ReadOnly = true;
this.lblTargetP2.Size = new System.Drawing.Size(84, 27); this.lblTargetP2.Size = new System.Drawing.Size(84, 23);
this.lblTargetP2.TabIndex = 176; this.lblTargetP2.TabIndex = 176;
// //
// lblActual2 // lblActual2
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
this.lblActual2.Location = new System.Drawing.Point(195, 48); this.lblActual2.Location = new System.Drawing.Point(195, 48);
this.lblActual2.Name = "lblActual2"; this.lblActual2.Name = "lblActual2";
this.lblActual2.ReadOnly = true; this.lblActual2.ReadOnly = true;
this.lblActual2.Size = new System.Drawing.Size(84, 27); this.lblActual2.Size = new System.Drawing.Size(84, 23);
this.lblActual2.TabIndex = 175; this.lblActual2.TabIndex = 175;
// //
// label4 // label4
...@@ -432,7 +432,7 @@ ...@@ -432,7 +432,7 @@
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(294, 20); this.label4.Location = new System.Drawing.Point(294, 20);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(88, 20); this.label4.Size = new System.Drawing.Size(71, 17);
this.label4.TabIndex = 100; this.label4.TabIndex = 100;
this.label4.Text = "轴三:进出轴"; this.label4.Text = "轴三:进出轴";
// //
...@@ -442,7 +442,7 @@ ...@@ -442,7 +442,7 @@
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(202, 20); this.label3.Location = new System.Drawing.Point(202, 20);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(88, 20); this.label3.Size = new System.Drawing.Size(71, 17);
this.label3.TabIndex = 99; this.label3.TabIndex = 99;
this.label3.Text = "轴二:上下轴"; this.label3.Text = "轴二:上下轴";
// //
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(112, 20); this.label1.Location = new System.Drawing.Point(112, 20);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(88, 20); this.label1.Size = new System.Drawing.Size(71, 17);
this.label1.TabIndex = 97; this.label1.TabIndex = 97;
this.label1.Text = "轴一:旋转轴"; this.label1.Text = "轴一:旋转轴";
// //
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label43.Location = new System.Drawing.Point(29, 49); this.label43.Location = new System.Drawing.Point(29, 49);
this.label43.Name = "label43"; this.label43.Name = "label43";
this.label43.Size = new System.Drawing.Size(73, 20); this.label43.Size = new System.Drawing.Size(59, 17);
this.label43.TabIndex = 23; this.label43.TabIndex = 23;
this.label43.Text = "实际位置:"; this.label43.Text = "实际位置:";
// //
...@@ -472,7 +472,7 @@ ...@@ -472,7 +472,7 @@
this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label42.Location = new System.Drawing.Point(29, 76); this.label42.Location = new System.Drawing.Point(29, 76);
this.label42.Name = "label42"; this.label42.Name = "label42";
this.label42.Size = new System.Drawing.Size(73, 20); this.label42.Size = new System.Drawing.Size(59, 17);
this.label42.TabIndex = 24; this.label42.TabIndex = 24;
this.label42.Text = "规划位置:"; this.label42.Text = "规划位置:";
// //
...@@ -482,7 +482,7 @@ ...@@ -482,7 +482,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 347); this.groupBox2.Location = new System.Drawing.Point(11, 344);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
this.lblTemp.ForeColor = System.Drawing.Color.Black; this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(420, 22); this.lblTemp.Location = new System.Drawing.Point(420, 22);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(204, 24); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 275; this.lblTemp.TabIndex = 275;
this.lblTemp.Text = "当前温度--，当前湿度--"; this.lblTemp.Text = "当前温度--，当前湿度--";
// //
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green; this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(19, 109); this.lblMoveEquipInfo.Location = new System.Drawing.Point(19, 109);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo"; this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(133, 20); this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17);
this.lblMoveEquipInfo.TabIndex = 274; this.lblMoveEquipInfo.TabIndex = 274;
this.lblMoveEquipInfo.Text = "移栽状态:不可出库"; this.lblMoveEquipInfo.Text = "移栽状态:不可出库";
// //
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(19, 76); this.lblThisSta.Location = new System.Drawing.Point(19, 76);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(69, 20); this.lblThisSta.Size = new System.Drawing.Size(56, 17);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -590,9 +590,9 @@ ...@@ -590,9 +590,9 @@
this.tabPage3.Controls.Add(this.btnAxisOn); this.tabPage3.Controls.Add(this.btnAxisOn);
this.tabPage3.Controls.Add(this.btnAxisOff); this.tabPage3.Controls.Add(this.btnAxisOff);
this.tabPage3.Controls.Add(this.btnAxisP); this.tabPage3.Controls.Add(this.btnAxisP);
this.tabPage3.Location = new System.Drawing.Point(4, 32); this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3"; this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(1091, 604); this.tabPage3.Size = new System.Drawing.Size(1091, 607);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位操作/伺服调试 "; this.tabPage3.Text = " 库位操作/伺服调试 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(5, 6); this.groupInout.Location = new System.Drawing.Point(5, 6);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(508, 567); this.groupInout.Size = new System.Drawing.Size(508, 564);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -706,7 +706,7 @@ ...@@ -706,7 +706,7 @@
this.lblAutoMsg.ForeColor = System.Drawing.Color.Green; this.lblAutoMsg.ForeColor = System.Drawing.Color.Green;
this.lblAutoMsg.Location = new System.Drawing.Point(120, 76); this.lblAutoMsg.Location = new System.Drawing.Point(120, 76);
this.lblAutoMsg.Name = "lblAutoMsg"; this.lblAutoMsg.Name = "lblAutoMsg";
this.lblAutoMsg.Size = new System.Drawing.Size(172, 24); this.lblAutoMsg.Size = new System.Drawing.Size(135, 20);
this.lblAutoMsg.TabIndex = 223; this.lblAutoMsg.TabIndex = 223;
this.lblAutoMsg.Text = "没有开启自动出入库"; this.lblAutoMsg.Text = "没有开启自动出入库";
// //
...@@ -729,7 +729,7 @@ ...@@ -729,7 +729,7 @@
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(11, 78); this.label9.Location = new System.Drawing.Point(11, 78);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(73, 20); this.label9.Size = new System.Drawing.Size(59, 17);
this.label9.TabIndex = 220; this.label9.TabIndex = 220;
this.label9.Text = "间隔仓位:"; this.label9.Text = "间隔仓位:";
// //
...@@ -763,7 +763,7 @@ ...@@ -763,7 +763,7 @@
// //
this.txtJiange.Location = new System.Drawing.Point(76, 73); this.txtJiange.Location = new System.Drawing.Point(76, 73);
this.txtJiange.Name = "txtJiange"; this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(40, 31); this.txtJiange.Size = new System.Drawing.Size(40, 26);
this.txtJiange.TabIndex = 221; this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "0"; this.txtJiange.Text = "0";
// //
...@@ -778,7 +778,7 @@ ...@@ -778,7 +778,7 @@
this.txtComP1.MaxLength = 20; this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1"; this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP1.Size = new System.Drawing.Size(89, 27); this.txtComP1.Size = new System.Drawing.Size(89, 23);
this.txtComP1.TabIndex = 214; this.txtComP1.TabIndex = 214;
this.txtComP1.Text = "-12388"; this.txtComP1.Text = "-12388";
// //
...@@ -793,7 +793,7 @@ ...@@ -793,7 +793,7 @@
this.txtInOutP2.MaxLength = 20; this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2"; this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(89, 27); this.txtInOutP2.Size = new System.Drawing.Size(89, 23);
this.txtInOutP2.TabIndex = 212; this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-17000"; this.txtInOutP2.Text = "-17000";
// //
...@@ -808,7 +808,7 @@ ...@@ -808,7 +808,7 @@
this.txtInOutP1.MaxLength = 20; this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1"; this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(89, 27); this.txtInOutP1.Size = new System.Drawing.Size(89, 23);
this.txtInOutP1.TabIndex = 210; this.txtInOutP1.TabIndex = 210;
this.txtInOutP1.Text = "3000"; this.txtInOutP1.Text = "3000";
// //
...@@ -823,7 +823,7 @@ ...@@ -823,7 +823,7 @@
this.txtMiddleP1.MaxLength = 20; this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1"; this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP1.Size = new System.Drawing.Size(89, 27); this.txtMiddleP1.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP1.TabIndex = 208; this.txtMiddleP1.TabIndex = 208;
this.txtMiddleP1.Text = "-52388"; this.txtMiddleP1.Text = "-52388";
// //
...@@ -851,7 +851,7 @@ ...@@ -851,7 +851,7 @@
this.txtUpDownP7.MaxLength = 20; this.txtUpDownP7.MaxLength = 20;
this.txtUpDownP7.Name = "txtUpDownP7"; this.txtUpDownP7.Name = "txtUpDownP7";
this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP7.Size = new System.Drawing.Size(89, 27); this.txtUpDownP7.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP7.TabIndex = 204; this.txtUpDownP7.TabIndex = 204;
this.txtUpDownP7.Text = "-836025"; this.txtUpDownP7.Text = "-836025";
// //
...@@ -866,7 +866,7 @@ ...@@ -866,7 +866,7 @@
this.txtUpDownP8.MaxLength = 20; this.txtUpDownP8.MaxLength = 20;
this.txtUpDownP8.Name = "txtUpDownP8"; this.txtUpDownP8.Name = "txtUpDownP8";
this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP8.Size = new System.Drawing.Size(89, 27); this.txtUpDownP8.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP8.TabIndex = 206; this.txtUpDownP8.TabIndex = 206;
this.txtUpDownP8.Text = "-816491"; this.txtUpDownP8.Text = "-816491";
// //
...@@ -881,7 +881,7 @@ ...@@ -881,7 +881,7 @@
this.txtUpDownP1.MaxLength = 20; this.txtUpDownP1.MaxLength = 20;
this.txtUpDownP1.Name = "txtUpDownP1"; this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP1.Size = new System.Drawing.Size(89, 27); this.txtUpDownP1.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP1.TabIndex = 200; this.txtUpDownP1.TabIndex = 200;
this.txtUpDownP1.Text = "-816491"; this.txtUpDownP1.Text = "-816491";
// //
...@@ -896,7 +896,7 @@ ...@@ -896,7 +896,7 @@
this.txtUpDownP2.MaxLength = 20; this.txtUpDownP2.MaxLength = 20;
this.txtUpDownP2.Name = "txtUpDownP2"; this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP2.Size = new System.Drawing.Size(89, 27); this.txtUpDownP2.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP2.TabIndex = 202; this.txtUpDownP2.TabIndex = 202;
this.txtUpDownP2.Text = "-836025"; this.txtUpDownP2.Text = "-836025";
// //
...@@ -911,7 +911,7 @@ ...@@ -911,7 +911,7 @@
this.txtComP3.MaxLength = 20; this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3.Size = new System.Drawing.Size(89, 27); this.txtComP3.Size = new System.Drawing.Size(89, 23);
this.txtComP3.TabIndex = 198; this.txtComP3.TabIndex = 198;
this.txtComP3.Text = "-12388"; this.txtComP3.Text = "-12388";
// //
...@@ -926,7 +926,7 @@ ...@@ -926,7 +926,7 @@
this.txtComP2.MaxLength = 20; this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP2.Size = new System.Drawing.Size(89, 27); this.txtComP2.Size = new System.Drawing.Size(89, 23);
this.txtComP2.TabIndex = 196; this.txtComP2.TabIndex = 196;
this.txtComP2.Text = "-12388"; this.txtComP2.Text = "-12388";
// //
...@@ -941,7 +941,7 @@ ...@@ -941,7 +941,7 @@
this.txtInOutP3.MaxLength = 20; this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3"; this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(89, 27); this.txtInOutP3.Size = new System.Drawing.Size(89, 23);
this.txtInOutP3.TabIndex = 194; this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-12388"; this.txtInOutP3.Text = "-12388";
// //
...@@ -956,7 +956,7 @@ ...@@ -956,7 +956,7 @@
this.txtMiddleP2.MaxLength = 20; this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(89, 27); this.txtMiddleP2.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP2.TabIndex = 192; this.txtMiddleP2.TabIndex = 192;
this.txtMiddleP2.Text = "-12388"; this.txtMiddleP2.Text = "-12388";
// //
...@@ -971,7 +971,7 @@ ...@@ -971,7 +971,7 @@
this.txtUpDownP5.MaxLength = 20; this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5"; this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP5.Size = new System.Drawing.Size(89, 27); this.txtUpDownP5.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP5.TabIndex = 188; this.txtUpDownP5.TabIndex = 188;
this.txtUpDownP5.Text = "-16388"; this.txtUpDownP5.Text = "-16388";
// //
...@@ -986,7 +986,7 @@ ...@@ -986,7 +986,7 @@
this.txtUpDownP6.MaxLength = 20; this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6"; this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP6.Size = new System.Drawing.Size(89, 27); this.txtUpDownP6.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP6.TabIndex = 190; this.txtUpDownP6.TabIndex = 190;
this.txtUpDownP6.Text = "-12388"; this.txtUpDownP6.Text = "-12388";
// //
...@@ -997,7 +997,7 @@ ...@@ -997,7 +997,7 @@
this.cmbPosition.FormattingEnabled = true; this.cmbPosition.FormattingEnabled = true;
this.cmbPosition.Location = new System.Drawing.Point(7, 23); this.cmbPosition.Location = new System.Drawing.Point(7, 23);
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(268, 31); this.cmbPosition.Size = new System.Drawing.Size(268, 28);
this.cmbPosition.TabIndex = 174; this.cmbPosition.TabIndex = 174;
this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged); this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
// //
...@@ -1012,7 +1012,7 @@ ...@@ -1012,7 +1012,7 @@
this.txtUpDownP3.MaxLength = 20; this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3"; this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP3.Size = new System.Drawing.Size(89, 27); this.txtUpDownP3.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP3.TabIndex = 162; this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "-16388"; this.txtUpDownP3.Text = "-16388";
// //
...@@ -1053,7 +1053,7 @@ ...@@ -1053,7 +1053,7 @@
this.txtUpDownP4.MaxLength = 20; this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4"; this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP4.Size = new System.Drawing.Size(89, 27); this.txtUpDownP4.Size = new System.Drawing.Size(89, 23);
this.txtUpDownP4.TabIndex = 166; this.txtUpDownP4.TabIndex = 166;
this.txtUpDownP4.Text = "-12388"; this.txtUpDownP4.Text = "-12388";
// //
...@@ -1427,7 +1427,7 @@ ...@@ -1427,7 +1427,7 @@
this.txtDOIndex.Location = new System.Drawing.Point(266, 55); this.txtDOIndex.Location = new System.Drawing.Point(266, 55);
this.txtDOIndex.MaxLength = 10; this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex"; this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(46, 31); this.txtDOIndex.Size = new System.Drawing.Size(46, 26);
this.txtDOIndex.TabIndex = 242; this.txtDOIndex.TabIndex = 242;
this.txtDOIndex.Text = "0"; this.txtDOIndex.Text = "0";
// //
...@@ -1437,7 +1437,7 @@ ...@@ -1437,7 +1437,7 @@
this.txtDoName.Location = new System.Drawing.Point(66, 56); this.txtDoName.Location = new System.Drawing.Point(66, 56);
this.txtDoName.MaxLength = 10; this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName"; this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(141, 31); this.txtDoName.Size = new System.Drawing.Size(141, 26);
this.txtDoName.TabIndex = 241; this.txtDoName.TabIndex = 241;
this.txtDoName.Text = "0"; this.txtDoName.Text = "0";
// //
...@@ -1460,7 +1460,7 @@ ...@@ -1460,7 +1460,7 @@
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(19, 61); this.label17.Location = new System.Drawing.Point(19, 61);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(43, 20); this.label17.Size = new System.Drawing.Size(35, 17);
this.label17.TabIndex = 240; this.label17.TabIndex = 240;
this.label17.Text = "设备:"; this.label17.Text = "设备:";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1484,7 +1484,7 @@ ...@@ -1484,7 +1484,7 @@
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(219, 61); this.label14.Location = new System.Drawing.Point(219, 61);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(43, 20); this.label14.Size = new System.Drawing.Size(35, 17);
this.label14.TabIndex = 239; this.label14.TabIndex = 239;
this.label14.Text = "地址:"; this.label14.Text = "地址:";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1495,7 +1495,7 @@ ...@@ -1495,7 +1495,7 @@
this.txtWriteTime.Location = new System.Drawing.Point(70, 92); this.txtWriteTime.Location = new System.Drawing.Point(70, 92);
this.txtWriteTime.MaxLength = 10; this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime"; this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(50, 31); this.txtWriteTime.Size = new System.Drawing.Size(50, 26);
this.txtWriteTime.TabIndex = 238; this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0"; this.txtWriteTime.Text = "0";
// //
...@@ -1506,7 +1506,7 @@ ...@@ -1506,7 +1506,7 @@
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(6, 97); this.label5.Location = new System.Drawing.Point(6, 97);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(74, 20); this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237; this.label5.TabIndex = 237;
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -1519,7 +1519,7 @@ ...@@ -1519,7 +1519,7 @@
this.cmbWriteIO.FormattingEnabled = true; this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.Location = new System.Drawing.Point(14, 22); this.cmbWriteIO.Location = new System.Drawing.Point(14, 22);
this.cmbWriteIO.Name = "cmbWriteIO"; this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(298, 31); this.cmbWriteIO.Size = new System.Drawing.Size(298, 28);
this.cmbWriteIO.TabIndex = 234; this.cmbWriteIO.TabIndex = 234;
this.cmbWriteIO.ValueMember = "ProName"; this.cmbWriteIO.ValueMember = "ProName";
this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged); this.cmbWriteIO.SelectedIndexChanged += new System.EventHandler(this.cmbWriteIO_SelectedIndexChanged);
......
source/HCSingleStore/FrmInOutStore.cs
...@@ -102,7 +102,7 @@ namespace OnlineStore.ACSingleStore ...@@ -102,7 +102,7 @@ namespace OnlineStore.ACSingleStore
private bool IsInit = false; private bool IsInit = false;
private BoxBean store = null; private BoxBean store = null;
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public static readonly ILog LOGGER = LogManager.GetLogger("InOutStore");
MoveToStartPosStep moveToStartPosStep; MoveToStartPosStep moveToStartPosStep;
IniPositionStep iniPositionStep; IniPositionStep iniPositionStep;
...@@ -146,10 +146,19 @@ namespace OnlineStore.ACSingleStore ...@@ -146,10 +146,19 @@ namespace OnlineStore.ACSingleStore
/// <param name="e"></param> /// <param name="e"></param>
private void btnStoreStart_Click(object sender, EventArgs e) private void btnStoreStart_Click(object sender, EventArgs e)
{ {
store.StartRun(); if (store.storeRunStatus >= StoreRunStatus.Wait)
if (store.storeRunStatus >= StoreRunStatus.HomeMoving) {
LogUtil.info(store.Name + "点击：启用调试");
store.StartRun();
if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
{
StoreOpenStatus(true);
}
}
else
{ {
StoreOpenStatus(true); LogUtil.info(store.Name + "点击：复位");
this.store.Reset();
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!