Skip to content

顾剑亮 / AGVControl-Qisda-ProductionLine

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

1

1 个父辈 5340dbb9
内嵌 并排
正在显示 12 个修改的文件 包含 30 行增加 和 36 行删除
AGVControl-ProductionLine/BLL/Common.cs
...@@ -856,13 +856,13 @@ namespace AGVControl ...@@ -856,13 +856,13 @@ namespace AGVControl
{ {
if (clientNode.Name.Equals(SettingString.C4FeederOut) || clientNode.Name.Equals(SettingString.D4FeederOut)) if (clientNode.Name.Equals(SettingString.C4FeederOut) || clientNode.Name.Equals(SettingString.D4FeederOut))
{ {
warnMsg = string.Format("[{1}]最外侧是料架[{0}]，但没有解绑信息，请检查接驳台", clientNode.RFID, clientNode.Name); warnMsg = string.Format("外侧料架[{0}]未解绑,已解绑料架:{1}", clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
Common.log.Debug(warnMsg); Common.log.Debug(warnMsg);
} }
else else
{ {
string res = AGVManager.GetRFIDs(clientNode.Name); string res = AGVManager.GetRFIDs(clientNode.Name);
warnMsg = string.Format("[{1}]最外侧是料架[{0}]，但没有解绑信息，请检查接驳台：料架由里到外顺序：{2}", clientNode.RFID, clientNode.Name,res); warnMsg = string.Format("外侧料架[{0}]未解绑,已解绑料架:{1}", clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
Common.log.Debug(warnMsg); Common.log.Debug(warnMsg);
} }
return false; return false;
...@@ -884,13 +884,13 @@ namespace AGVControl ...@@ -884,13 +884,13 @@ namespace AGVControl
{ {
if (clientNode.Name.Equals(SettingString.C4FeederOut) || clientNode.Name.Equals(SettingString.D4FeederOut)) if (clientNode.Name.Equals(SettingString.C4FeederOut) || clientNode.Name.Equals(SettingString.D4FeederOut))
{ {
clientNode.WarnMsg = string.Format("接驳台最外侧料架[{0}]没有解绑信息，请检查接驳台状况", clientNode.RFID); // 外侧料架[D34]未解绑,已解绑料架:Dxx,Dxx,Dxx
clientNode.WarnMsg = string.Format("外侧料架[{0}]未解绑,已解绑料架:{1}", clientNode.RFID,string.Join(",",Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
return false; return false;
} }
else else
{ {
string res = AGVManager.GetRFIDs(clientNode.Name); clientNode.WarnMsg = string.Format("外侧料架[{0}]未解绑,已解绑料架:{1}", clientNode.RFID, string.Join(",", Common.missionManager.GetUnlockRfids(clientNode.Name).ToArray()));
clientNode.WarnMsg = string.Format("接驳台最外侧料架[{0}]没有解绑信息，当前料架由里到外顺序：{1}", clientNode.RFID, res);
return false; return false;
} }
} }
......
AGVControl-ProductionLine/FrmMain.Designer.cs
...@@ -75,7 +75,9 @@ ...@@ -75,7 +75,9 @@
this.lblCharge3 = new System.Windows.Forms.Label(); this.lblCharge3 = new System.Windows.Forms.Label();
this.TxtLog = new System.Windows.Forms.TextBox(); this.TxtLog = new System.Windows.Forms.TextBox();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.label12 = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.agvRemoveRfid = new System.Windows.Forms.Button();
this.btnClearStationRFID = new System.Windows.Forms.Button(); this.btnClearStationRFID = new System.Windows.Forms.Button();
this.label11 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label();
this.txtBoxLineName = new System.Windows.Forms.TextBox(); this.txtBoxLineName = new System.Windows.Forms.TextBox();
...@@ -106,9 +108,6 @@ ...@@ -106,9 +108,6 @@
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.agvRemoveRfid = new System.Windows.Forms.Button();
this.label12 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.DgvAgv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvAgv)).BeginInit();
this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
...@@ -698,6 +697,17 @@ ...@@ -698,6 +697,17 @@
this.tabPage3.Text = "手动"; this.tabPage3.Text = "手动";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
// //
// label12
//
this.label12.AutoSize = true;
this.label12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.label12.Location = new System.Drawing.Point(302, 224);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(407, 60);
this.label12.TabIndex = 46;
this.label12.Text = "说明：\r\n1、获取接驳台RFID:获取指定产线上的料架RFID信息\r\n2、物料状态上报：上报料车的产线信息\r\n3、清除接驳台RFID：清理指定产线的RFID信息\r" +
"\n4、清理料架的缓存信息：输入RFID，清除RFID的缓存信息，使料架可以复用\r\n";
//
// groupBox4 // groupBox4
// //
this.groupBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.groupBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
...@@ -717,6 +727,17 @@ ...@@ -717,6 +727,17 @@
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "操作"; this.groupBox4.Text = "操作";
// //
// agvRemoveRfid
//
this.agvRemoveRfid.Location = new System.Drawing.Point(147, 142);
this.agvRemoveRfid.Margin = new System.Windows.Forms.Padding(2);
this.agvRemoveRfid.Name = "agvRemoveRfid";
this.agvRemoveRfid.Size = new System.Drawing.Size(125, 35);
this.agvRemoveRfid.TabIndex = 47;
this.agvRemoveRfid.Text = "清理料架的缓存信息";
this.agvRemoveRfid.UseVisualStyleBackColor = true;
this.agvRemoveRfid.Click += new System.EventHandler(this.agvRemoveRfid_Click);
//
// btnClearStationRFID // btnClearStationRFID
// //
this.btnClearStationRFID.Location = new System.Drawing.Point(8, 142); this.btnClearStationRFID.Location = new System.Drawing.Point(8, 142);
...@@ -1059,28 +1080,6 @@ ...@@ -1059,28 +1080,6 @@
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "label1"; this.label1.Text = "label1";
// //
// agvRemoveRfid
//
this.agvRemoveRfid.Location = new System.Drawing.Point(147, 142);
this.agvRemoveRfid.Margin = new System.Windows.Forms.Padding(2);
this.agvRemoveRfid.Name = "agvRemoveRfid";
this.agvRemoveRfid.Size = new System.Drawing.Size(125, 35);
this.agvRemoveRfid.TabIndex = 47;
this.agvRemoveRfid.Text = "清理料架的缓存信息";
this.agvRemoveRfid.UseVisualStyleBackColor = true;
this.agvRemoveRfid.Click += new System.EventHandler(this.agvRemoveRfid_Click);
//
// label12
//
this.label12.AutoSize = true;
this.label12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.label12.Location = new System.Drawing.Point(302, 224);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(407, 60);
this.label12.TabIndex = 46;
this.label12.Text = "说明：\r\n1、获取接驳台RFID:获取指定产线上的料架RFID信息\r\n2、物料状态上报：上报料车的产线信息\r\n3、清除接驳台RFID：清理指定产线的RFID信息\r" +
"\n4、清理料架的缓存信息：输入RFID，清除RFID的缓存信息，使料架可以复用\r\n";
//
// FrmMain // FrmMain
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -1204,7 +1203,6 @@ ...@@ -1204,7 +1203,6 @@
private System.Windows.Forms.DataGridView dgvUnlockDetail; private System.Windows.Forms.DataGridView dgvUnlockDetail;
private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.Button btnGetStationRfid; private System.Windows.Forms.Button btnGetStationRfid;
private System.ComponentModel.BackgroundWorker backgroundWorker1;
private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label11;
private System.Windows.Forms.Button btnClearStationRFID; private System.Windows.Forms.Button btnClearStationRFID;
private System.Windows.Forms.Button agvRemoveRfid; private System.Windows.Forms.Button agvRemoveRfid;
......
AGVControl-ProductionLine/FrmMain.resx
...@@ -174,9 +174,6 @@ ...@@ -174,9 +174,6 @@
<metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
AGVControl-ProductionLine/bean/job/GoEmptyShelfLineJob.cs
...@@ -410,7 +410,7 @@ namespace AGVControl ...@@ -410,7 +410,7 @@ namespace AGVControl
return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf); return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf);
else if (agv.RFID.StartsWith("D")) else if (agv.RFID.StartsWith("D"))
return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.SmallShelf); return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.SmallShelf);
}
else if (agv.RFID.StartsWith("C")) else if (agv.RFID.StartsWith("C"))
{ {
return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf); return new EmptyShelfBackJob(EmptyShelfPlace, eShelfType.BigShelf);
......
AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt
...@@ -71,4 +71,3 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi ...@@ -71,4 +71,3 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
C:\myproject\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache C:\myproject\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!