Skip to content

李娜 / SO827-OutletEquip

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

界面显示调整。NG料根据料盘高度自动匹配压紧前点

1 个父辈 a9f1c42d
内嵌 并排
正在显示 5 个修改的文件 包含 51 行增加 和 23 行删除
source/Common/util/LogUtil.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.Common ...@@ -19,7 +19,7 @@ namespace OnlineStore.Common
public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>(); public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>();
public static System.Windows.Forms.RichTextBox logBox = null; public static System.Windows.Forms.RichTextBox logBox = null;
public static int showCount = 20; public static int showCount = 10;
public static bool debug_opened = false; public static bool debug_opened = false;
......
source/DeviceLibrary/bean/EquipBean.cs
...@@ -996,7 +996,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -996,7 +996,9 @@ namespace OnlineStore.DeviceLibrary
} }
public string GetMoveStr() public string GetMoveStr()
{ {
string msg = LineConnect.DoorPosInfo?.ToStr() + "\r\n" + "料架信息：" + CurrTray?.ToStr()+"\r\n"; string msg = LineConnect.DoorPosInfo?.ToStr() + "\r\n";
msg += CurrTray == null ? "" : "料架信息：" + CurrTray?.ToStr() + "\r\n";
foreach (WorkStation shelf in StationMap.Values) foreach (WorkStation shelf in StationMap.Values)
{ {
......
source/DeviceLibrary/bean/EquipBean_Partial.cs
...@@ -36,10 +36,36 @@ namespace OnlineStore.DeviceLibrary ...@@ -36,10 +36,36 @@ namespace OnlineStore.DeviceLibrary
{ {
LineMoveP p = new LineMoveP(); LineMoveP p = new LineMoveP();
if (param.PosInfo.IsNg && param.PosInfo.ShelfPosId.Equals("")) if (param.PosInfo.IsNg && param.PosInfo.ShelfPosId.Equals(""))
{ {
param.PosInfo.ShelfPosId = PositionNumList[0]; //判断料盘尺寸
if (param.PosInfo.PlateW.Equals(7))
{
List<ShelfPosition> positionList = CSVPositionReader<ShelfPosition>.getPositionList();
List<ShelfPosition> list = (from m in positionList where m.BagWidth.Equals(7) select m).ToList();
if (list.Count > 0)
{
param.PosInfo.ShelfPosId = list[0].PositionNum;
}
else
{
param.PosInfo.ShelfPosId = PositionNumList[0];
}
}
else
{
List<ShelfPosition> positionList = CSVPositionReader<ShelfPosition>.getPositionList();
List<ShelfPosition> list = (from m in positionList where m.BagWidth>(7) select m).ToList();
if (list.Count > 0)
{
param.PosInfo.ShelfPosId = list[0].PositionNum;
}
else
{
param.PosInfo.ShelfPosId = PositionNumList[0];
}
}
//param.PosInfo.ShelfPosId = PositionNumList[0];
} }
ShelfPosition position = param.GetACPosition(); ShelfPosition position = param.GetACPosition();
......
source/DeviceLibrary/bean/WorkStation.cs
...@@ -792,7 +792,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -792,7 +792,7 @@ namespace OnlineStore.DeviceLibrary
} }
public string ToStr() public string ToStr()
{ {
string result = "料架[" + RealShelf + "][" + XNShelf + "]"; string result = "料架：[" + RealShelf + "_" + XNShelf + "]";
if (TaskInfo != null && TaskInfo.IsValid()) if (TaskInfo != null && TaskInfo.IsValid())
{ {
result += "[空位：大料=" + TaskInfo.bigEmpty + "，小料=" + TaskInfo.smallEmpty + "]"; result += "[空位：大料=" + TaskInfo.bigEmpty + "，小料=" + TaskInfo.smallEmpty + "]";
......
source/HCSingleStore/FrmEquip.Designer.cs
...@@ -168,10 +168,10 @@ ...@@ -168,10 +168,10 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Location = new System.Drawing.Point(4, 47); this.tabControl1.Location = new System.Drawing.Point(4, 37);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(996, 627); this.tabControl1.Size = new System.Drawing.Size(996, 639);
this.tabControl1.TabIndex = 272; this.tabControl1.TabIndex = 272;
// //
// tabPage2 // tabPage2
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
this.tabPage2.Controls.Add(this.chbDebug); this.tabPage2.Controls.Add(this.chbDebug);
this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(988, 594); this.tabPage2.Size = new System.Drawing.Size(988, 606);
this.tabPage2.TabIndex = 3; this.tabPage2.TabIndex = 3;
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -204,9 +204,9 @@ ...@@ -204,9 +204,9 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 9F, 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.Location = new System.Drawing.Point(7, 171); this.lblWarnMsg.Location = new System.Drawing.Point(7, 231);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(713, 60); this.lblWarnMsg.Size = new System.Drawing.Size(975, 60);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
this.checkBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox3.AutoSize = true; this.checkBox3.AutoSize = true;
this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox3.Location = new System.Drawing.Point(886, 147); this.checkBox3.Location = new System.Drawing.Point(886, 154);
this.checkBox3.Name = "checkBox3"; this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(89, 21); this.checkBox3.Size = new System.Drawing.Size(89, 21);
this.checkBox3.TabIndex = 286; this.checkBox3.TabIndex = 286;
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
this.checkBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox2.AutoSize = true; this.checkBox2.AutoSize = true;
this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox2.Location = new System.Drawing.Point(886, 113); this.checkBox2.Location = new System.Drawing.Point(886, 120);
this.checkBox2.Name = "checkBox2"; this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(89, 21); this.checkBox2.Size = new System.Drawing.Size(89, 21);
this.checkBox2.TabIndex = 285; this.checkBox2.TabIndex = 285;
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.checkBox1.AutoSize = true; this.checkBox1.AutoSize = true;
this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.checkBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.checkBox1.Location = new System.Drawing.Point(886, 79); this.checkBox1.Location = new System.Drawing.Point(886, 86);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(89, 21); this.checkBox1.Size = new System.Drawing.Size(89, 21);
this.checkBox1.TabIndex = 284; this.checkBox1.TabIndex = 284;
...@@ -266,11 +266,11 @@ ...@@ -266,11 +266,11 @@
// //
this.lblMoveEquipInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblMoveEquipInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblMoveEquipInfo.AutoSize = true; this.lblMoveEquipInfo.AutoSize = true;
this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveEquipInfo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green; this.lblMoveEquipInfo.ForeColor = System.Drawing.Color.Green;
this.lblMoveEquipInfo.Location = new System.Drawing.Point(834, 11); this.lblMoveEquipInfo.Location = new System.Drawing.Point(723, 11);
this.lblMoveEquipInfo.Name = "lblMoveEquipInfo"; this.lblMoveEquipInfo.Name = "lblMoveEquipInfo";
this.lblMoveEquipInfo.Size = new System.Drawing.Size(107, 17); this.lblMoveEquipInfo.Size = new System.Drawing.Size(143, 22);
this.lblMoveEquipInfo.TabIndex = 283; this.lblMoveEquipInfo.TabIndex = 283;
this.lblMoveEquipInfo.Text = "移栽状态:不可出库"; this.lblMoveEquipInfo.Text = "移栽状态:不可出库";
// //
...@@ -336,9 +336,9 @@ ...@@ -336,9 +336,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(4, 236); this.logBox.Location = new System.Drawing.Point(4, 297);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(978, 340); this.logBox.Size = new System.Drawing.Size(978, 301);
this.logBox.TabIndex = 278; this.logBox.TabIndex = 278;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -346,11 +346,11 @@ ...@@ -346,11 +346,11 @@
// lblMoveStr // lblMoveStr
// //
this.lblMoveStr.AutoSize = true; this.lblMoveStr.AutoSize = true;
this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveStr.ForeColor = System.Drawing.Color.Black; this.lblMoveStr.ForeColor = System.Drawing.Color.Black;
this.lblMoveStr.Location = new System.Drawing.Point(8, 37); this.lblMoveStr.Location = new System.Drawing.Point(8, 37);
this.lblMoveStr.Name = "lblMoveStr"; this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(56, 17); this.lblMoveStr.Size = new System.Drawing.Size(74, 21);
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;
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,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(6, 436); this.groupBox2.Location = new System.Drawing.Point(6, 442);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(972, 78); this.groupBox2.Size = new System.Drawing.Size(972, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
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)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(886, 42); this.chbDebug.Location = new System.Drawing.Point(886, 49);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
this.tabPage3.Controls.Add(this.btnAxisOff); this.tabPage3.Controls.Add(this.btnAxisOff);
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(988, 597); this.tabPage3.Size = new System.Drawing.Size(988, 602);
this.tabPage3.TabIndex = 2; this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 库位调试 "; this.tabPage3.Text = " 库位调试 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!