Skip to content

李娜 / SO664-AssemblyLine

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

托盘编辑功能修改

1 个父辈 ac451fc1
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 50 行增加 和 21 行删除
source/AssemblyLineClient/FrmLineIO.cs
...@@ -36,23 +36,23 @@ namespace OnlineStore.AssemblyLine ...@@ -36,23 +36,23 @@ namespace OnlineStore.AssemblyLine
int roleindex = 0; int roleindex = 0;
this.tableLayoutPanel1.RowStyles.Clear(); this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = count; this.tableLayoutPanel1.RowCount = count;
this.tableLayoutPanel3.RowStyles.Clear(); //this.tableLayoutPanel3.RowStyles.Clear();
if (LineManager.Config.DIList.Count > count) //if (LineManager.Config.DIList.Count > count)
{ //{
this.tableLayoutPanel3.RowCount = LineManager.Config.DIList.Count - count; // this.tableLayoutPanel3.RowCount = LineManager.Config.DIList.Count - count;
} //}
else //else
{ //{
this.tableLayoutPanel3.RowCount = 0; // this.tableLayoutPanel3.RowCount = 0;
} //}
foreach (ConfigIO ioValue in LineManager.Config.DIList.Values) foreach (ConfigIO ioValue in LineManager.Config.DIList.Values)
{ {
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
if (DIControlList.Count >= count) if (DIControlList.Count >= count)
{ {
// roleindex = DIControlList.Count - count-1; // roleindex = DIControlList.Count - count-1;
this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); //this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - count); //this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - count);
} }
else else
{ {
...@@ -443,5 +443,21 @@ namespace OnlineStore.AssemblyLine ...@@ -443,5 +443,21 @@ namespace OnlineStore.AssemblyLine
LogUtil.error("勾选 " + chbTray.Text + "=" + groupTray.Enabled); LogUtil.error("勾选 " + chbTray.Text + "=" + groupTray.Enabled);
} }
} }
private void btnClear_Click(object sender, EventArgs e)
{
int num = cmbTray.SelectedIndex + 101;
TrayInfo tray = TrayManager.GetTrayInfo(num);
DialogResult resut = MessageBox.Show("确定手动清空托盘【" + num + "】的信息？\r\n " + tray.ToStr() + "", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
TrayManager.UpdateTrayInfo(num);
TrayInfo info = TrayManager.GetTrayInfo(num);
MessageBox.Show("更新成功：\r" + info.ToStr());
LogUtil.info("界面点击手动清空托盘信息：" + info.ToStr());
}
}
} }
} }
source/DeviceLibrary/LineConfig/TrayList.data
{"TrayNum":128,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-17T14:19:19.8733917+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":128,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}} {"TrayNum":134,"IsFull":true,"InOrOutStore":1,"ShowMsg":"","LastUpdateTime":"2020-12-18T12:56:32.4080663+08:00","InoutPar":{"WareCode":"","PosId":"3D0112AA0009","TrayNumber":134,"PlateH":8,"PlateW":7,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"B108","rfidLoc":0}}
{"TrayNum":133,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-17T14:18:49.0826306+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":133,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}} {"TrayNum":101,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:08:04.5573223+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":101,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":105,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-17T14:18:19.2439239+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":105,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}} {"TrayNum":102,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:10:17.8049436+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":102,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":109,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-17T14:19:57.2085272+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":109,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}} {"TrayNum":103,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:10:05.6152464+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":103,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":121,"IsFull":true,"InOrOutStore":1,"ShowMsg":"未指定料仓 cids ","LastUpdateTime":"2020-12-17T14:11:17.0897781+08:00","InoutPar":{"WareCode":"=7x8=L000000000032J4240107;E20201022 0730;B7H.10424.2B1201492020102204000;R201492020102255728##","PosId":"","TrayNumber":121,"PlateH":8,"PlateW":7,"InStoreNg":true,"NgMsg":"未指定料仓 cids ","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"B25","rfidLoc":0}} {"TrayNum":104,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:11:45.438956+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":104,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":106,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:08:41.7064471+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":106,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":107,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:06:22.2134686+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":107,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":109,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:19:23.5651593+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":109,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":110,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:12:06.0661358+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":110,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":112,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:10:59.2953167+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":112,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":113,"IsFull":true,"InOrOutStore":1,"ShowMsg":"","LastUpdateTime":"2020-12-19T15:27:39.5954771+08:00","InoutPar":{"WareCode":"R202882018030701395","PosId":"3D0221AA0002","TrayNumber":113,"PlateH":8,"PlateW":7,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"B110","rfidLoc":0}}
{"TrayNum":114,"IsFull":true,"InOrOutStore":2,"ShowMsg":"","LastUpdateTime":"2020-12-19T13:27:48.8641908+08:00","InoutPar":{"WareCode":"R201882017111700070","PosId":"3D0111AA0008","TrayNumber":114,"PlateH":8,"PlateW":7,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":true,"rfid":"-0B","rfidLoc":-1}}
{"TrayNum":115,"IsFull":true,"InOrOutStore":1,"ShowMsg":"","LastUpdateTime":"2020-12-18T11:26:16.725307+08:00","InoutPar":{"WareCode":"","PosId":"3D0301AA0008","TrayNumber":115,"PlateH":8,"PlateW":7,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"B108","rfidLoc":0}}
{"TrayNum":117,"IsFull":true,"InOrOutStore":1,"ShowMsg":"","LastUpdateTime":"2020-12-18T12:01:48.1502175+08:00","InoutPar":{"WareCode":"","PosId":"3D0401AA0013","TrayNumber":117,"PlateH":8,"PlateW":7,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"B102","rfidLoc":0}}
{"TrayNum":118,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:07:15.5665202+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":118,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":125,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:19:44.1493367+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":125,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":127,"IsFull":true,"InOrOutStore":2,"ShowMsg":"","LastUpdateTime":"2020-12-19T15:18:18.3853777+08:00","InoutPar":{"WareCode":"","PosId":"3D0212AA0014","TrayNumber":127,"PlateH":8,"PlateW":7,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":129,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:12:52.5137925+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":129,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":130,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2020-12-21T10:09:27.232051+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":130,"PlateH":0,"PlateW":0,"InStoreNg":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
source/DeviceLibrary/assemblymanager/TrayManager.cs
...@@ -164,10 +164,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -164,10 +164,10 @@ namespace OnlineStore.DeviceLibrary
TrayInfo tray = JsonHelper.DeserializeJsonToObject<TrayInfo>(line); TrayInfo tray = JsonHelper.DeserializeJsonToObject<TrayInfo>(line);
if (tray != null && tray.TrayNum > 0 && tray.IsFull) if (tray != null && tray.TrayNum > 0 && tray.IsFull)
{ {
LogUtil.info("加载到缓存托盘：" + tray.ToStr()); LogUtil.info("加载到缓存托盘：" + tray.ToStr());
TrayInfoMap.TryAdd(tray.TrayNum, tray); TrayInfoMap.TryAdd(tray.TrayNum, tray);
if (tray.InOrOutStore.Equals(1) && tray.InoutPar.InStoreNg.Equals(false) && (!tray.InoutPar.PosId.Equals("")))
if (tray.InOrOutStore.Equals(1)&&tray.InoutPar.InStoreNg.Equals(false) && (!tray.InoutPar.PosId.Equals("")) && (!tray.InoutPar.WareCode.Equals("")))
{ {
int storeId = tray.InoutPar.GetStoreId(); int storeId = tray.InoutPar.GetStoreId();
if (storeId > 0 && LineManager.Line.MoveEquipMap.ContainsKey(storeId)) if (storeId > 0 && LineManager.Line.MoveEquipMap.ContainsKey(storeId))
...@@ -176,11 +176,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -176,11 +176,10 @@ namespace OnlineStore.DeviceLibrary
lock (moveEquip.waitInListLock) lock (moveEquip.waitInListLock)
{ {
//如果当前正在出入库中，需要记录下来，等待空闲时执行 //如果当前正在出入库中，需要记录下来，等待空闲时执行
LogUtil.info(moveEquip.Name + " 将托盘入库任务["+tray.TrayNum+"]： " + tray.InoutPar.ToStr() + "加入等待列表中！"); LogUtil.info(moveEquip.Name + " 将托盘入库任务[" + tray.TrayNum + "]： " + tray.InoutPar.ToStr() + "加入等待列表中！");
moveEquip.waitInStoreList.Add(tray.InoutPar); moveEquip.waitInStoreList.Add(tray.InoutPar);
} }
} }
} }
} }
} }
......
source/DeviceLibrary/model/TrayInfo.cs
...@@ -47,7 +47,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -47,7 +47,7 @@ namespace OnlineStore.DeviceLibrary
//return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type + //return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type +
// "]二维码[" + WareCode + "]库位号[" + PosId + "] [" + PlateW + "X" + PlateH+ "] " + err + " "+ jinji + "" ; // "]二维码[" + WareCode + "]库位号[" + PosId + "] [" + PlateW + "X" + PlateH+ "] " + err + " "+ jinji + "" ;
return "托盘 [" + TrayNum + "] [" + LastUpdateTime.ToLongTimeString() + "] [" + (IsFull ? "有料" : "空") + "] [" + type + "]"; return "托盘 [" + TrayNum + "] [" + LastUpdateTime.ToString("yyyy-MM-dd HH:mm:ss") + "] [" + (IsFull ? "有料" : "空") + "] [" + type + "]";
} }
/// <summary> /// <summary>
/// 夹具编码值（1-32?） /// 夹具编码值（1-32?）
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!