Skip to content

李娜 / SO908-XLRStore

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

料串bug修图

1 个父辈 e3b7e559
内嵌 并排
正在显示 3 个修改的文件 包含 23 行增加 和 21 行删除
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
...@@ -820,7 +820,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -820,7 +820,7 @@ namespace OnlineStore.DeviceLibrary
} }
private bool isFastLoad = true; private bool isFastLoad = true;
private bool UpdateShelf(int state = 0, string xnRfid = "") public bool UpdateShelf(int state = 0, string xnRfid = "")
{ {
try try
{ {
...@@ -836,6 +836,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -836,6 +836,7 @@ namespace OnlineStore.DeviceLibrary
if (state.Equals(0)) if (state.Equals(0))
{ {
CurrShelf = new ShelfInfo(); CurrShelf = new ShelfInfo();
AgvClient.SetStatus(Config.AgvName);
} }
else else
{ {
......
source/XLRStoreClient/inputForm/FrmBatchMove.Designer.cs
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
this.batchAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl(); this.batchAxisP1 = new OnlineStore.XLRStore.useControl.AxisPointControl();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.panBase = new System.Windows.Forms.Panel(); this.panBase = new System.Windows.Forms.Panel();
this.btnResetShelf = new System.Windows.Forms.Button();
this.chbDebug = new System.Windows.Forms.CheckBox(); this.chbDebug = new System.Windows.Forms.CheckBox();
this.btnScanTest = new System.Windows.Forms.Button(); this.btnScanTest = new System.Windows.Forms.Button();
this.lblAgvInfo = new System.Windows.Forms.Label(); this.lblAgvInfo = new System.Windows.Forms.Label();
...@@ -44,7 +45,6 @@ ...@@ -44,7 +45,6 @@
this.lblWarnMsg = new System.Windows.Forms.Label(); this.lblWarnMsg = new System.Windows.Forms.Label();
this.btnReset = new System.Windows.Forms.Button(); this.btnReset = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.XLRStore.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.XLRStore.AxisMoveControl();
this.btnResetShelf = new System.Windows.Forms.Button();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -273,6 +273,7 @@ ...@@ -273,6 +273,7 @@
// panBase // panBase
// //
this.panBase.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panBase.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panBase.Controls.Add(this.lblWarnMsg);
this.panBase.Controls.Add(this.btnResetShelf); this.panBase.Controls.Add(this.btnResetShelf);
this.panBase.Controls.Add(this.chbDebug); this.panBase.Controls.Add(this.chbDebug);
this.panBase.Controls.Add(this.btnScanTest); this.panBase.Controls.Add(this.btnScanTest);
...@@ -280,13 +281,26 @@ ...@@ -280,13 +281,26 @@
this.panBase.Controls.Add(this.btnShelfOut); this.panBase.Controls.Add(this.btnShelfOut);
this.panBase.Controls.Add(this.chbAutoOut); this.panBase.Controls.Add(this.chbAutoOut);
this.panBase.Controls.Add(this.lblCurrInfo); this.panBase.Controls.Add(this.lblCurrInfo);
this.panBase.Controls.Add(this.lblWarnMsg);
this.panBase.Controls.Add(this.btnReset); this.panBase.Controls.Add(this.btnReset);
this.panBase.Location = new System.Drawing.Point(4, 4); this.panBase.Location = new System.Drawing.Point(4, 4);
this.panBase.Name = "panBase"; this.panBase.Name = "panBase";
this.panBase.Size = new System.Drawing.Size(940, 122); this.panBase.Size = new System.Drawing.Size(940, 122);
this.panBase.TabIndex = 260; this.panBase.TabIndex = 260;
// //
// btnResetShelf
//
this.btnResetShelf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnResetShelf.BackColor = System.Drawing.Color.White;
this.btnResetShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetShelf.Location = new System.Drawing.Point(686, 78);
this.btnResetShelf.Name = "btnResetShelf";
this.btnResetShelf.Size = new System.Drawing.Size(120, 40);
this.btnResetShelf.TabIndex = 326;
this.btnResetShelf.Text = "重置料串";
this.btnResetShelf.UseVisualStyleBackColor = false;
this.btnResetShelf.Click += new System.EventHandler(this.btnResetShelf_Click);
//
// chbDebug // chbDebug
// //
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
...@@ -318,7 +332,7 @@ ...@@ -318,7 +332,7 @@
this.lblAgvInfo.AutoSize = true; this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(5, 81); this.lblAgvInfo.Location = new System.Drawing.Point(5, 62);
this.lblAgvInfo.Name = "lblAgvInfo"; this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17); this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 282; this.lblAgvInfo.TabIndex = 282;
...@@ -372,9 +386,9 @@ ...@@ -372,9 +386,9 @@
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblWarnMsg.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblWarnMsg.Location = new System.Drawing.Point(3, 53); this.lblWarnMsg.Location = new System.Drawing.Point(114, 53);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(930, 23); this.lblWarnMsg.Size = new System.Drawing.Size(819, 23);
this.lblWarnMsg.TabIndex = 246; this.lblWarnMsg.TabIndex = 246;
this.lblWarnMsg.Text = "等待启动"; this.lblWarnMsg.Text = "等待启动";
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -400,20 +414,6 @@ ...@@ -400,20 +414,6 @@
this.axisMoveControl1.Size = new System.Drawing.Size(490, 398); this.axisMoveControl1.Size = new System.Drawing.Size(490, 398);
this.axisMoveControl1.TabIndex = 219; this.axisMoveControl1.TabIndex = 219;
// //
// btnResetShelf
//
this.btnResetShelf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnResetShelf.BackColor = System.Drawing.Color.White;
this.btnResetShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetShelf.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetShelf.Location = new System.Drawing.Point(686, 78);
this.btnResetShelf.Name = "btnResetShelf";
this.btnResetShelf.Size = new System.Drawing.Size(120, 40);
this.btnResetShelf.TabIndex = 326;
this.btnResetShelf.Text = "重置料串";
this.btnResetShelf.UseVisualStyleBackColor = false;
this.btnResetShelf.Click += new System.EventHandler(this.btnResetShelf_Click);
//
// FrmBatchMove // FrmBatchMove
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......
source/XLRStoreClient/inputForm/FrmBatchMove.cs
...@@ -53,6 +53,7 @@ namespace OnlineStore.XLRStore ...@@ -53,6 +53,7 @@ namespace OnlineStore.XLRStore
} }
text += "\r\n" + moveBean.MoveInfo.MoveType + "_" + moveBean.MoveInfo.MoveStep; text += "\r\n" + moveBean.MoveInfo.MoveType + "_" + moveBean.MoveInfo.MoveStep;
text += "\r\n" + moveBean.CurrShelf?.ToStr();
lblAgvInfo.Text = text; lblAgvInfo.Text = text;
} }
catch (Exception ex) catch (Exception ex)
...@@ -287,7 +288,7 @@ namespace OnlineStore.XLRStore ...@@ -287,7 +288,7 @@ namespace OnlineStore.XLRStore
private void btnResetShelf_Click(object sender, EventArgs e) private void btnResetShelf_Click(object sender, EventArgs e)
{ {
moveBean.UpdateShelf();
moveBean.Reset(true); moveBean.Reset(true);
LogUtil.info(moveBean.Name + "点击：" + btnResetShelf.Text); LogUtil.info(moveBean.Name + "点击：" + btnResetShelf.Text);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!