Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 2b367d0c 由 刘韬
选项

Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

2 个父辈 77997491 b3f3ddfc
内嵌 并排
正在显示 4 个修改的文件 包含 28 行增加 和 22 行删除
source/DeviceLibrary/storeBean/boxBean/BoxEquip_ConnectServerTimer.cs
......@@ -62,7 +62,7 @@ namespace OnlineStore.DeviceLibrary
lastConTime = DateTime.Now;
try
{
humBean.HumidityProcess(this);
// humBean.HumidityProcess(this);
if (IsDebug)
{
......
source/DeviceLibrary/storeBean/boxBean/BoxEquip_Partial.cs
......@@ -774,6 +774,7 @@ namespace OnlineStore.DeviceLibrary
this.deviceStatus = deviceStatus;
this.runStatus = runStatus;
LogUtil.info($"设置料仓状态：【{lastPosId}】【{lastBarcode}】【{deviceStatus}】【{runStatus}】");
}
private void PullAxisToP1(string InOutType = "入库")
{
......
source/XLRStoreClient/boxForm/FrmBoxEquip.Designer.cs
......@@ -113,7 +113,7 @@
this.txtDOIndex.Location = new System.Drawing.Point(493, 25);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(40, 23);
this.txtDOIndex.Size = new System.Drawing.Size(40, 27);
this.txtDOIndex.TabIndex = 276;
this.txtDOIndex.Text = "0";
this.txtDOIndex.Visible = false;
......@@ -125,7 +125,7 @@
this.txtDoName.Location = new System.Drawing.Point(467, 25);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(27, 23);
this.txtDoName.Size = new System.Drawing.Size(27, 27);
this.txtDoName.TabIndex = 275;
this.txtDoName.Text = "0";
this.txtDoName.Visible = false;
......@@ -137,7 +137,7 @@
this.lblAddr.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAddr.Location = new System.Drawing.Point(286, 28);
this.lblAddr.Name = "lblAddr";
this.lblAddr.Size = new System.Drawing.Size(35, 17);
this.lblAddr.Size = new System.Drawing.Size(43, 20);
this.lblAddr.TabIndex = 274;
this.lblAddr.Text = "设备:";
this.lblAddr.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -174,7 +174,7 @@
this.txtWriteTime.Location = new System.Drawing.Point(84, 69);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(58, 23);
this.txtWriteTime.Size = new System.Drawing.Size(58, 27);
this.txtWriteTime.TabIndex = 271;
this.txtWriteTime.Text = "0";
//
......@@ -185,7 +185,7 @@
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(18, 72);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.Size = new System.Drawing.Size(74, 20);
this.label5.TabIndex = 270;
this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -196,7 +196,7 @@
this.txtSlaveId.Location = new System.Drawing.Point(544, 29);
this.txtSlaveId.MaxLength = 10;
this.txtSlaveId.Name = "txtSlaveId";
this.txtSlaveId.Size = new System.Drawing.Size(12, 23);
this.txtSlaveId.Size = new System.Drawing.Size(12, 27);
this.txtSlaveId.TabIndex = 255;
this.txtSlaveId.Text = "0";
this.txtSlaveId.Visible = false;
......@@ -316,9 +316,9 @@
this.tabPage3.Controls.Add(this.groupBox5);
this.tabPage3.Controls.Add(this.groupBox2);
this.tabPage3.Controls.Add(this.groupBox6);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(985, 521);
this.tabPage3.Size = new System.Drawing.Size(985, 518);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 设备状态 ";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -329,7 +329,7 @@
this.groupBox5.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBox5.Location = new System.Drawing.Point(578, 176);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(407, 345);
this.groupBox5.Size = new System.Drawing.Size(407, 342);
this.groupBox5.TabIndex = 280;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "B面相机";
......@@ -338,9 +338,9 @@
//
this.pictureBox2.BackColor = System.Drawing.Color.DarkGray;
this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox2.Location = new System.Drawing.Point(3, 19);
this.pictureBox2.Location = new System.Drawing.Point(3, 23);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(401, 323);
this.pictureBox2.Size = new System.Drawing.Size(401, 316);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 1;
this.pictureBox2.TabStop = false;
......@@ -351,7 +351,7 @@
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Left;
this.groupBox2.Location = new System.Drawing.Point(0, 176);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(407, 345);
this.groupBox2.Size = new System.Drawing.Size(407, 342);
this.groupBox2.TabIndex = 279;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "A面相机";
......@@ -360,9 +360,9 @@
//
this.pictureBox1.BackColor = System.Drawing.Color.DarkGray;
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Location = new System.Drawing.Point(3, 19);
this.pictureBox1.Location = new System.Drawing.Point(3, 23);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(401, 323);
this.pictureBox1.Size = new System.Drawing.Size(401, 316);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
......@@ -399,7 +399,7 @@
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(5, 44);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.Size = new System.Drawing.Size(84, 20);
this.lblMoveInfo.TabIndex = 280;
this.lblMoveInfo.Text = "运动信息：";
//
......@@ -421,10 +421,10 @@
this.tabPage1.Controls.Add(this.groupDO);
this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(985, 521);
this.tabPage1.Size = new System.Drawing.Size(985, 518);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -479,7 +479,7 @@
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(597, 14);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.Size = new System.Drawing.Size(104, 28);
this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
......@@ -503,7 +503,7 @@
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(496, 14);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.Size = new System.Drawing.Size(104, 28);
this.chbDebug.TabIndex = 247;
this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true;
......@@ -517,7 +517,7 @@
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(701, 15);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.Size = new System.Drawing.Size(82, 24);
this.lblStoreStatus.TabIndex = 245;
this.lblStoreStatus.Text = "等待启动";
this.lblStoreStatus.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -550,7 +550,7 @@
//
// FrmBoxEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1004, 611);
this.Controls.Add(this.panBase);
......
source/XLRStoreClient/boxForm/FrmBoxEquip.cs
......@@ -553,6 +553,11 @@ namespace OnlineStore.XLRStore
{
}
private void chbDebug_CheckedChanged_2(object sender, EventArgs e)
{
}
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!